Rebase to current master

[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 971f80be3354136f7fb90cb260253e5780c968f6..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 %>,