fix(registration): show marker on map in registration

Show marker again during registration
sensebox · Jan 31, 2018 · ac28553 · ac28553
1 parent e18ab75
commit ac28553
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 13 deletions.
diff --git a/app/components/leaflet.directive.js b/app/components/leaflet.directive.js
@@ -60,6 +60,7 @@
         'selectedBoxMarker': L.featureGroup().setZIndex(1000),
         'mobileTrajectory': L.featureGroup(),
         'mobileMeasurements': L.featureGroup(),
+        'registration': L.featureGroup(),
 
         'markerCluster': mcg,
         // adding to map adds all child layers into the parent group for subgroups
@@ -156,6 +157,7 @@
           mapLayers['activeMarkers'].clearLayers();
           mapLayers['inactiveMarkers'].clearLayers();
           mapLayers['oldMarkers'].clearLayers();
+          mapLayers['registration'].clearLayers();
           for (var markerId in newVal) {
             var markerOpts = newVal[markerId];
             var marker = L.marker(markerOpts.latLng, markerOpts);

diff --git a/app/scripts/app.js b/app/scripts/app.js
@@ -52,7 +52,6 @@ angular
             progressbar.start();
             return OpenSenseMapAPI.getBoxes({params: {classify: true}})
               .then(function (data) {
-                console.log(data);
                 progressbar.complete();
                 return data;
               })

diff --git a/app/scripts/controllers/register.js b/app/scripts/controllers/register.js
@@ -300,16 +300,19 @@
       if (Object.keys(vm.markers).length === 0) {
         vm.markers = {
           box: {
+            'layerName': 'registration',
+            'latLng': [parseFloat(args.latlng.lat.toFixed(6)),parseFloat(args.latlng.lng.toFixed(6))],
             'lat': parseFloat(args.latlng.lat.toFixed(6)),
             'lng': parseFloat(args.latlng.lng.toFixed(6)),
-            'draggable': true,
-            'icon': {
-              markerColor: 'green'
-            }
+            'draggable': true
           }
         };
       } else {
         vm.markers = angular.copy(vm.markers);
+        vm.markers.box.latLng = [
+          parseFloat(args.latlng.lat.toFixed(6)),
+          parseFloat(args.latlng.lng.toFixed(6))
+        ];
         vm.markers.box.lat = parseFloat(args.latlng.lat.toFixed(6));
         vm.markers.box.lng = parseFloat(args.latlng.lng.toFixed(6));
       }
@@ -318,6 +321,10 @@
 
     $scope.$on('osemMarkerDragend.map_register', function(e, args) {
       vm.markers = angular.copy(vm.markers);
+      vm.markers.box.latLng = [
+        parseFloat(args.target._latlng.lat.toFixed(6)),
+        parseFloat(args.target._latlng.lng.toFixed(6))
+      ];
       vm.markers.box.lat = parseFloat(args.target._latlng.lat.toFixed(6));
       vm.markers.box.lng = parseFloat(args.target._latlng.lng.toFixed(6));
       vm.editMarkerInput =  angular.copy(vm.markers);
@@ -328,19 +335,22 @@
       if (Object.keys(vm.markers).length === 0) {
         vm.markers = {
           box: {
+            'layerName': 'registration',
+            'latLng': [parseFloat(args.latlng.lat.toFixed(6)),parseFloat(args.latlng.lng.toFixed(6))],
             'lat': parseFloat(args.latlng.lat.toFixed(6)),
             'lng': parseFloat(args.latlng.lng.toFixed(6)),
-            'draggable': true,
-            'icon': {
-              'markerColor': 'green'
-            }
+            'draggable': true
           }
         };
         if (args.latlng.altitude) {
           vm.markers.box.height = parseFloat(args.latlng.altitude.toFixed(2))
         }
       } else {
         vm.markers = angular.copy(vm.markers);
+        vm.markers.box.latLng = [
+          parseFloat(args.latlng.lat.toFixed(6)),
+          parseFloat(args.latlng.lng.toFixed(6))
+        ];
         vm.markers.box.lat = parseFloat(args.latlng.lat.toFixed(6));
         vm.markers.box.lng = parseFloat(args.latlng.lng.toFixed(6));
       }
@@ -457,23 +467,48 @@
         if (Object.keys(vm.markers).length === 0) {
           vm.markers = {
             box: {
+              'latLng': [parseFloat(newValue.lat.toFixed(6)),parseFloat(newValue.lng.toFixed(6))],
               'lat': parseFloat(newValue.lat.toFixed(6)),
               'lng': parseFloat(newValue.lng.toFixed(6)),
               'height': newValue.height,
-              'draggable': true,
-              'icon': {
-                'markerColor': 'green'
-              }
+              'draggable': true
             }
           };
         } else {
           vm.markers = angular.copy(vm.markers);
+          vm.markers.box.latLng = [
+            parseFloat(newValue.lat.toFixed(6)),
+            parseFloat(newValue.lng.toFixed(6))
+          ],
           vm.markers.box.lat = parseFloat(newValue.lat.toFixed(6));
           vm.markers.box.lng = parseFloat(newValue.lng.toFixed(6));
           vm.markers.box.height = newValue.height;
         }
         vm.editMarkerInput =  angular.copy(vm.markers);
       }
     });
+
+    $scope.$watchCollection('register.newSenseBox.exposure', function (newValue, oldValue) {
+      if (newValue === '') {
+        return;
+      }
+
+      if (newValue === 'indoor' || newValue === 'outdoor') {
+        var icon = 'cube';
+        var color = 'green';
+      }
+
+      if (newValue === 'mobile') {
+        var icon = 'rocket';
+        var color = 'blue';
+      }
+      vm.markers = angular.copy(vm.markers);
+      vm.markers.box.icon = L.AwesomeMarkers.icon({
+        type: 'awesomeMarker',
+        prefix: 'fa',
+        icon: icon,
+        markerColor: color
+      });
+    });
   }
 })();