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

[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 10b7cfdb81cda46676c9d397ded0d558fcf61af6..391ba64ef6a63c91ee055cc537d6fb83c8dfc10c 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -1,30 +1,26 @@
-//= depend_on application.yml
+//= depend_on settings.yml
+//= depend_on settings.local.yml
+//= require querystring

 
 OSM = {
 <% if defined?(PIWIK) %>
   PIWIK:                   <%= PIWIK.to_json %>,
 <% end %>
 
 
 OSM = {
 <% if defined?(PIWIK) %>
   PIWIK:                   <%= PIWIK.to_json %>,
 <% end %>
 

-  MAX_REQUEST_AREA:        <%= MAX_REQUEST_AREA.to_json %>,
-  SERVER_URL:              <%= SERVER_URL.to_json %>,
-  API_VERSION:             <%= API_VERSION.to_json %>,
-  STATUS:                  <%= STATUS.to_json %>,
-  MAX_NOTE_REQUEST_AREA:   <%= MAX_NOTE_REQUEST_AREA.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 %>,
-  MAPZEN_VALHALLA_URL:     <%= MAPZEN_VALHALLA_URL.to_json %>,
-  OSRM_URL:                <%= OSRM_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 %>
-<% if defined?(THUNDERFOREST_KEY) %>
-  THUNDERFOREST_KEY:       <%= THUNDERFOREST_KEY.to_json %>,
+  MAX_REQUEST_AREA:        <%= Settings.max_request_area.to_json %>,
+  SERVER_PROTOCOL:         <%= Settings.server_protocol.to_json %>,
+  SERVER_URL:              <%= Settings.server_url.to_json %>,
+  API_VERSION:             <%= Settings.api_version.to_json %>,
+  STATUS:                  <%= Settings.status.to_json %>,
+  MAX_NOTE_REQUEST_AREA:   <%= Settings.max_note_request_area.to_json %>,
+  OVERPASS_URL:            <%= Settings.overpass_url.to_json %>,
+  NOMINATIM_URL:           <%= Settings.nominatim_url.to_json %>,
+  GRAPHHOPPER_URL:         <%= Settings.graphhopper_url.to_json %>,
+  FOSSGIS_OSRM_URL:        <%= Settings.fossgis_osrm_url.to_json %>,
+  DEFAULT_LOCALE:          <%= I18n.default_locale.to_json %>,
+
+<% if Settings.key?(:thunderforest_key) %>
+  THUNDERFOREST_KEY:       <%= Settings.thunderforest_key.to_json %>,

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


@@ -38,6 +34,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;
 


@@ -141,7 +139,8 @@ OSM = {
   },
 
   parseHash: function(hash) {
   },
 
   parseHash: function(hash) {

-    var args = {};
+    var querystring = require("querystring-component"),
+        args = {};

 
     var i = hash.indexOf('#');
     if (i < 0) {
 
     var i = hash.indexOf('#');
     if (i < 0) {


@@ -216,7 +215,7 @@ OSM = {
 
     return 6372795 * 2 * Math.asin(
       Math.sqrt(
 
     return 6372795 * 2 * Math.asin(
       Math.sqrt(

-        Math.pow(Math.sin(latdiff / 2), 2) + 
+        Math.pow(Math.sin(latdiff / 2), 2) +

         Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(lngdiff / 2), 2)
       ));
   }
         Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(lngdiff / 2), 2)
       ));
   }