esoko/mapguesser
1
1 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

refactoring and bug fixing related to the map switching

Browse Source
This commit is contained in:
balazs committed 2021-05-02 12:34:57 +02:00
1 parent 0bb31cbe14
commit 745bda11c0
3 files changed
+19 -47
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

public/static/js/map_editor.js
+14 -34
View File
@@ -235,6 +235,7 @@
delete MapEditor.added[placeId];
delete MapEditor.edited[placeId];
delete places[placeId];
document.getElementById('added').innerHTML = String(Object.keys(MapEditor.added).length);
document.getElementById('edited').innerHTML = String(Object.keys(MapEditor.edited).length);
@@ -305,13 +306,6 @@
var tempId = addedPlaces[i].tempId;
var placeId = addedPlaces[i].id;
places[tempId].id = placeId;
places[placeId] = places[tempId];
if(MapEditor.selectedMarker && MapEditor.selectedMarker.placeId === tempId) {
MapEditor.selectedMarker.placeId = placeId;
}
delete places[tempId];
MapEditor.map.loadMarkers(places);
}
}
};
@@ -358,7 +352,6 @@
map: null,
markers: null,
divId: null,
loaded: false,
iconCollection: {
iconGreen: L.icon({
iconUrl: STATIC_ROOT + '/img/markers/marker-green.svg?rev' + REVISION,
@@ -380,9 +373,7 @@
init: function (divId, places) {
document.getElementById(divId).style.display = "block";
if(LMapWrapper.loaded === true) {
LMapWrapper.invalidateSize(true);
} else {
if(!LMapWrapper.map) {
LMapWrapper.divId = divId;
LMapWrapper.map = L.map(LMapWrapper.divId, {
zoomControl: false
@@ -408,13 +399,10 @@
}
LMapWrapper.loadMarkers(places);
LMapWrapper.loaded = true;
},
destruct: function() {
hide: function() {
document.getElementById(LMapWrapper.divId).style.display = 'none';
// LMapWrapper.divId = null;
},
loadMarkers: function (places) {
@@ -436,13 +424,13 @@
var marker = L.marker({ lat: place.lat, lng: place.lng }, {
icon: place.noPano ? LMapWrapper.iconCollection.iconRed : LMapWrapper.iconCollection.iconGreen,
zIndexOffset: 1000
});
marker.addTo(LMapWrapper.markers)
marker.on('click', function () {
})
.addTo(LMapWrapper.markers)
.on('click', function () {
MapEditor.select(this);
});
marker.placeId = place.id;
marker.placeId = placeId;
}
LMapWrapper.map.addLayer(LMapWrapper.markers);
@@ -455,7 +443,7 @@
icon: LMapWrapper.iconCollection.iconBlue,
zIndexOffset: 2000
})
.addTo(LMapWrapper.map)
.addTo(LMapWrapper.markers)
.on('click', function () {
MapEditor.select(this);
});
@@ -472,14 +460,12 @@
},
changeMarkerIcon: function (marker, icon) {
//LMapWrapper.markers.removeLayer(marker);
//LMapWrapper.map.addLayer(marker);
marker.setIcon(icon);
marker.setZIndexOffset(2000);
},
removeMarker: function (marker) {
LMapWrapper.map.removeLayer(marker);
LMapWrapper.markers.removeLayer(marker);
}
};
@@ -487,7 +473,6 @@
map: null,
markers: null,
divId: null,
loaded: false,
iconCollection: {
iconGreen: {
url: STATIC_ROOT + '/img/markers/marker-green.svg?rev' + REVISION,
@@ -512,9 +497,7 @@
init: function (divId, places) {
document.getElementById(divId).style.display = "block";
if(GMapWrapper.loaded) {
GMapWrapper.invalidateSize();
} else {
if(!GMapWrapper.map) {
GMapWrapper.divId = divId;
GMapWrapper.map = new google.maps.Map(document.getElementById(GMapWrapper.divId), {
center: { lat: 0., lng: 0. },
@@ -545,11 +528,8 @@
GMapWrapper.loaded = true;
},
destruct: function() {
// GMapWrapper.map = null;
// GMapWrapper.markers = null;
hide: function() {
document.getElementById(GMapWrapper.divId).style.display = 'none';
// GMapWrapper.divId = null;
},
loadMarkers: function (places) {
@@ -584,7 +564,7 @@
MapEditor.select(this);
});
marker.placeId = place.id;
marker.placeId = placeId;
GMapWrapper.markers.addMarker(marker);
}
@@ -704,11 +684,11 @@
document.getElementById('mapSelector').onclick = function() {
MapEditor.closePlace();
MapEditor.map.destruct();
MapEditor.map.hide();
if(MapEditor.map === GMapWrapper) {
MapEditor.map = LMapWrapper;
MapEditor.map.init('map', places);
MapEditor.map.init('lmap', places);
} else {
MapEditor.map = GMapWrapper;
MapEditor.map.init('gmap', places);