Rename piwik to matomo and merge configuration into settings

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

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 2c7d70e11ad99603056546396c017cc7e1711ddc..6d379ca8c32caa8b038af3fa7c7cb4fa096cca13 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,6 +1,6 @@
 //= require_self
 //= require leaflet.sidebar
-//= require leaflet.locate
+//= require leaflet.locatecontrol/src/L.Control.Locate
 //= require leaflet.layers
 //= require leaflet.key
 //= require leaflet.note
@@ -20,18 +20,16 @@
 //= require index/changeset
 //= require index/query
 //= require router
-//= require bowser
-//= require querystring
+//= require qs/dist/qs
 
 $(document).ready(function () {
-  var querystring = require("querystring-component");
-
   var loaderTimeout;
 
   var map = new L.OSM.Map("map", {
     zoomControl: false,
     layerControl: false,
-    contextmenu: true
+    contextmenu: true,
+    worldCopyJump: true
   });
 
   OSM.loadSidebarContent = function (path, callback) {
@@ -110,7 +108,9 @@ $(document).ready(function () {
     iconLoading: "icon geolocate",
     strings: {
       title: I18n.t("javascripts.map.locate.title"),
-      popup: I18n.t("javascripts.map.locate.popup")
+      popup: function (options) {
+        return I18n.t("javascripts.map.locate." + options.unit + "Popup", { count: options.distance });
+      }
     }
   }).addTo(map);
 
@@ -188,17 +188,16 @@ $(document).ready(function () {
       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 .close-wrap").on("click", function () {
+  $(".welcome .close").on("click", function () {
     $(".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();
@@ -209,17 +208,17 @@ $(document).ready(function () {
     $("#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) {
-        var goal = OSM.PIWIK.goals[e.layer.options.keyid];
+        var goal = OSM.MATOMO.goals[e.layer.options.keyid];
 
         if (goal) {
-          $("body").trigger("piwikgoal", goal);
+          $("body").trigger("matomogoal", goal);
         }
       }
     });
@@ -255,19 +254,14 @@ $(document).ready(function () {
           bottom: bbox.getSouth() - 0.0001
         };
 
-    if (location.protocol === "http" ||
-        bowser.check({ chrome: "53", firefox: "55" })) {
-      url = "http://127.0.0.1:8111/load_and_zoom?";
-    } else {
-      url = "https://127.0.0.1:8112/load_and_zoom?";
-    }
+    url = "http://127.0.0.1:8111/load_and_zoom?";
 
     if (object) query.select = object.type + object.id;
 
     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;
@@ -312,7 +306,7 @@ $(document).ready(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);
       }
@@ -347,6 +341,10 @@ $(document).ready(function () {
           });
         }
       });
+
+      $(".colour-preview-box").each(function () {
+        $(this).css("background-color", $(this).data("colour"));
+      });
     }
 
     page.unload = function () {