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

[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 138416be12525fa1fb1480c3e5151f69ffb76daa..a671175108f3ab2b464489e808004eb8131eead7 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -6,6 +6,7 @@ OSM = {
 <% end %>
 
   MAX_REQUEST_AREA:        <%= MAX_REQUEST_AREA.to_json %>,
 <% end %>
 
   MAX_REQUEST_AREA:        <%= MAX_REQUEST_AREA.to_json %>,

+  SERVER_PROTOCOL:         <%= SERVER_PROTOCOL.to_json %>,

   SERVER_URL:              <%= SERVER_URL.to_json %>,
   API_VERSION:             <%= API_VERSION.to_json %>,
   STATUS:                  <%= STATUS.to_json %>,
   SERVER_URL:              <%= SERVER_URL.to_json %>,
   API_VERSION:             <%= API_VERSION.to_json %>,
   STATUS:                  <%= STATUS.to_json %>,


@@ -14,14 +15,14 @@ OSM = {
   NOMINATIM_URL:           <%= NOMINATIM_URL.to_json %>,
   GRAPHHOPPER_URL:         <%= GRAPHHOPPER_URL.to_json %>,
   MAPQUEST_DIRECTIONS_URL: <%= MAPQUEST_DIRECTIONS_URL.to_json %>,
   NOMINATIM_URL:           <%= NOMINATIM_URL.to_json %>,
   GRAPHHOPPER_URL:         <%= GRAPHHOPPER_URL.to_json %>,
   MAPQUEST_DIRECTIONS_URL: <%= MAPQUEST_DIRECTIONS_URL.to_json %>,

-  MAPZEN_VALHALLA_URL:     <%= MAPZEN_VALHALLA_URL.to_json %>,

   OSRM_URL:                <%= OSRM_URL.to_json %>,
   OSRM_URL:                <%= OSRM_URL.to_json %>,

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

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

-<% if defined?(MAPZEN_VALHALLA_KEY) %>
-  MAPZEN_VALHALLA_KEY:     <%= MAPZEN_VALHALLA_KEY.to_json %>,
+<% if defined?(THUNDERFOREST_KEY) %>
+  THUNDERFOREST_KEY:       <%= THUNDERFOREST_KEY.to_json %>,

 <% end %>
 
   MARKER_GREEN:            <%= image_path("marker-green.png").to_json %>,
 <% end %>
 
   MARKER_GREEN:            <%= image_path("marker-green.png").to_json %>,


@@ -35,6 +36,8 @@ OSM = {
   OPEN_NOTE_MARKER:        <%= image_path("open_note_marker.png").to_json %>,
   CLOSED_NOTE_MARKER:      <%= image_path("closed_note_marker.png").to_json %>,
 
   OPEN_NOTE_MARKER:        <%= image_path("open_note_marker.png").to_json %>,
   CLOSED_NOTE_MARKER:      <%= image_path("closed_note_marker.png").to_json %>,
 

+  SEARCHING:               <%= image_path("searching.gif").to_json %>,
+

   apiUrl: function (object) {
     var url = "/api/" + OSM.API_VERSION + "/" + object.type + "/" + object.id;
 
   apiUrl: function (object) {
     var url = "/api/" + OSM.API_VERSION + "/" + object.type + "/" + object.id;