Compare commits

...

2 Commits

Author SHA1 Message Date
6ef04fcd4e
fit both google and leaflet map to bounds if map already exists
All checks were successful
default-pipeline default-pipeline #154
2021-05-02 13:29:48 +02:00
3045d8acbb
remove builtin streetViewControl from google map 2021-05-02 13:13:11 +02:00

View File

@ -376,6 +376,8 @@
if (!LMapWrapper.map) { if (!LMapWrapper.map) {
LMapWrapper.divId = divId; LMapWrapper.divId = divId;
LMapWrapper.map = L.map(LMapWrapper.divId, { LMapWrapper.map = L.map(LMapWrapper.divId, {
center: { lat: 0., lng: 0. },
zoom: 2,
zoomControl: false zoomControl: false
}); });
@ -395,8 +397,10 @@
maxZoom: highResData.maxZoom maxZoom: highResData.maxZoom
}).addTo(LMapWrapper.map); }).addTo(LMapWrapper.map);
if (mapId) {
LMapWrapper.map.fitBounds(L.latLngBounds({ lat: mapBounds.south, lng: mapBounds.west }, { lat: mapBounds.north, lng: mapBounds.east })); LMapWrapper.map.fitBounds(L.latLngBounds({ lat: mapBounds.south, lng: mapBounds.west }, { lat: mapBounds.north, lng: mapBounds.east }));
} }
}
LMapWrapper.loadMarkers(places); LMapWrapper.loadMarkers(places);
@ -513,10 +517,6 @@
zoomControlOptions: { zoomControlOptions: {
position: google.maps.ControlPosition.LEFT_BOTTOM position: google.maps.ControlPosition.LEFT_BOTTOM
}, },
streetViewControl: true,
streetViewControlOptions: {
position: google.maps.ControlPosition.LEFT_BOTTOM
},
draggableCursor: 'crosshair' draggableCursor: 'crosshair'
}); });
@ -529,6 +529,9 @@
}); });
}); });
if (mapId) {
GMapWrapper.map.fitBounds({ south: mapBounds.south, west: mapBounds.west, north: mapBounds.north, east: mapBounds.east });
}
} }
GMapWrapper.loadMarkers(places); GMapWrapper.loadMarkers(places);