X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/eb7678145a87c1b9e3cd7ff2d3b5dc08132e4b51..b4256ae6a389cad58a8dee903269f47d2e43a194:/app/assets/javascripts/leaflet.layers.js

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index 974962ffd..020876c47 100644
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -1,43 +1,17 @@
-L.OSM.layers = function(options) {
-  var control = L.control(options);
+L.OSM.layers = function (options) {
+  var control = L.OSM.sidebarPane(options, "layers", "javascripts.map.layers.title", "javascripts.map.layers.header");
 
-  control.onAdd = function (map) {
+  control.onAddPane = function (map, button, $ui, toggle) {
     var layers = options.layers;
 
-    var $container = $("<div>")
-      .attr("class", "control-layers");
-
-    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);
-
-    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);
 
-    var baseLayers = $("<ul>")
+    var baseLayers = $("<ul class='list-unstyled'>")
       .appendTo(baseSection);
 
-    layers.forEach(function(layer) {
+    layers.forEach(function (layer) {
       var item = $("<li>")
         .appendTo(baseLayers);
 
@@ -48,8 +22,8 @@ L.OSM.layers = function(options) {
       var div = $("<div>")
         .appendTo(item);
 
-      map.whenReady(function() {
-        var miniMap = L.map(div[0], {attributionControl: false, zoomControl: false, keyboard: false})
+      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();
@@ -63,7 +37,7 @@ L.OSM.layers = function(options) {
 
         function shown() {
           miniMap.invalidateSize();
-          setView({animate: false});
+          setView({ animate: false });
           map.on("moveend", moved);
         }
 
@@ -84,26 +58,26 @@ L.OSM.layers = function(options) {
         .appendTo(item);
 
       var input = $("<input>")
-         .attr("type", "radio")
-         .prop("checked", map.hasLayer(layer))
-         .appendTo(label);
+        .attr("type", "radio")
+        .prop("checked", map.hasLayer(layer))
+        .appendTo(label);
 
       label.append(layer.options.name);
 
-      item.on("click", function() {
-        layers.forEach(function(other) {
+      item.on("click", function () {
+        layers.forEach(function (other) {
           if (other === layer) {
             map.addLayer(other);
           } else {
             map.removeLayer(other);
           }
         });
-        map.fire("baselayerchange", {layer: layer});
+        map.fire("baselayerchange", { layer: layer });
       });
 
       item.on("dblclick", toggle);
 
-      map.on("layeradd layerremove", function() {
+      map.on("layeradd layerremove", function () {
         item.toggleClass("active", map.hasLayer(layer));
         input.prop("checked", map.hasLayer(layer));
       });
@@ -116,46 +90,51 @@ L.OSM.layers = function(options) {
 
       $("<p>")
         .text(I18n.t("javascripts.map.layers.overlays"))
-        .attr("class", "deemphasize")
+        .attr("class", "text-muted")
         .appendTo(overlaySection);
 
-      var overlays = $("<ul>")
+      var overlays = $("<ul class='list-unstyled form-check'>")
         .appendTo(overlaySection);
 
       var addOverlay = function (layer, name, maxArea) {
         var item = $("<li>")
-          .tooltip({
-            placement: "top"
-          })
           .appendTo(overlays);
 
+        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() {
+        input.on("change", function () {
           checked = input.is(":checked");
           if (checked) {
             map.addLayer(layer);
           } else {
             map.removeLayer(layer);
           }
-          map.fire("overlaylayerchange", {layer: layer});
+          map.fire("overlaylayerchange", { layer: layer });
         });
 
-        map.on("layeradd layerremove", function() {
+        map.on("layeradd layerremove", function () {
           input.prop("checked", map.hasLayer(layer));
         });
 
-        map.on("zoomend", function() {
+        map.on("zoomend", function () {
           var disabled = map.getBounds().getSize() >= maxArea;
           $(input).prop("disabled", disabled);
 
@@ -168,9 +147,9 @@ L.OSM.layers = function(options) {
               .trigger("change");
           }
 
-          $(item).attr("class", disabled ? "disabled" : "");
-          item.attr("data-original-title", disabled ?
-            I18n.t("javascripts.site.map_" + name + "_zoom_in_tooltip") : "");
+          $(item)
+            .attr("class", disabled ? "disabled" : "")
+            .tooltip(disabled ? "enable" : "disable");
         });
       };
 
@@ -178,17 +157,6 @@ L.OSM.layers = function(options) {
       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.togglePane($ui, button);
-      $(".leaflet-control .control-button").tooltip("hide");
-    }
-
-    return $container[0];
   };
 
   return control;