From ffa363fc96cd585aea30ce338eb1eb872105662e Mon Sep 17 00:00:00 2001 From: Matthias Pfeil Date: Tue, 6 Feb 2018 17:44:48 +0100 Subject: [PATCH] fix(edit): fix marker in editing show marker again in location editing --- .../controllers/account.box.edit.location.js | 37 +++++++++++++++---- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/app/scripts/controllers/account.box.edit.location.js b/app/scripts/controllers/account.box.edit.location.js index 2f87cf18..657fe605 100644 --- a/app/scripts/controllers/account.box.edit.location.js +++ b/app/scripts/controllers/account.box.edit.location.js @@ -20,15 +20,35 @@ //// function activate () { + if (boxData.exposure === 'indoor' || boxData.exposure === 'outdoor') { + var icon = 'cube'; + var color = 'green'; + } + + if (boxData.exposure === 'mobile') { + var icon = 'rocket'; + var color = 'blue'; + } + + var icon = L.AwesomeMarkers.icon({ + type: 'awesomeMarker', + prefix: 'fa', + icon: icon, + markerColor: color + }); + + var lat = parseFloat(boxData.currentLocation.coordinates[1].toFixed(6)); + var lng = parseFloat(boxData.currentLocation.coordinates[0].toFixed(6)); + vm.boxPosition = { - lng: parseFloat(boxData.currentLocation.coordinates[0].toFixed(6)), - lat: parseFloat(boxData.currentLocation.coordinates[1].toFixed(6)), + layerName: 'registration', + lng: lng, + lat: lat, + latLng: [lat, lng], height: boxData.currentLocation.coordinates[2], draggable: true, zoom: 17, - icon: { - markerColor: 'green' - } + icon: icon }; angular.copy(vm.boxPosition, vm.originalPosition); @@ -60,8 +80,11 @@ vm.editMarker = { m1 : angular.copy(vm.originalPosition) }; - vm.editMarker.m1.lng = parseFloat(coords.lng.toFixed(6)); - vm.editMarker.m1.lat = parseFloat(coords.lat.toFixed(6)); + var lng = parseFloat(coords.lng.toFixed(6)); + var lat = parseFloat(coords.lat.toFixed(6)); + vm.editMarker.m1.lng = lng; + vm.editMarker.m1.lat = lat; + vm.editMarker.m1.latLng = [lat, lng]; vm.editMarker.m1.height = coords.height; vm.editMarkerInput.lng = vm.editMarker.m1.lng; vm.editMarkerInput.lat = vm.editMarker.m1.lat;