X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7dd23a4b5637cce3723abc242ea961841d835305..e20bb507f122f73d18021bf93efe85fc2e189dfb:/app/assets/javascripts/osm.js.erb

diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index 93faad8d1..6a8b856be 100644
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -1,3 +1,5 @@
+//= depend_on application.yml
+
 OSM = {
 <% if defined?(PIWIK) %>
   PIWIK:                 <%= PIWIK.to_json %>,
@@ -10,7 +12,13 @@ OSM = {
   MAX_NOTE_REQUEST_AREA: <%= MAX_NOTE_REQUEST_AREA.to_json %>,
   OVERPASS_URL:          <%= OVERPASS_URL.to_json %>,
   NOMINATIM_URL:         <%= NOMINATIM_URL.to_json %>,
+
+<% if defined?(MAPQUEST_KEY) %>
   MAPQUEST_KEY:          <%= MAPQUEST_KEY.to_json %>,
+<% end %>
+<% if defined?(MAPZEN_VALHALLA_KEY) %>
+  MAPZEN_VALHALLA_KEY:   <%= MAPZEN_VALHALLA_KEY.to_json %>,
+<% end %>
 
   MARKER_GREEN:          <%= image_path("marker-green.png").to_json %>,
   MARKER_RED:            <%= image_path("marker-red.png").to_json %>,
@@ -45,7 +53,12 @@ OSM = {
         j = pair.indexOf('='),
         key = pair.slice(0, j),
         val = pair.slice(++j);
-      params[key] = decodeURIComponent(val);
+
+      try {
+        params[key] = decodeURIComponent(val);
+      } catch (e) {
+        // Ignore parse exceptions
+      }
     }
 
     return params;