X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c441a4dc15f2de78e6c43a51a850b394a25aa5a9..15ceb9e8e3e5e8d585bb67b4b9b5cd132e686893:/app/assets/javascripts/osm.js.erb

diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index 25d6596c2..0315da99c 100644
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -19,8 +19,6 @@ OSM = {
       graphhopper_url
       fossgis_osrm_url
       fossgis_valhalla_url
-      thunderforest_key
-      tracestrack_key
     ]
       .each_with_object({}) do |key, hash|
         hash[key.to_s.upcase] = Settings.send(key) if Settings.respond_to?(key)
@@ -29,7 +27,7 @@ OSM = {
 
   DEFAULT_LOCALE: <%= I18n.default_locale.to_json %>,
 
-  LAYER_DEFINITIONS: <%= YAML.load_file(Rails.root.join("config/layers.yml")).to_json %>,
+  LAYER_DEFINITIONS: <%= MapLayers::full_definitions("config/layers.yml").to_json %>,
   LAYERS_WITH_MAP_KEY: <%= YAML.load_file(Rails.root.join("config/key.yml")).keys.to_json %>,
 
   MARKER_GREEN: <%= image_path("marker-green.png").to_json %>,
@@ -57,7 +55,7 @@ OSM = {
   },
 
   params: function (search) {
-    const query = search || window.location.search;
+    const query = search || location.search;
     return Object.fromEntries(new URLSearchParams(query));
   },