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

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

diff --git a/app/assets/javascripts/leaflet.key.js b/app/assets/javascripts/leaflet.key.js
index 367c39c1462067ab74ed7fdad466b0814a5b75fa..f89ae0c3d96ff05ae496f8e309c6cd12c2544dfd 100644 (file)
--- a/app/assets/javascripts/leaflet.key.js
+++ b/app/assets/javascripts/leaflet.key.js
@@ -1,37 +1,11 @@
 L.OSM.key = function (options) {
 L.OSM.key = function (options) {

-  var control = L.control(options);
-
-  control.onAdd = function (map) {
-    var $container = $("<div>")
-      .attr("class", "control-key");
-
-    var button = $("<a>")
-      .attr("class", "control-button")
-      .attr("href", "#")
-      .html("<span class=\"icon key\"></span>")
-      .on("click", toggle)
-      .appendTo($container);
-
-    var $ui = $("<div>")
-      .attr("class", "key-ui");
-
-    $("<div>")
-      .attr("class", "sidebar_heading")
-      .appendTo($ui)
-      .append(
-        $("<button type='button' class='btn-close float-end mt-1'>")
-          .attr("aria-label", I18n.t("javascripts.close"))
-          .bind("click", toggle))
-      .append(
-        $("<h4>")
-          .text(I18n.t("javascripts.key.title")));
+  var control = L.OSM.sidebarPane(options, "key", null, "javascripts.key.title");

 
 

+  control.onAddPane = function (map, button, $ui) {

     var $section = $("<div>")
     var $section = $("<div>")

-      .attr("class", "section")
+      .attr("class", "p-3")

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

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

     $ui
       .on("show", shown)
       .on("hide", hidden);
     $ui
       .on("show", shown)
       .on("hide", hidden);


@@ -49,17 +23,8 @@ L.OSM.key = function (options) {
       map.off("zoomend baselayerchange", update);
     }
 
       map.off("zoomend baselayerchange", update);
     }
 

-    function toggle(e) {
-      e.stopPropagation();
-      e.preventDefault();
-      if (!button.hasClass("disabled")) {
-        options.sidebar.togglePane($ui, button);
-      }
-      $(".leaflet-control .control-button").tooltip("hide");
-    }
-

     function updateButton() {
     function updateButton() {

-      var disabled = ["mapnik", "cyclemap"].indexOf(map.getMapBaseLayerId()) === -1;
+      var disabled = OSM.LAYERS_WITH_MAP_KEY.indexOf(map.getMapBaseLayerId()) === -1;

       button
         .toggleClass("disabled", disabled)
         .attr("data-bs-original-title",
       button
         .toggleClass("disabled", disabled)
         .attr("data-bs-original-title",


@@ -74,15 +39,13 @@ L.OSM.key = function (options) {
 
       $(".mapkey-table-entry").each(function () {
         var data = $(this).data();
 
       $(".mapkey-table-entry").each(function () {
         var data = $(this).data();

-        if (layer === data.layer && zoom >= data.zoomMin && zoom <= data.zoomMax) {
-          $(this).show();
-        } else {
-          $(this).hide();
-        }
+        $(this).toggle(
+          layer === data.layer &&
+          (!data.zoomMin || zoom >= data.zoomMin) &&
+          (!data.zoomMax || zoom <= data.zoomMax)
+        );

       });
     }
       });
     }

-
-    return $container[0];

   };
 
   return control;
   };
 
   return control;