Use an id as the area delimiter

codeforamerica · Nov 8, 2013 · 52b9fdb · 52b9fdb
1 parent 5824511
commit 52b9fdb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/data/city.json b/data/city.json
diff --git a/data/neighborhoods.json b/data/neighborhoods.json
@@ -1,6 +1,7 @@
 [
   {
     "name": "Downtown Las Vegas",
+    "id": "1",
     "geometry": {
       "type": "FeatureCollection",
       "features": [
@@ -156,6 +157,7 @@
   },
   {
     "name": "Summerlin",
+    "id": 2,
     "geometry": {
       "type": "FeatureCollection",
       "features": [

diff --git a/public/js/controllers.js b/public/js/controllers.js
@@ -385,11 +385,11 @@
       var overlays = {}
 
       var getOverlay = function (area) {
-        if ( ng.isDefined(area) ) return overlays[ area.get('name') ];
+        if ( ng.isDefined(area) ) return overlays[ area.get('id') ];
       }
 
       var setOverlay = function (area, overlay) {
-        if ( ng.isDefined(area) ) overlays[ area.get('name') ] = overlay;
+        if ( ng.isDefined(area) ) overlays[ area.get('id') ] = overlay;
       }
 
       var showOverlay = function (overlay) {
@@ -429,26 +429,28 @@
       }
 
       var onAreaMouseover = function (area) {
-        showArea(area); 
+        showArea(area);
       }
 
       var onAreaMouseout = function (area) {
         if ( !ng.equals($scope.selected, area) ) {
-          hideArea(area); 
+          hideArea(area);
         }
       }
 
       var select = function (area) {
         if ( !ng.equals($scope.selected, area) ) {
           hideArea($scope.selected);
-          $scope.selected = area;
           showArea(area);
           zoomToArea(area);
+          $scope.selected = area;
         } else {
           $scope.selected = undefined;
           hideArea(area);
           zoomToOverlay( getOverlay($scope.city) );
         }
+
+        Session.set({ area: $scope.selected });
       }
 
       //
@@ -483,7 +485,7 @@
       var onNeighborhoodSuccess = function (neighborhoods) {
         $scope.neighborhoods = neighborhoods;
         $scope.showError = false;
-      } 
+      }
 
       var onNeighborhoodError = function () {
         $scope.showError = true;
@@ -517,14 +519,12 @@
         }
       });
 
-      $scope.map = map;
+      Neighborhood.all({}, onNeighborhoodSuccess, onNeighborhoodError);
 
       $scope.onAreaMouseover = onAreaMouseover;
       $scope.onAreaMouseout = onAreaMouseout;
-
       $scope.select = select;
-
-      Neighborhood.all({}, onNeighborhoodSuccess, onNeighborhoodError)
+      $scope.map = map;
     }
   ]);