X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e731dd71a77ad4ad1e9db22535e89444bb98e5d9..8a42bc2eff8563d206615cb8810ad87e9e6e5be2:/app/assets/javascripts/leaflet.map.js
diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index 797a57e20..d47b89617 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,9 @@ 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 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/" });
this.baseLayers = [];
@@ -30,7 +33,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",
@@ -38,7 +41,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",
@@ -46,8 +49,15 @@ L.OSM.Map = L.Map.extend({
}));
}
+ this.baseLayers.push(new L.OSM.OPNVKarte({
+ attribution: copyright + ". " + memomaps + ". " + terms,
+ code: "O",
+ keyid: "opnvkarte",
+ name: I18n.t("javascripts.map.base.opnvkarte")
+ }));
+
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")
@@ -116,9 +126,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;
@@ -183,8 +192,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;
}