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

feature/google-maps-in-mapeditor-added #33

Merged
bence merged 9 commits from feature/google-maps-in-mapeditor-added into develop 2021-05-02 13:38:17 +02:00
Conversation 2 Commits 9 Files Changed 10 +16 -23
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8b9345eb36 - Show all commits

5
public/static/css/map_editor.css
View File

@ -12,11 +12,6 @@
width: 1em; width: 1em;
height: 1em; height: 1em;
vertical-align: -0.15em; vertical-align: -0.15em;
fill: #ffffff;
}
#mapSelection img svg {
fill: #28a745;
} }
/* modify the cursor for the Leaflet map */ /* modify the cursor for the Leaflet map */

12
public/static/js/map_editor.js
View File

@ -117,7 +117,7 @@
MapEditor.resetSelected(); MapEditor.resetSelected();
MapEditor.selectedMarker = marker; MapEditor.selectedMarker = marker;
MapEditor.map.invalidateSize(true); MapEditor.map.resize();
MapEditor.map.panTo(marker.getLatLng()); MapEditor.map.panTo(marker.getLatLng());
MapEditor.panorama.setVisible(false); MapEditor.panorama.setVisible(false);
@ -219,7 +219,7 @@
MapEditor.resetSelected(del); MapEditor.resetSelected(del);
MapEditor.selectedMarker = null; MapEditor.selectedMarker = null;
MapEditor.map.invalidateSize(true); MapEditor.map.resize();
}, },
deletePlace: function () { deletePlace: function () {
@ -455,8 +455,8 @@
LMapWrapper.map.panTo(latLng); LMapWrapper.map.panTo(latLng);
}, },
invalidateSize: function (invalid) { resize: function () {
LMapWrapper.map.invalidateSize(invalid); LMapWrapper.map.invalidateSize(true);
}, },
changeMarkerIcon: function (marker, icon) { changeMarkerIcon: function (marker, icon) {
@ -595,10 +595,8 @@
GMapWrapper.map.panTo(latLng); GMapWrapper.map.panTo(latLng);
}, },
invalidateSize: function (invalid) { resize: function () {
if (invalid) {
google.maps.event.trigger(GMapWrapper.map, 'resize'); google.maps.event.trigger(GMapWrapper.map, 'resize');
}
}, },
changeMarkerIcon: function (marker, icon) { changeMarkerIcon: function (marker, icon) {