Merge pull request #33 from keokilee/master

Remove unused file and update with new API.
hitraffic · Jul 14, 2015 · bd5d510 · bd5d510
2 parents 914fef4 + 7c99484
commit bd5d510
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 227 deletions.
diff --git a/www/api/incidents.json b/www/api/incidents.json
diff --git a/www/js/controllers/home_controller.js b/www/js/controllers/home_controller.js
@@ -84,10 +84,12 @@
       }
 
       //if the incident coordinates exist, center the map on that point
-      if(incident.lat !== null || incident.lng !== null){
+      if (incident.geometry) {
+        var geometry = incident.geometry;
+
         vm.MapController.map.center  = {
-          lat : incident.lat,
-          lng : incident.lng,
+          lat : geometry.latitude,
+          lng : geometry.longitude,
           zoom : zoom_level
         };
       }
@@ -107,37 +109,41 @@
      * @return {object} marker [marker associated with the location]
      */
     vm.MapController.findMarker = function (incident) {
+      if (!incident.geometry) {
+        return null;
+      }
+
       var markers_obj = vm.MapController.map.markers;
+      var geometry = incident.geometry;
+
       for (var marker in markers_obj) {
-        if(markers_obj[marker].lat === incident.lat && markers_obj[marker].lng === incident.lng) {
+        if(markers_obj[marker].lat === geometry.latitude && markers_obj[marker].lng === geometry.longitude) {
           return  markers_obj[marker];
         }
       }
     }
 
     vm.MapController.updateMarkers = function (incidents) {
       vm.MapController.map.markers = {};
-      var incident_num = 1;
-      incidents.forEach(function (incident, index, array) {
-        //html for marker message
-        var html = "<h5 class='incident_type'>" + incident.type + "</h5>"
-          + "<p class='marker_text'>" + incident.date + "</p>"
-          + "<p class='marker_text'>" + incident.address + "</p>"
-          + "<p class='marker_text'>" + incident.area + "</p>";
-          // + "<button class='marker_text zoom' ng-click='focusHere(incident)'>Zoom Here</button>";
-
-        //set marker location
-        var marker = {
-          lat: incident.lat,
-          lng: incident.lng,
-          message: html,
-        }
+      incidents.forEach(function (incident, index) {
+        if (incident.geometry) {
+          var geometry = incident.geometry;
+
+          //html for marker message
+          var html = "<h5 class='incident_type'>" + incident.type + "</h5>"
+            + "<p class='marker_text'>" + incident.date + "</p>"
+            + "<p class='marker_text'>" + incident.address + "</p>"
+            + "<p class='marker_text'>" + incident.area + "</p>";
+
+          //set marker location
+          var marker = {
+            lat: geometry.latitude,
+            lng: geometry.longitude,
+            message: html,
+          }
 
-        //Only add to list of markers if there are coordinates
-        if(marker.lat !== null || marker.lng !== null){
-          vm.MapController.map.markers["Incident" + incident_num] = marker;
+          vm.MapController.map.markers["Incident" + (index + 1)] = marker;
         }
-        incident_num++;
       });
     }
 

diff --git a/www/js/services/incidents_service.js b/www/js/services/incidents_service.js
@@ -71,7 +71,7 @@
 
     return {
       all: function() {
-        return $http.get('http://api.hitraffic.org/api/incidents/').then(function (response) {
+        return $http.get('http://api.hitraffic.org/v1/incidents/').then(function (response) {
           return prepareDataForDisplay(filterIncidents(response.data));
         });
       },