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 039cc0ef66b5ccb4c6da47ec98ae0c21dcd0e1d8..011f3b28258017b507a1f474942550980b69884e 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -1,5 +1,7 @@
 //= require_self
 //= require leaflet.sidebar
 //= require_self
 //= require leaflet.sidebar

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

 //= require leaflet.locate
 //= require leaflet.layers
 //= require leaflet.key
 //= require leaflet.locate
 //= require leaflet.layers
 //= require leaflet.key


@@ -20,18 +22,16 @@
 //= require index/changeset
 //= require index/query
 //= require router
 //= require index/changeset
 //= require index/query
 //= require router

-//= require bowser
-//= 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) {


@@ -99,32 +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: I18n.t("javascripts.map.locate.popup")
-    }
-  }).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({


@@ -188,38 +171,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);

         }
       }
     });
         }
       }
     });


@@ -255,19 +237,14 @@ $(document).ready(function () {
           bottom: bbox.getSouth() - 0.0001
         };
 
           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")
 
     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;
       .on("load", function () {
         $(this).remove();
         loaded = true;


@@ -312,7 +289,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);
       }