Make sure we always have a base layer

[rails.git] / app / assets / javascripts / leaflet.share.js

diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index d58b62313b21eb62c918f5d8b1a4b1e92b637417..b5f45e01d3c683b68d0607b4e051676df15281cc 100644 (file)
--- 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);
 
       .on('change', update)
       .addTo(map);
 

+    marker.on('dragend', movedMarker);
+    map.on('move', movedMap);

     map.on('moveend layeradd layerremove', update);
     map.on('moveend layeradd layerremove', update);

-    marker.on('dragend', update);

 
     options.sidebar.addPane($ui);
 
 
     options.sidebar.addPane($ui);
 


@@ -216,6 +217,7 @@ L.OSM.share = function (options) {
 
     function hidden() {
       map.removeLayer(marker);
 
     function hidden() {
       map.removeLayer(marker);

+      map.options.scrollWheelZoom = map.options.doubleClickZoom = true;

       locationFilter.disable();
       update();
     }
       locationFilter.disable();
       update();
     }


@@ -235,8 +237,10 @@ L.OSM.share = function (options) {
       if ($(this).is(':checked')) {
         marker.setLatLng(map.getCenter());
         map.addLayer(marker);
       if ($(this).is(':checked')) {
         marker.setLatLng(map.getCenter());
         map.addLayer(marker);

+        map.options.scrollWheelZoom = map.options.doubleClickZoom = 'center';

       } else {
         map.removeLayer(marker);
       } else {
         map.removeLayer(marker);

+        map.options.scrollWheelZoom = map.options.doubleClickZoom = true;

       }
       update();
     }
       }
       update();
     }


@@ -251,11 +255,26 @@ L.OSM.share = function (options) {
       update();
     }
 
       update();
     }
 

-    function update() {
+    function movedMap() {
+      marker.setLatLng(map.getCenter());
+      update();
+    }
+
+    function movedMarker() {

       if (map.hasLayer(marker)) {
       if (map.hasLayer(marker)) {

+        map.off('move', movedMap);
+        map.on('moveend', updateOnce);

         map.panTo(marker.getLatLng());
       }
         map.panTo(marker.getLatLng());
       }

+    }

 
 

+    function updateOnce() {
+      map.off('moveend', updateOnce);
+      map.on('move', movedMap);
+      update();
+    }
+
+    function update() {

       var bounds = map.getBounds();
 
       $('#link_marker')
       var bounds = map.getBounds();
 
       $('#link_marker')


@@ -277,14 +296,16 @@ L.OSM.share = function (options) {
       };
 
       if (map.hasLayer(marker)) {
       };
 
       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(
         '<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="' +
           escapeHTML('http://' + OSM.SERVER_URL + '/export/embed.html?' + $.param(params)) +
           '" style="border: 1px solid black"></iframe><br/>' +
       }
 
       $('#embed_html').val(
         '<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="' +
           escapeHTML('http://' + OSM.SERVER_URL + '/export/embed.html?' + $.param(params)) +
           '" style="border: 1px solid black"></iframe><br/>' +

-          '<small><a href="' + escapeHTML(map.getUrl(marker)) + '</a></small>');
+          '<small><a href="' + escapeHTML(map.getUrl(marker)) + '">' +
+          escapeHTML(I18n.t('javascripts.share.view_larger_map')) + '</a></small>');

 
       // Image
 
 
       // Image