Merge remote-tracking branch 'upstream/pull/5138'

[rails.git] / app / assets / javascripts / leaflet.map.js

diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index 88d16bc8e4595801c1b389e05a886ea094803c23..a907de29581c548d004038f6b61cb2520aaebf93 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -22,7 +22,7 @@ L.OSM.Map = L.Map.extend({
     var copyright = I18n.t("javascripts.map.copyright_text", { copyright_link: copyright_link });
 
     var donate = $("<a>", {
-      "href": "https://donate.openstreetmap.org",
+      "href": "https://supporting.openstreetmap.org",
       "class": "donate-attr",
       "text": I18n.t("javascripts.map.make_a_donation")
     }).prop("outerHTML");
@@ -51,12 +51,12 @@ L.OSM.Map = L.Map.extend({
     }).prop("outerHTML");
     var thunderforest = I18n.t("javascripts.map.thunderforest_credit", { thunderforest_link: thunderforest_link });
 
-    var memomaps_link = $("<a>", {
-      href: "https://memomaps.de/",
+    var tracestrack_link = $("<a>", {
+      href: "https://www.tracestrack.com/",
       target: "_blank",
-      text: I18n.t("javascripts.map.memomaps")
+      text: I18n.t("javascripts.map.tracestrack")
     }).prop("outerHTML");
-    var memomaps = I18n.t("javascripts.map.opnvkarte_credit", { memomaps_link: memomaps_link });
+    var tracestrack = I18n.t("javascripts.map.tracestrack_credit", { tracestrack_link: tracestrack_link });
 
     var hotosm_link = $("<a>", {
       href: "https://www.hotosm.org/",
@@ -99,12 +99,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")
-    }));
+    if (OSM.TRACESTRACK_KEY) {
+      this.baseLayers.push(new L.OSM.TracestrackTopo({
+        attribution: copyright + ". " + tracestrack + ". " + terms,
+        apikey: OSM.TRACESTRACK_KEY,
+        code: "P",
+        keyid: "tracestracktopo",
+        name: I18n.t("javascripts.map.base.tracestracktop_topo")
+      }));
+    }
 
     this.baseLayers.push(new L.OSM.HOT({
       attribution: copyright + ". " + hotosm + ". " + terms,
@@ -121,8 +124,7 @@ L.OSM.Map = L.Map.extend({
 
     this.gpsLayer = new L.OSM.GPS({
       pane: "overlayPane",
-      code: "G",
-      name: I18n.t("javascripts.map.base.gps")
+      code: "G"
     });
 
     this.on("layeradd", function (event) {