Merge remote-tracking branch 'upstream/pull/2711'

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

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index 57cd53d4dc840cf21384e9b4907b0edb4d1a8543..ddcce195daba2d5f7724d2b81ab876d51d6efeeb 100644 (file)
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -1,103 +1,56 @@
-L.OSM.layers = function(options) {
+L.OSM.layers = function (options) {

   var control = L.control(options);
 
   control.onAdd = function (map) {
     var layers = options.layers;
 
   var control = L.control(options);
 
   control.onAdd = function (map) {
     var layers = options.layers;
 

-    var $container = $('<div>')
-      .attr('class', 'control-layers');
+    var $container = $("<div>")
+      .attr("class", "control-layers");

 
 

-    var link = $('<a>')
-      .attr('class', 'control-button')
-      .attr('href', '#')
-      .attr('title', 'Layers')
-      .html('<span class="icon layers"></span>')
-      .on('click', toggle)
+    var button = $("<a>")
+      .attr("class", "control-button")
+      .attr("href", "#")
+      .attr("title", I18n.t("javascripts.map.layers.title"))
+      .html("<span class=\"icon layers\"></span>")
+      .on("click", toggle)

       .appendTo($container);
 
       .appendTo($container);
 

-    var $ui = $('<div>')
-      .attr('class', 'layers-ui');
-
-    $('<section>')
-       .appendTo($ui)
-       .append(
-          $('<a>')
-            .html('&raquo;')
-            .attr('class', 'close-button')
-            .attr('href', '#')
-            .bind('click', toggle))
-       .append(
-        $('<h2>')
-          .text(I18n.t('javascripts.map.layers.header')));
-
-    if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
-      var overlaySection = $('<section>')
-        .addClass('overlay-layers')
-        .appendTo($ui);
-
-      $('<p>')
-        .text(I18n.t('javascripts.map.layers.overlays'))
-        .appendTo(overlaySection);
-
-      var list = $('<ul>')
-        .appendTo(overlaySection);
-
-      function addOverlay(layer, name) {
-        var item = $('<li>')
-          .appendTo(list);
-
-        var label = $('<label>')
-          .appendTo(item);
-
-        var input = $('<input>')
-          .attr('type', 'checkbox')
-          .prop('checked', map.hasLayer(layer))
-          .appendTo(label);
-
-        label.append(name);
-
-        input.on('change', function() {
-          if (input.is(':checked')) {
-            map.addLayer(layer);
-          } else {
-            map.removeLayer(layer);
-          }
-        });
-
-        map.on('layeradd layerremove', function() {
-          input.prop('checked', map.hasLayer(layer));
-        });
-      }
-
-      addOverlay(map.noteLayer, I18n.t('javascripts.map.layers.notes'));
-      addOverlay(map.dataLayer, I18n.t('javascripts.map.layers.data'));
-    }
-
-    var baseSection = $('<section>')
-      .addClass('base-layers')
+    var $ui = $("<div>")
+      .attr("class", "layers-ui");
+
+    $("<div>")
+      .attr("class", "sidebar_heading")
+      .appendTo($ui)
+      .append(
+        $("<span>")
+          .text(I18n.t("javascripts.close"))
+          .attr("class", "icon close")
+          .bind("click", toggle))
+      .append(
+        $("<h4>")
+          .text(I18n.t("javascripts.map.layers.header")));
+
+    var baseSection = $("<div>")
+      .attr("class", "section base-layers")

       .appendTo($ui);
 
       .appendTo($ui);
 

-    $('<p>')
-      .text(I18n.t('javascripts.map.layers.base'))
+    var baseLayers = $("<ul class='list-unstyled'>")

       .appendTo(baseSection);
 
       .appendTo(baseSection);
 

-    list = $('<ul>')
-      .appendTo(baseSection);
-
-    layers.forEach(function(layer) {
-      var item = $('<li>')
-        .appendTo(list);
+    layers.forEach(function (layer) {
+      var item = $("<li>")
+        .appendTo(baseLayers);

 
       if (map.hasLayer(layer)) {
 
       if (map.hasLayer(layer)) {

-        item.addClass('active');
+        item.addClass("active");

       }
 
       }
 

-      var div = $('<div>')
+      var div = $("<div>")

         .appendTo(item);
 
         .appendTo(item);
 

-      map.whenReady(function() {
-        var miniMap = L.map(div[0], {attributionControl: false, zoomControl: false})
-          .addLayer(new layer.constructor());
+      map.whenReady(function () {
+        var miniMap = L.map(div[0], { attributionControl: false, zoomControl: false, keyboard: false })
+          .addLayer(new layer.constructor({ apikey: layer.options.apikey }));

 
         miniMap.dragging.disable();
         miniMap.touchZoom.disable();
 
         miniMap.dragging.disable();
         miniMap.touchZoom.disable();


@@ -105,49 +58,134 @@ L.OSM.layers = function(options) {
         miniMap.scrollWheelZoom.disable();
 
         $ui
         miniMap.scrollWheelZoom.disable();
 
         $ui

-          .on('show', shown)
-          .on('hide', hide);
+          .on("show", shown)
+          .on("hide", hide);

 
         function shown() {
           miniMap.invalidateSize();
 
         function shown() {
           miniMap.invalidateSize();

-          setView();
-          map.on('moveend', setView);
+          setView({ animate: false });
+          map.on("moveend", moved);

         }
 
         function hide() {
         }
 
         function hide() {

-          map.off('moveend', setView);
+          map.off("moveend", moved);

         }
 
         }
 

-        function setView() {
-          miniMap.setView(map.getCenter(), Math.max(map.getZoom() - 2, 0));
+        function moved() {
+          setView();
+        }
+
+        function setView(options) {
+          miniMap.setView(map.getCenter(), Math.max(map.getZoom() - 2, 0), options);

         }
       });
 
         }
       });
 

-      var label = $('<label>')
-        .text(layer.options.name)
+      var label = $("<label>")

         .appendTo(item);
 
         .appendTo(item);
 

-      item.on('click', function() {
-        layers.forEach(function(other) {
+      var input = $("<input>")
+        .attr("type", "radio")
+        .prop("checked", map.hasLayer(layer))
+        .appendTo(label);
+
+      label.append(layer.options.name);
+
+      item.on("click", function () {
+        layers.forEach(function (other) {

           if (other === layer) {
             map.addLayer(other);
           } else {
             map.removeLayer(other);
           }
         });
           if (other === layer) {
             map.addLayer(other);
           } else {
             map.removeLayer(other);
           }
         });

+        map.fire("baselayerchange", { layer: layer });

       });
 
       });
 

-      map.on('layeradd layerremove', function() {
-        item.toggleClass('active', map.hasLayer(layer));
+      item.on("dblclick", toggle);
+
+      map.on("layeradd layerremove", function () {
+        item.toggleClass("active", map.hasLayer(layer));
+        input.prop("checked", map.hasLayer(layer));

       });
     });
 
       });
     });
 

+    if (OSM.STATUS !== "api_offline" && OSM.STATUS !== "database_offline") {
+      var overlaySection = $("<div>")
+        .attr("class", "section overlay-layers")
+        .appendTo($ui);
+
+      $("<p>")
+        .text(I18n.t("javascripts.map.layers.overlays"))
+        .attr("class", "text-muted")
+        .appendTo(overlaySection);
+
+      var overlays = $("<ul class='list-unstyled'>")
+        .appendTo(overlaySection);
+
+      var addOverlay = function (layer, name, maxArea) {
+        var item = $("<li>")
+          .tooltip({
+            placement: "top"
+          })
+          .appendTo(overlays);
+
+        var label = $("<label>")
+          .appendTo(item);
+
+        var checked = map.hasLayer(layer);
+
+        var input = $("<input>")
+          .attr("type", "checkbox")
+          .prop("checked", checked)
+          .appendTo(label);
+
+        label.append(I18n.t("javascripts.map.layers." + name));
+
+        input.on("change", function () {
+          checked = input.is(":checked");
+          if (checked) {
+            map.addLayer(layer);
+          } else {
+            map.removeLayer(layer);
+          }
+          map.fire("overlaylayerchange", { layer: layer });
+        });
+
+        map.on("layeradd layerremove", function () {
+          input.prop("checked", map.hasLayer(layer));
+        });
+
+        map.on("zoomend", function () {
+          var disabled = map.getBounds().getSize() >= maxArea;
+          $(input).prop("disabled", disabled);
+
+          if (disabled && $(input).is(":checked")) {
+            $(input).prop("checked", false)
+              .trigger("change");
+            checked = true;
+          } else if (!disabled && !$(input).is(":checked") && checked) {
+            $(input).prop("checked", true)
+              .trigger("change");
+          }
+
+          $(item).attr("class", disabled ? "disabled" : "");
+          item.attr("data-original-title", disabled ?
+            I18n.t("javascripts.site.map_" + name + "_zoom_in_tooltip") : "");
+        });
+      };
+
+      addOverlay(map.noteLayer, "notes", OSM.MAX_NOTE_REQUEST_AREA);
+      addOverlay(map.dataLayer, "data", OSM.MAX_REQUEST_AREA);
+      addOverlay(map.gpsLayer, "gps", Number.POSITIVE_INFINITY);
+    }
+

     options.sidebar.addPane($ui);
 
     function toggle(e) {
       e.stopPropagation();
       e.preventDefault();
     options.sidebar.addPane($ui);
 
     function toggle(e) {
       e.stopPropagation();
       e.preventDefault();

-      options.sidebar.togglePane($ui);
+      options.sidebar.togglePane($ui, button);
+      $(".leaflet-control .control-button").tooltip("hide");

     }
 
     return $container[0];
     }
 
     return $container[0];