X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/48775da938fcfa29902b1d18fdde80aadc17c249..1a51f2187127f7376e2118b5a4ced49123b0504a:/app/assets/javascripts/leaflet.share.js
diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index d43bc8ad2..b5f45e01d 100644
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -206,8 +206,9 @@ L.OSM.share = function (options) {
.on('change', update)
.addTo(map);
+ marker.on('dragend', movedMarker);
+ map.on('move', movedMap);
map.on('moveend layeradd layerremove', update);
- marker.on('dragend', update);
options.sidebar.addPane($ui);
@@ -216,6 +217,7 @@ L.OSM.share = function (options) {
function hidden() {
map.removeLayer(marker);
+ map.options.scrollWheelZoom = map.options.doubleClickZoom = true;
locationFilter.disable();
update();
}
@@ -235,18 +237,17 @@ L.OSM.share = function (options) {
if ($(this).is(':checked')) {
marker.setLatLng(map.getCenter());
map.addLayer(marker);
+ map.options.scrollWheelZoom = map.options.doubleClickZoom = 'center';
} else {
map.removeLayer(marker);
+ map.options.scrollWheelZoom = map.options.doubleClickZoom = true;
}
update();
}
function toggleFilter() {
if ($(this).is(':checked')) {
- if (!locationFilter.getBounds().isValid()) {
- locationFilter.setBounds(map.getBounds().pad(-0.2));
- }
-
+ locationFilter.setBounds(map.getBounds().pad(-0.2));
locationFilter.enable();
} else {
locationFilter.disable();
@@ -254,11 +255,26 @@ L.OSM.share = function (options) {
update();
}
- function update() {
+ function movedMap() {
+ marker.setLatLng(map.getCenter());
+ update();
+ }
+
+ function movedMarker() {
if (map.hasLayer(marker)) {
+ map.off('move', movedMap);
+ map.on('moveend', updateOnce);
map.panTo(marker.getLatLng());
}
+ }
+ function updateOnce() {
+ map.off('moveend', updateOnce);
+ map.on('move', movedMap);
+ update();
+ }
+
+ function update() {
var bounds = map.getBounds();
$('#link_marker')
@@ -280,14 +296,16 @@ L.OSM.share = function (options) {
};
if (map.hasLayer(marker)) {
- params.marker = marker.getLatLng().lat + ',' + marker.getLatLng().lng;
+ var latLng = marker.getLatLng().wrap();
+ params.marker = latLng.lat + ',' + latLng.lng;
}
$('#embed_html').val(
'
' +
- '' +
+ escapeHTML(I18n.t('javascripts.share.view_larger_map')) + '');
// Image