using namespaces

GaryB432 · Aug 9, 2015 · d43aa6b · GaryB432 · Aug 10, 2015 · d43aa6b
1 parent 32383b4
commit d43aa6b
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 20 deletions.
diff --git a/source/jade/templates/states/main.jade b/source/jade/templates/states/main.jade
@@ -3,7 +3,7 @@ div
 		div.a1
 			h2 Current
 			div(data-homer-loca-directive="",data-address="current")
-			div.distance {{distance | distanceFilter:'miles' | number:3}}
+			div.distance {{distance | distanceFilter:'miles' | number:3}} miles
 			button#setCurrent(ng-click="setCurrent()") Set Current
 		div.a2
 			img#map(ng-src="{{mapUrl}}")

diff --git a/source/js/controllers/about.ts b/source/js/controllers/about.ts
@@ -1,12 +1,14 @@
-interface AboutScope extends ng.IScope{
-	awesomeThings: string[]
-}
+namespace HomerWeb {
+	interface AboutScope extends ng.IScope {
+		awesomeThings: string[]
+	}
 
-App.controller('AboutCtrl', function ($scope: AboutScope, $routeParams: ng.route.IRouteParamsService) {
+	App.controller('AboutCtrl', function($scope: AboutScope, $routeParams: ng.route.IRouteParamsService) {
 		$scope.awesomeThings = [
 			'Lorem',
 			'Ipsum',
 			'Dolar',
 			'Sit Amet'
 		];
-	});
+	});
+}
diff --git a/source/js/controllers/main.ts b/source/js/controllers/main.ts
@@ -1,4 +1,4 @@
-module HomerWeb {
+namespace HomerWeb {
     interface Scope extends ng.IScope {
         home: ILoca;
         current: ILoca;
@@ -41,4 +41,4 @@ module HomerWeb {
     }
 
     App.controller('HomerHomeCtrl', ['$scope', 'homerService', HomerHomeCtrl]);
-}
+}
diff --git a/source/js/directives/address-detail.ts b/source/js/directives/address-detail.ts
@@ -1,4 +1,4 @@
-module HomerWeb {
+namespace HomerWeb {
     interface Scope extends ng.IScope, ILoca {
         name: string;
     }
@@ -27,4 +27,4 @@ module HomerWeb {
         };
         return directiveDefinitionObject;
     });
-}
+}
diff --git a/source/js/filters/distance.ts b/source/js/filters/distance.ts
@@ -1,9 +1,11 @@
 module HomerWeb {
-    console.log(App);
-
-    App.filter('distanceFilter', function () {
-        return function (meters: number, a: string) {
-            return (meters * 0.000621371192237);
-        };
-    });
+    function translateMeters(meters: number, unit: string) {
+        switch (unit) {
+            case 'miles':
+                return meters * 0.000621371192237
+            default:
+                throw new Error(`${unit} is an unknown unit`);
+        }
+    }
+    App.filter('distanceFilter', () => translateMeters);
 }
diff --git a/source/js/services/google.ts b/source/js/services/google.ts
@@ -1,4 +1,4 @@
-module GoogleGeocoding {
+namespace GoogleGeocoding {
     export class GeoCoder {
         static computeDistanceBetween(from: Coordinates, to: Coordinates, radius?: number) {
             return google.maps.geometry.spherical.computeDistanceBetween(
@@ -24,7 +24,7 @@ module GoogleGeocoding {
     }
 }
 
-module GoogleMapping {
+namespace GoogleMapping {
     export class DynamicMap {
         map: google.maps.Map;
         constructor(mapDiv: Element, opts?: google.maps.MapOptions) {

diff --git a/source/js/services/homer.ts b/source/js/services/homer.ts
@@ -1,4 +1,4 @@
-module HomerWeb {
+namespace HomerWeb {
     interface VenessGeo {
         // www.movable-type.co.uk/scripts/latlong.html
         parseDMS(dms: string): number;