Merge branch 'master' into feature/add-communities-page

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 6584864d544a4e05c92cb2f73bed1dd6a9b1f4d6..5ba36a455db9e3a06ef467a872657844e8f972d9 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,6 +1,7 @@
 //= require_self
 //= require leaflet.sidebar
 //= require_self
 //= require leaflet.sidebar

-//= require leaflet.locate
+//= require leaflet.sidebar-pane
+//= require leaflet.locatecontrol/src/L.Control.Locate

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


@@ -20,17 +21,16 @@
 //= require index/changeset
 //= require index/query
 //= require router
 //= require index/changeset
 //= require index/query
 //= require router

-//= require querystring
+//= require qs/dist/qs

 
 $(document).ready(function () {
 
 $(document).ready(function () {

-  var querystring = require("querystring-component");
-

   var loaderTimeout;
 
   var map = new L.OSM.Map("map", {
     zoomControl: false,
     layerControl: false,
   var loaderTimeout;
 
   var map = new L.OSM.Map("map", {
     zoomControl: false,
     layerControl: false,

-    contextmenu: true
+    contextmenu: true,
+    worldCopyJump: true

   });
 
   OSM.loadSidebarContent = function (path, callback) {
   });
 
   OSM.loadSidebarContent = function (path, callback) {


@@ -109,9 +109,9 @@ $(document).ready(function () {
     iconLoading: "icon geolocate",
     strings: {
       title: I18n.t("javascripts.map.locate.title"),
     iconLoading: "icon geolocate",
     strings: {
       title: I18n.t("javascripts.map.locate.title"),

-      metersUnit: I18n.t("javascripts.map.locate.metersUnit"),
-      feetUnit: I18n.t("javascripts.map.locate.feetUnit"),
-      popup: I18n.t("javascripts.map.locate.popup")
+      popup: function (options) {
+        return I18n.t("javascripts.map.locate." + options.unit + "Popup", { count: options.distance });
+      }

     }
   }).addTo(map);
 
     }
   }).addTo(map);
 


@@ -189,38 +189,37 @@ $(document).ready(function () {
       map.getLayersCode(),
       map._object);
 
       map.getLayersCode(),
       map._object);
 

-    $.removeCookie("_osm_location");
-    $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });
+    Cookies.set("_osm_location", OSM.locationCookie(map), { secure: true, expires: expiry, path: "/", samesite: "lax" });

   });
 
   });
 

-  if ($.cookie("_osm_welcome") !== "hide") {
+  if (Cookies.get("_osm_welcome") !== "hide") {

     $(".welcome").addClass("visible");
   }
 
     $(".welcome").addClass("visible");
   }
 

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

     $(".welcome").removeClass("visible");
     $(".welcome").removeClass("visible");

-    $.cookie("_osm_welcome", "hide", { expires: expiry, path: "/" });
+    Cookies.set("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/", samesite: "lax" });

   });
 
   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();
     if (cookieId) {
     var cookieId = e.target.id;
     $("#banner").hide();
     e.preventDefault();
     if (cookieId) {

-      $.cookie(cookieId, "hide", { expires: bannerExpiry, path: "/" });
+      Cookies.set(cookieId, "hide", { secure: true, expires: bannerExpiry, path: "/", samesite: "lax" });

     }
   });
 
     }
   });
 

-  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);

         }
       }
     });
         }
       }
     });


@@ -263,7 +262,7 @@ $(document).ready(function () {
     var iframe = $("<iframe>")
       .hide()
       .appendTo("body")
     var iframe = $("<iframe>")
       .hide()
       .appendTo("body")

-      .attr("src", url + querystring.stringify(query))
+      .attr("src", url + Qs.stringify(query))

       .on("load", function () {
         $(this).remove();
         loaded = true;
       .on("load", function () {
         $(this).remove();
         loaded = true;


@@ -308,7 +307,7 @@ $(document).ready(function () {
     };
 
     page.load = function () {
     };
 
     page.load = function () {

-      var params = querystring.parse(location.search.substring(1));
+      var params = Qs.parse(location.search.substring(1));

       if (params.query) {
         $("#sidebar .search_form input[name=query]").value(params.query);
       }
       if (params.query) {
         $("#sidebar .search_form input[name=query]").value(params.query);
       }