X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5e9ab5bc5edb63b7ab7719fa989a18f52e3637a2..b8da7922ec4194e61a1eebb43be787f8b55d1647:/app/assets/javascripts/leaflet.layers.js?ds=sidebyside

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index 09cf1cf60..020876c47 100644
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -1,156 +1,163 @@
-L.OSM.Layers = L.Control.extend({
-  onAdd: function (map) {
-    this._map = map;
-    this._initLayout();
-    return this.$container[0];
-  },
-
-  _initLayout: function () {
-    var map = this._map,
-      layers = this.options.layers;
-
-    this.$container = $('<div>')
-      .attr('class', 'control-layers');
-
-    var link = $('<a>')
-      .attr('class', 'control-button')
-      .attr('href', '#')
-      .attr('title', 'Layers')
-      .html('<span class="icon layers"></span>')
-      .appendTo(this.$container);
-
-    if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
-      this.$ui = $('<div>')
-        .attr('class', 'layers-ui')
-        .appendTo(this.options.uiPane);
-
-      $('<h2>')
-        .text(I18n.t('javascripts.map.layers.header'))
-        .appendTo(this.$ui);
-
-      var overlaySection = $('<section>')
-        .addClass('overlay-layers')
-        .appendTo(this.$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);
-          }
-        });
+L.OSM.layers = function (options) {
+  var control = L.OSM.sidebarPane(options, "layers", "javascripts.map.layers.title", "javascripts.map.layers.header");
 
-        map.on('layeradd layerremove', function() {
-          input.prop('checked', map.hasLayer(layer));
-        });
-      }
+  control.onAddPane = function (map, button, $ui, toggle) {
+    var layers = options.layers;
 
-      addOverlay(map.noteLayer, I18n.t('javascripts.map.layers.notes'));
-      addOverlay(map.dataLayer, I18n.t('javascripts.map.layers.data'));
-    }
-
-    var baseSection = $('<section>')
-      .addClass('base-layers')
-      .appendTo(this.$ui);
+    var baseSection = $("<div>")
+      .attr("class", "section base-layers")
+      .appendTo($ui);
 
-    $('<p>')
-      .text(I18n.t('javascripts.map.layers.base'))
+    var baseLayers = $("<ul class='list-unstyled'>")
       .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)) {
-        item.addClass('active');
+        item.addClass("active");
       }
 
-      var div = $('<div>')
+      var div = $("<div>")
         .appendTo(item);
 
-      map.whenReady(function() {
-        var miniMap = L.map(div[0], {attributionControl: false, zoomControl: false})
-          .setView(map.getCenter(), Math.max(map.getZoom() - 2, 0))
-          .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.doubleClickZoom.disable();
         miniMap.scrollWheelZoom.disable();
 
-        map.on('moveend', function() {
-          miniMap.setView(map.getCenter(), Math.max(map.getZoom() - 2, 0));
-        });
+        $ui
+          .on("show", shown)
+          .on("hide", hide);
+
+        function shown() {
+          miniMap.invalidateSize();
+          setView({ animate: false });
+          map.on("moveend", moved);
+        }
 
-        div.data('map', miniMap);
+        function hide() {
+          map.off("moveend", moved);
+        }
+
+        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);
 
-      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);
           }
         });
+        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));
       });
     });
 
-    $(link).on('click', $.proxy(this.toggleLayers, this));
-  },
+    if (OSM.STATUS !== "api_offline" && OSM.STATUS !== "database_offline") {
+      var overlaySection = $("<div>")
+        .attr("class", "section overlay-layers")
+        .appendTo($ui);
 
-  toggleLayers: function (e) {
-    e.stopPropagation();
-    e.preventDefault();
+      $("<p>")
+        .text(I18n.t("javascripts.map.layers.overlays"))
+        .attr("class", "text-muted")
+        .appendTo(overlaySection);
 
-    var controlContainer = $('.leaflet-control-container .leaflet-top.leaflet-right');
+      var overlays = $("<ul class='list-unstyled form-check'>")
+        .appendTo(overlaySection);
 
-    if (this.$ui.is(':visible')) {
-      $(this.options.uiPane).hide();
-      controlContainer.css({paddingRight: '0'});
-    } else {
-      $(this.options.uiPane).show();
-      controlContainer.css({paddingRight: '230px'});
-    }
+      var addOverlay = function (layer, name, maxArea) {
+        var item = $("<li>")
+          .appendTo(overlays);
 
-    this.$ui.find('.base-layers .leaflet-container').each(function() {
-      $(this).data('map').invalidateSize();
-    });
-  }
-});
+        if (name === "notes" || name === "data") {
+          item
+            .attr("title", I18n.t("javascripts.site.map_" + name + "_zoom_in_tooltip"))
+            .tooltip("disable");
+        }
+
+        var label = $("<label>")
+          .attr("class", "form-check-label")
+          .appendTo(item);
+
+        var checked = map.hasLayer(layer);
+
+        var input = $("<input>")
+          .attr("type", "checkbox")
+          .attr("class", "form-check-input")
+          .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" : "")
+            .tooltip(disabled ? "enable" : "disable");
+        });
+      };
+
+      addOverlay(map.noteLayer, "notes", OSM.MAX_NOTE_REQUEST_AREA);
+      addOverlay(map.dataLayer, "data", OSM.MAX_REQUEST_AREA);
+      addOverlay(map.gpsLayer, "gps", Number.POSITIVE_INFINITY);
+    }
+  };
 
-L.OSM.layers = function(options) {
-  return new L.OSM.Layers(options);
+  return control;
 };