Replace use of I18n in javascript with OSM.i18n

[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 f7142ead157b0ba64b8cc19583531ada1f39520e..863a70f32acf72512905034812a3861049ce1c4f 100644 (file)
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -81,7 +81,7 @@ L.OSM.layers = function (options) {
         .appendTo($ui);
 
       $("<p>")
-        .text(I18n.t("javascripts.map.layers.overlays"))
+        .text(OSM.i18n.t("javascripts.map.layers.overlays"))
         .attr("class", "text-body-secondary small mb-2")
         .appendTo(overlaySection);
 
@@ -94,12 +94,13 @@ L.OSM.layers = function (options) {
 
         if (name === "notes" || name === "data") {
           item
-            .attr("title", I18n.t("javascripts.site.map_" + name + "_zoom_in_tooltip"))
+            .attr("title", OSM.i18n.t("javascripts.site.map_" + name + "_zoom_in_tooltip"))
             .tooltip("disable");
         }
 
         const label = $("<label>")
           .attr("class", "form-check-label")
+          .attr("id", `label-layers-${name}`)
           .appendTo(item);
 
         let checked = map.hasLayer(layer);
@@ -110,14 +111,19 @@ L.OSM.layers = function (options) {
           .prop("checked", checked)
           .appendTo(label);
 
-        label.append(I18n.t("javascripts.map.layers." + name));
+        label.append(OSM.i18n.t("javascripts.map.layers." + name));
 
         input.on("change", function () {
           checked = input.is(":checked");
+          if (layer.cancelLoading) {
+            layer.cancelLoading();
+          }
+
           if (checked) {
             map.addLayer(layer);
           } else {
             map.removeLayer(layer);
+            $(`#layers-${name}-loading`).remove();
           }
         });