Create osm-specific locate control class

[rails.git] / app / assets / javascripts / index.js

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index f0b96f59fa95d28aa273d8f0362ae290bdfa565d..011f3b28258017b507a1f474942550980b69884e 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,6 +1,8 @@
 //= require_self
 //= require leaflet.sidebar
 //= require_self
 //= require leaflet.sidebar

+//= require leaflet.sidebar-pane

 //= require leaflet.locatecontrol/src/L.Control.Locate
 //= require leaflet.locatecontrol/src/L.Control.Locate

+//= require leaflet.locate

 //= require leaflet.layers
 //= require leaflet.key
 //= require leaflet.note
 //= require leaflet.layers
 //= require leaflet.key
 //= require leaflet.note


@@ -97,34 +99,15 @@ $(document).ready(function () {
     }
   });
 
     }
   });
 

+  var sidebar = L.OSM.sidebar("#map-ui")
+    .addTo(map);
+

   var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";
 
   L.OSM.zoom({ position: position })
     .addTo(map);
 
   var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";
 
   L.OSM.zoom({ position: position })
     .addTo(map);
 

-  var locate = L.control.locate({
-    position: position,
-    icon: "icon geolocate",
-    iconLoading: "icon geolocate",
-    strings: {
-      title: I18n.t("javascripts.map.locate.title"),
-      popup: function (options) {
-        return I18n.t("javascripts.map.locate." + options.unit + "Popup", { count: options.distance });
-      }
-    }
-  }).addTo(map);
-
-  var locateContainer = locate.getContainer();
-
-  $(locateContainer)
-    .removeClass("leaflet-control-locate leaflet-bar")
-    .addClass("control-locate")
-    .children("a")
-    .attr("href", "#")
-    .removeClass("leaflet-bar-part leaflet-bar-part-single")
-    .addClass("control-button");
-
-  var sidebar = L.OSM.sidebar("#map-ui")
+  L.OSM.locate({ position: position })

     .addTo(map);
 
   L.OSM.layers({
     .addTo(map);
 
   L.OSM.layers({


@@ -195,7 +178,7 @@ $(document).ready(function () {
     $(".welcome").addClass("visible");
   }
 
     $(".welcome").addClass("visible");
   }
 

-  $(".welcome .close").on("click", function () {
+  $(".welcome .btn-close").on("click", function () {

     $(".welcome").removeClass("visible");
     Cookies.set("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/", samesite: "lax" });
   });
     $(".welcome").removeClass("visible");
     Cookies.set("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/", samesite: "lax" });
   });


@@ -203,7 +186,7 @@ $(document).ready(function () {
   var bannerExpiry = new Date();
   bannerExpiry.setYear(bannerExpiry.getFullYear() + 1);
 
   var bannerExpiry = new Date();
   bannerExpiry.setYear(bannerExpiry.getFullYear() + 1);
 

-  $("#banner .close-wrap").on("click", function (e) {
+  $("#banner .btn-close").on("click", function (e) {

     var cookieId = e.target.id;
     $("#banner").hide();
     e.preventDefault();
     var cookieId = e.target.id;
     $("#banner").hide();
     e.preventDefault();


@@ -212,13 +195,13 @@ $(document).ready(function () {
     }
   });
 
     }
   });
 

-  if (OSM.PIWIK) {
+  if (OSM.MATOMO) {

     map.on("layeradd", function (e) {
       if (e.layer.options) {
     map.on("layeradd", function (e) {
       if (e.layer.options) {

-        var goal = OSM.PIWIK.goals[e.layer.options.keyid];
+        var goal = OSM.MATOMO.goals[e.layer.options.keyid];

 
         if (goal) {
 
         if (goal) {

-          $("body").trigger("piwikgoal", goal);
+          $("body").trigger("matomogoal", goal);

         }
       }
     });
         }
       }
     });