X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/492a6405306092c39c26b4f6cc8b2e793ee22d43..bf9dd8f350ca1b54afb79dda79506d980ccb5738:/app/assets/javascripts/leaflet.map.js diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js index 4d9fbac8e..a139b6dcd 100644 --- a/app/assets/javascripts/leaflet.map.js +++ b/app/assets/javascripts/leaflet.map.js @@ -1,3 +1,5 @@ +//= require querystring + L.extend(L.LatLngBounds.prototype, { getSize: function () { return (this._northEast.lat - this._southWest.lat) * @@ -16,6 +18,8 @@ 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 thunderforest = I18n.t("javascripts.map.thunderforest", { thunderforest_url: "https://www.thunderforest.com/" }); + var hotosm = I18n.t("javascripts.map.hotosm", { hotosm_url: "https://www.hotosm.org/", osmfrance_url: "https://openstreetmap.fr/" }); this.baseLayers = []; @@ -28,7 +32,7 @@ L.OSM.Map = L.Map.extend({ if (OSM.THUNDERFOREST_KEY) { this.baseLayers.push(new L.OSM.CycleMap({ - attribution: copyright + ". Tiles courtesy of Andy Allan. " + terms, + attribution: copyright + ". " + thunderforest + ". " + terms, apikey: OSM.THUNDERFOREST_KEY, code: "C", keyid: "cyclemap", @@ -36,7 +40,7 @@ L.OSM.Map = L.Map.extend({ })); this.baseLayers.push(new L.OSM.TransportMap({ - attribution: copyright + ". Tiles courtesy of Andy Allan. " + terms, + attribution: copyright + ". " + thunderforest + ". " + terms, apikey: OSM.THUNDERFOREST_KEY, code: "T", keyid: "transportmap", @@ -45,7 +49,7 @@ L.OSM.Map = L.Map.extend({ } this.baseLayers.push(new L.OSM.HOT({ - attribution: copyright + ". Tiles style by Humanitarian OpenStreetMap Team hosted by OpenStreetMap France. " + terms, + attribution: copyright + ". " + hotosm + ". " + terms, code: "H", keyid: "hot", name: I18n.t("javascripts.map.base.hot") @@ -114,7 +118,8 @@ L.OSM.Map = L.Map.extend({ params.mlon = latLng.lng.toFixed(precision); } - var url = window.location.protocol + "//" + OSM.SERVER_URL + "/", + var querystring = require("querystring-component"), + url = window.location.protocol + "//" + OSM.SERVER_URL + "/", query = querystring.stringify(params), hash = OSM.formatHash(this); @@ -180,7 +185,8 @@ L.OSM.Map = L.Map.extend({ params[this._object.type] = this._object.id; } - var query = querystring.stringify(params); + var querystring = require("querystring-component"), + query = querystring.stringify(params); if (query) { str += "?" + query; }