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

[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 31bb23c4b7458dff99af3aaf48bb200f92f6a4dd..3e2e7c866e6998403613a361abcda082f7387093 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -1,4 +1,6 @@
-//= depend_on application.yml
+//= depend_on settings.yml
+//= depend_on settings.local.yml
+//= require qs/dist/qs

 
 OSM = {
 <% if defined?(PIWIK) %>
 
 OSM = {
 <% if defined?(PIWIK) %>


@@ -9,7 +11,7 @@ OSM = {
   SERVER_PROTOCOL:         <%= Settings.server_protocol.to_json %>,
   SERVER_URL:              <%= Settings.server_url.to_json %>,
   API_VERSION:             <%= Settings.api_version.to_json %>,
   SERVER_PROTOCOL:         <%= Settings.server_protocol.to_json %>,
   SERVER_URL:              <%= Settings.server_url.to_json %>,
   API_VERSION:             <%= Settings.api_version.to_json %>,

-  STATUS:                  <%= STATUS.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 %>,
   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 %>,


@@ -24,9 +26,9 @@ OSM = {
   MARKER_GREEN:            <%= image_path("marker-green.png").to_json %>,
   MARKER_RED:              <%= image_path("marker-red.png").to_json %>,
 
   MARKER_GREEN:            <%= image_path("marker-green.png").to_json %>,
   MARKER_RED:              <%= image_path("marker-red.png").to_json %>,
 

-  MARKER_ICON:             <%= image_path("images/marker-icon.png").to_json %>,
-  MARKER_ICON_2X:          <%= image_path("images/marker-icon-2x.png").to_json %>,
-  MARKER_SHADOW:           <%= image_path("images/marker-shadow.png").to_json %>,
+  MARKER_ICON:             <%= image_path("leaflet/dist/images/marker-icon.png").to_json %>,
+  MARKER_ICON_2X:          <%= image_path("leaflet/dist/images/marker-icon-2x.png").to_json %>,
+  MARKER_SHADOW:           <%= image_path("leaflet/dist/images/marker-shadow.png").to_json %>,

 
   NEW_NOTE_MARKER:         <%= image_path("new_note_marker.png").to_json %>,
   OPEN_NOTE_MARKER:        <%= image_path("open_note_marker.png").to_json %>,
 
   NEW_NOTE_MARKER:         <%= image_path("new_note_marker.png").to_json %>,
   OPEN_NOTE_MARKER:        <%= image_path("open_note_marker.png").to_json %>,


@@ -105,7 +107,7 @@ OSM = {
       mapParams.lon = parseFloat(params.mlon);
       mapParams.lat = parseFloat(params.mlat);
       mapParams.zoom = parseInt(params.zoom || 12);
       mapParams.lon = parseFloat(params.mlon);
       mapParams.lat = parseFloat(params.mlat);
       mapParams.zoom = parseInt(params.zoom || 12);

-    } else if (loc = $.cookie('_osm_location')) {
+    } else if (loc = Cookies.get('_osm_location')) {

       loc = loc.split("|");
       mapParams.lon = parseFloat(loc[0]);
       mapParams.lat = parseFloat(loc[1]);
       loc = loc.split("|");
       mapParams.lon = parseFloat(loc[0]);
       mapParams.lat = parseFloat(loc[1]);


@@ -144,7 +146,7 @@ OSM = {
       return args;
     }
 
       return args;
     }
 

-    hash = querystring.parse(hash.substr(i + 1));
+    hash = Qs.parse(hash.slice(i + 1));

 
     var map = (hash.map || '').split('/'),
       zoom = parseInt(map[0], 10),
 
     var map = (hash.map || '').split('/'),
       zoom = parseInt(map[0], 10),