X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6dd451c7ee48663d6b0753bfe8b4da2060c4cf60..be878df0978d5b51f7fbb72fca16f74c5708c818:/app/assets/javascripts/osm.js.erb

diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index 391ba64ef..3e2e7c866 100644
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -1,6 +1,6 @@
 //= depend_on settings.yml
 //= depend_on settings.local.yml
-//= require querystring
+//= require qs/dist/qs
 
 OSM = {
 <% if defined?(PIWIK) %>
@@ -26,9 +26,9 @@ OSM = {
   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 %>,
@@ -107,7 +107,7 @@ OSM = {
       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]);
@@ -139,15 +139,14 @@ OSM = {
   },
 
   parseHash: function(hash) {
-    var querystring = require("querystring-component"),
-        args = {};
+    var args = {};
 
     var i = hash.indexOf('#');
     if (i < 0) {
       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),