Merge pull request #5417 from tomhughes/social-share-helper

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

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index 27311f7c1441c3d22acde08cbcc526702b0e7e4e..35b958c7aaa097652ccebf1f392087c8a31801b7 100644 (file)
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -5,27 +5,31 @@ L.OSM.layers = function (options) {
     var layers = options.layers;
 
     var baseSection = $("<div>")
     var layers = options.layers;
 
     var baseSection = $("<div>")

-      .attr("class", "section base-layers")
+      .attr("class", "base-layers d-grid gap-3 p-3 border-bottom border-secondary-subtle")

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

-    var baseLayers = $("<ul class='list-unstyled mb-0'>")
-      .appendTo(baseSection);
+    layers.forEach(function (layer, i) {
+      var id = "map-ui-layer-" + i;

 
 

-    layers.forEach(function (layer) {
-      var item = $("<li>")
-        .attr("class", "rounded-3")
-        .appendTo(baseLayers);
+      var buttonContainer = $("<div class='position-relative'>")
+        .appendTo(baseSection);

 
 

-      if (map.hasLayer(layer)) {
-        item.addClass("active");
-      }
+      var mapContainer = $("<div class='position-absolute top-0 start-0 bottom-0 end-0 z-0 bg-body-secondary'>")
+        .appendTo(buttonContainer);

 
 

-      var div = $("<div>")
-        .appendTo(item);
+      var 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 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 () {
 
       map.whenReady(function () {

-        var miniMap = L.map(div[0], { attributionControl: false, zoomControl: false, keyboard: false })
-          .addLayer(new layer.constructor({ apikey: layer.options.apikey }));
+        var miniMap = L.map(mapContainer[0], { attributionControl: false, zoomControl: false, keyboard: false })
+          .addLayer(new layer.constructor(layer.options));

 
         miniMap.dragging.disable();
         miniMap.touchZoom.disable();
 
         miniMap.dragging.disable();
         miniMap.touchZoom.disable();


@@ -55,17 +59,7 @@ L.OSM.layers = function (options) {
         }
       });
 
         }
       });
 

-      var label = $("<label>")
-        .appendTo(item);
-
-      var input = $("<input>")
-        .attr("type", "radio")
-        .prop("checked", map.hasLayer(layer))
-        .appendTo(label);
-
-      label.append(layer.options.name);
-
-      item.on("click", function () {
+      input.on("click", function () {

         layers.forEach(function (other) {
           if (other === layer) {
             map.addLayer(other);
         layers.forEach(function (other) {
           if (other === layer) {
             map.addLayer(other);


@@ -79,19 +73,18 @@ L.OSM.layers = function (options) {
       item.on("dblclick", toggle);
 
       map.on("layeradd layerremove", function () {
       item.on("dblclick", toggle);
 
       map.on("layeradd layerremove", function () {

-        item.toggleClass("active", map.hasLayer(layer));

         input.prop("checked", map.hasLayer(layer));
       });
     });
 
     if (OSM.STATUS !== "api_offline" && OSM.STATUS !== "database_offline") {
       var overlaySection = $("<div>")
         input.prop("checked", map.hasLayer(layer));
       });
     });
 
     if (OSM.STATUS !== "api_offline" && OSM.STATUS !== "database_offline") {
       var overlaySection = $("<div>")

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

         .appendTo($ui);
 
       $("<p>")
         .text(I18n.t("javascripts.map.layers.overlays"))
         .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'>")
         .appendTo(overlaySection);
 
       var overlays = $("<ul class='list-unstyled form-check'>")