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

[rails.git] / app / assets / javascripts / osm.js.erb

diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index a671175108f3ab2b464489e808004eb8131eead7..a9e1a475ec15d8daf302e4cc9faeb2355adb3859 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -14,13 +14,9 @@ OSM = {
   OVERPASS_URL:            <%= OVERPASS_URL.to_json %>,
   NOMINATIM_URL:           <%= NOMINATIM_URL.to_json %>,
   GRAPHHOPPER_URL:         <%= GRAPHHOPPER_URL.to_json %>,
   OVERPASS_URL:            <%= OVERPASS_URL.to_json %>,
   NOMINATIM_URL:           <%= NOMINATIM_URL.to_json %>,
   GRAPHHOPPER_URL:         <%= GRAPHHOPPER_URL.to_json %>,

-  MAPQUEST_DIRECTIONS_URL: <%= MAPQUEST_DIRECTIONS_URL.to_json %>,
-  OSRM_URL:                <%= OSRM_URL.to_json %>,
+  FOSSGIS_OSRM_URL:        <%= FOSSGIS_OSRM_URL.to_json %>,

   DEFAULT_LOCALE:          <%= I18n.default_locale.to_json %>,
 
   DEFAULT_LOCALE:          <%= I18n.default_locale.to_json %>,
 

-<% if defined?(MAPQUEST_KEY) %>
-  MAPQUEST_KEY:            <%= MAPQUEST_KEY.to_json %>,
-<% end %>

 <% if defined?(THUNDERFOREST_KEY) %>
   THUNDERFOREST_KEY:       <%= THUNDERFOREST_KEY.to_json %>,
 <% end %>
 <% if defined?(THUNDERFOREST_KEY) %>
   THUNDERFOREST_KEY:       <%= THUNDERFOREST_KEY.to_json %>,
 <% end %>