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

[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 6a3400d348831ab48ff53b5f1a2f9e991307f52b..937d9b0528127754462ac1b71874446507f4712d 100644 (file)
--- a/app/assets/javascripts/leaflet.key.js
+++ b/app/assets/javascripts/leaflet.key.js
@@ -1,9 +1,9 @@
 L.OSM.key = function (options) {
-  var control = L.OSM.sidebarPane(options, "key", null, "javascripts.key.title");
+  const control = L.OSM.sidebarPane(options, "key", null, "javascripts.key.title");
 
   control.onAddPane = function (map, button, $ui) {
-    var $section = $("<div>")
-      .attr("class", "section")
+    const $section = $("<div>")
+      .attr("class", "p-3")
       .appendTo($ui);
 
     $ui
@@ -24,7 +24,7 @@ L.OSM.key = function (options) {
     }
 
     function updateButton() {
-      var disabled = ["mapnik", "cyclemap"].indexOf(map.getMapBaseLayerId()) === -1;
+      const disabled = OSM.LAYERS_WITH_MAP_KEY.indexOf(map.getMapBaseLayerId()) === -1;
       button
         .toggleClass("disabled", disabled)
         .attr("data-bs-original-title",
@@ -34,16 +34,16 @@ L.OSM.key = function (options) {
     }
 
     function update() {
-      var layer = map.getMapBaseLayerId(),
-          zoom = map.getZoom();
+      const layerId = map.getMapBaseLayerId(),
+            zoom = map.getZoom();
 
       $(".mapkey-table-entry").each(function () {
-        var data = $(this).data();
-        if (layer === data.layer && zoom >= data.zoomMin && zoom <= data.zoomMax) {
-          $(this).show();
-        } else {
-          $(this).hide();
-        }
+        const data = $(this).data();
+        $(this).toggle(
+          layerId === data.layer &&
+          (!data.zoomMin || zoom >= data.zoomMin) &&
+          (!data.zoomMax || zoom <= data.zoomMax)
+        );
       });
     }
   };