X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e731dd71a77ad4ad1e9db22535e89444bb98e5d9..1b6cf67067b6c723527190804c9cd572828b4adb:/app/assets/javascripts/index.js diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 562eb80fd..f0b96f59f 100644 --- 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,7 +208,7 @@ $(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" }); } }); @@ -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 = $("