X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4cf3c3b6ed7cc6ab0728b320afde5854489629fb..4b36fee5de65f7dee2360225049e71dfbf2657ae:/app/assets/javascripts/leaflet.map.js?ds=sidebyside diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js index 497062e44..ffb2d7a21 100644 --- a/app/assets/javascripts/leaflet.map.js +++ b/app/assets/javascripts/leaflet.map.js @@ -1,4 +1,4 @@ -//= require querystring +//= require qs/dist/qs L.extend(L.LatLngBounds.prototype, { getSize: function () { @@ -18,6 +18,7 @@ L.OSM.Map = L.Map.extend({ var copyright = I18n.t("javascripts.map.copyright", { copyright_url: "/copyright" }); var donate = I18n.t("javascripts.map.donate_link_text", { donate_url: "https://donate.openstreetmap.org" }); var terms = I18n.t("javascripts.map.terms", { terms_url: "https://wiki.osmfoundation.org/wiki/Terms_of_Use" }); + var cyclosm = I18n.t("javascripts.map.cyclosm", { cyclosm_url: "https://www.cyclosm.org", osmfrance_url: "https://openstreetmap.fr/" }); var thunderforest = I18n.t("javascripts.map.thunderforest", { thunderforest_url: "https://www.thunderforest.com/" }); var memomaps = I18n.t("javascripts.map.opnvkarte", { memomaps_url: "https://memomaps.de/" }); var hotosm = I18n.t("javascripts.map.hotosm", { hotosm_url: "https://www.hotosm.org/", osmfrance_url: "https://openstreetmap.fr/" }); @@ -31,6 +32,13 @@ L.OSM.Map = L.Map.extend({ name: I18n.t("javascripts.map.base.standard") })); + this.baseLayers.push(new L.OSM.CyclOSM({ + attribution: copyright + ". " + cyclosm + ". " + terms, + code: "Y", + keyid: "cyclosm", + name: I18n.t("javascripts.map.base.cyclosm") + })); + if (OSM.THUNDERFOREST_KEY) { this.baseLayers.push(new L.OSM.CycleMap({ attribution: copyright + ". " + thunderforest + ". " + terms, @@ -49,7 +57,7 @@ L.OSM.Map = L.Map.extend({ })); } - this.baseLayers.push(new L.OSM.OPNVKarte ({ + this.baseLayers.push(new L.OSM.OPNVKarte({ attribution: copyright + ". " + memomaps + ". " + terms, code: "O", keyid: "opnvkarte", @@ -126,9 +134,8 @@ L.OSM.Map = L.Map.extend({ params.mlon = latLng.lng.toFixed(precision); } - var querystring = require("querystring-component"), - url = window.location.protocol + "//" + OSM.SERVER_URL + "/", - query = querystring.stringify(params), + var url = window.location.protocol + "//" + OSM.SERVER_URL + "/", + query = Qs.stringify(params), hash = OSM.formatHash(this); if (query) url += "?" + query; @@ -193,8 +200,7 @@ L.OSM.Map = L.Map.extend({ params[this._object.type] = this._object.id; } - var querystring = require("querystring-component"), - query = querystring.stringify(params); + var query = Qs.stringify(params); if (query) { str += "?" + query; }