X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5c0a55d7ff41a20caedee2aa526eefbc7c6b0624..3d3b2b47964ec91ef1ab1946b7258a06665caced:/app/assets/javascripts/leaflet.layers.js

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index 1a34b05c2..f7142ead1 100644
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -1,35 +1,35 @@
 L.OSM.layers = function (options) {
-  var control = L.OSM.sidebarPane(options, "layers", "javascripts.map.layers.title", "javascripts.map.layers.header");
+  const control = L.OSM.sidebarPane(options, "layers", "javascripts.map.layers.title", "javascripts.map.layers.header");
 
   control.onAddPane = function (map, button, $ui, toggle) {
-    var layers = options.layers;
+    const layers = options.layers;
 
-    var baseSection = $("<div>")
+    const baseSection = $("<div>")
       .attr("class", "base-layers d-grid gap-3 p-3 border-bottom border-secondary-subtle")
       .appendTo($ui);
 
     layers.forEach(function (layer, i) {
-      var id = "map-ui-layer-" + i;
+      const id = "map-ui-layer-" + i;
 
-      var buttonContainer = $("<div class='position-relative'>")
+      const buttonContainer = $("<div class='position-relative'>")
         .appendTo(baseSection);
 
-      var mapContainer = $("<div class='position-absolute top-0 start-0 bottom-0 end-0 z-0'>")
+      const mapContainer = $("<div class='position-absolute top-0 start-0 bottom-0 end-0 z-0 bg-body-secondary'>")
         .appendTo(buttonContainer);
 
-      var input = $("<input type='radio' class='btn-check' name='layer'>")
+      const input = $("<input type='radio' class='btn-check' name='layer'>")
         .prop("id", id)
         .prop("checked", map.hasLayer(layer))
         .appendTo(buttonContainer);
 
-      var item = $("<label class='btn btn-outline-primary border-4 rounded-3 bg-transparent position-absolute top-0 start-0 bottom-0 end-0 m-n1 overflow-hidden'>")
+      const item = $("<label class='btn btn-outline-primary border-4 rounded-3 bg-transparent position-absolute p-0 h-100 w-100 overflow-hidden'>")
         .prop("for", id)
         .append($("<span class='badge position-absolute top-0 start-0 rounded-top-0 rounded-start-0 py-1 px-2 bg-body bg-opacity-75 text-body text-wrap text-start fs-6 lh-base'>").append(layer.options.name))
         .appendTo(buttonContainer);
 
       map.whenReady(function () {
-        var miniMap = L.map(mapContainer[0], { attributionControl: false, zoomControl: false, keyboard: false })
-          .addLayer(new layer.constructor({ apikey: layer.options.apikey }));
+        const miniMap = L.map(mapContainer[0], { attributionControl: false, zoomControl: false, keyboard: false })
+          .addLayer(new layer.constructor(layer.options));
 
         miniMap.dragging.disable();
         miniMap.touchZoom.disable();
@@ -60,38 +60,36 @@ L.OSM.layers = function (options) {
       });
 
       input.on("click", function () {
-        layers.forEach(function (other) {
-          if (other === layer) {
-            map.addLayer(other);
-          } else {
+        for (const other of layers) {
+          if (other !== layer) {
             map.removeLayer(other);
           }
-        });
-        map.fire("baselayerchange", { layer: layer });
+        }
+        map.addLayer(layer);
       });
 
       item.on("dblclick", toggle);
 
-      map.on("layeradd layerremove", function () {
+      map.on("baselayerchange", function () {
         input.prop("checked", map.hasLayer(layer));
       });
     });
 
     if (OSM.STATUS !== "api_offline" && OSM.STATUS !== "database_offline") {
-      var overlaySection = $("<div>")
+      const overlaySection = $("<div>")
         .attr("class", "overlay-layers p-3")
         .appendTo($ui);
 
       $("<p>")
         .text(I18n.t("javascripts.map.layers.overlays"))
-        .attr("class", "text-muted")
+        .attr("class", "text-body-secondary small mb-2")
         .appendTo(overlaySection);
 
-      var overlays = $("<ul class='list-unstyled form-check'>")
+      const overlays = $("<ul class='list-unstyled form-check'>")
         .appendTo(overlaySection);
 
-      var addOverlay = function (layer, name, maxArea) {
-        var item = $("<li>")
+      const addOverlay = function (layer, name, maxArea) {
+        const item = $("<li>")
           .appendTo(overlays);
 
         if (name === "notes" || name === "data") {
@@ -100,13 +98,13 @@ L.OSM.layers = function (options) {
             .tooltip("disable");
         }
 
-        var label = $("<label>")
+        const label = $("<label>")
           .attr("class", "form-check-label")
           .appendTo(item);
 
-        var checked = map.hasLayer(layer);
+        let checked = map.hasLayer(layer);
 
-        var input = $("<input>")
+        const input = $("<input>")
           .attr("type", "checkbox")
           .attr("class", "form-check-input")
           .prop("checked", checked)
@@ -121,15 +119,14 @@ L.OSM.layers = function (options) {
           } else {
             map.removeLayer(layer);
           }
-          map.fire("overlaylayerchange", { layer: layer });
         });
 
-        map.on("layeradd layerremove", function () {
+        map.on("overlayadd overlayremove", function () {
           input.prop("checked", map.hasLayer(layer));
         });
 
         map.on("zoomend", function () {
-          var disabled = map.getBounds().getSize() >= maxArea;
+          const disabled = map.getBounds().getSize() >= maxArea;
           $(input).prop("disabled", disabled);
 
           if (disabled && $(input).is(":checked")) {