mirror
/
facilmap
kopia lustrzana https://github.com/FacilMap/facilmap
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix behaviour of highlighted markers

pull/108/head
Candid Dauth 2017-05-13 23:31:33 +02:00
rodzic 404f953d88
commit c722af09b3
1 zmienionych plików z 18 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

32
frontend/app/map/markers/markers.js
Wyświetl plik

@ -6,7 +6,7 @@ import ng from 'angular';
fm.app.factory("fmMapMarkers", function($uibModal, fmUtils, $compile, $timeout, $rootScope) { fm.app.factory("fmMapMarkers", function($uibModal, fmUtils, $compile, $timeout, $rootScope) {
return function(map) { return function(map) {
var markersById = { }; var markersById = { };
let openMarkerId; let openMarker;
map.client.on("marker", function(data) { map.client.on("marker", function(data) {
if(map.client.filterFunc(data)) if(map.client.filterFunc(data))
@ -32,7 +32,7 @@ fm.app.factory("fmMapMarkers", function($uibModal, fmUtils, $compile, $timeout,
if(!markersById[marker.id]) { if(!markersById[marker.id]) {
markersById[marker.id] = L.marker([ 0, 0 ], { icon: fmUtils.createMarkerIcon(marker.colour, marker.size, marker.symbol)}).addTo(map.markerCluster) markersById[marker.id] = L.marker([ 0, 0 ], { icon: fmUtils.createMarkerIcon(marker.colour, marker.size, marker.symbol)}).addTo(map.markerCluster)
.on("click", function(e) { .on("click", function(e) {
markersUi._renderMarkerInfoBox(map.client.markers[marker.id] || marker); markersUi.showMarkerInfoBox(map.client.markers[marker.id] || marker);
}.fmWrapApply($rootScope)) }.fmWrapApply($rootScope))
.bindTooltip("", $.extend({}, map.tooltipOptions, { offset: [ 20, -15 ] })) .bindTooltip("", $.extend({}, map.tooltipOptions, { offset: [ 20, -15 ] }))
.on("tooltipopen", function() { .on("tooltipopen", function() {
@ -42,19 +42,22 @@ fm.app.factory("fmMapMarkers", function($uibModal, fmUtils, $compile, $timeout,
markersById[marker.id] markersById[marker.id]
.setLatLng([ marker.lat, marker.lon ]) .setLatLng([ marker.lat, marker.lon ])
.setIcon(fmUtils.createMarkerIcon(marker.colour, marker.size, marker.symbol)); .setIcon(fmUtils.createMarkerIcon(marker.colour, marker.size, marker.symbol, null, openMarker && openMarker.id == marker.id));
if(openMarkerId == marker.id) if(openMarker && openMarker.id == marker.id)
markersUi._renderMarkerInfoBox(marker); markersUi.showMarkerInfoBox(marker);
}, },
_deleteMarker : function(marker) { _deleteMarker : function(marker) {
if(!markersById[marker.id]) if(!markersById[marker.id])
return; return;
if(openMarker && openMarker.id == marker.id)
openMarker.hide();
markersById[marker.id].removeFrom(map.map); markersById[marker.id].removeFrom(map.map);
delete markersById[marker.id]; delete markersById[marker.id];
}, },
_renderMarkerInfoBox: function(marker) { showMarkerInfoBox: function(marker) {
var scope = $rootScope.$new(); var scope = $rootScope.$new();
scope.client = map.client; scope.client = map.client;
@ -73,14 +76,15 @@ fm.app.factory("fmMapMarkers", function($uibModal, fmUtils, $compile, $timeout,
markersUi.deleteMarker(scope.marker); markersUi.deleteMarker(scope.marker);
}; };
map.infoBox.show(require("./view-marker.html"), scope, () => { openMarker = {
openMarkerId = null; hide: map.infoBox.show(require("./view-marker.html"), scope, () => {
markersById[marker.id].setIcon(fmUtils.createMarkerIcon(marker.colour, marker.size, marker.symbol)); openMarker = null;
}); markersById[marker.id].setIcon(fmUtils.createMarkerIcon(marker.colour, marker.size, marker.symbol));
}).hide,
id: marker.id
};
markersById[marker.id].setIcon(fmUtils.createMarkerIcon(marker.colour, marker.size, marker.symbol, null, true)); markersById[marker.id].setIcon(fmUtils.createMarkerIcon(marker.colour, marker.size, marker.symbol, null, true));
openMarkerId = marker.id;
}, },
editMarker: function(marker) { editMarker: function(marker) {
var scope = $rootScope.$new(); var scope = $rootScope.$new();
@ -114,7 +118,7 @@ fm.app.factory("fmMapMarkers", function($uibModal, fmUtils, $compile, $timeout,
if(save) { if(save) {
var pos = markersById[marker.id].getLatLng(); var pos = markersById[marker.id].getLatLng();
map.client.editMarker({ id: marker.id, lat: pos.lat, lon: pos.lng }).then(function() { map.client.editMarker({ id: marker.id, lat: pos.lat, lon: pos.lng }).then(function() {
markersUi._renderMarkerInfoBox(markersById[marker.id]); markersUi.showMarkerInfoBox(markersById[marker.id]);
}).catch(function(err) { }).catch(function(err) {
map.messages.showMessage("danger", err); map.messages.showMessage("danger", err);
@ -156,7 +160,7 @@ fm.app.factory("fmMapMarkers", function($uibModal, fmUtils, $compile, $timeout,
markersUi._addMarker(marker); markersUi._addMarker(marker);
if(!noEdit) { if(!noEdit) {
markersUi._renderMarkerInfoBox(marker); markersUi.showMarkerInfoBox(marker);
markersUi.editMarker(marker); markersUi.editMarker(marker);
} }
}).catch(function(err) { }).catch(function(err) {