X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a47c0a4411825f48e447641094678b15df3b2f74..c8e21c409c9bec446f0caa2526d5b07861bb3299:/app/assets/javascripts/osm.js.erb diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index 09b3ebd75..5c15e08e6 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -1,5 +1,6 @@ //= depend_on settings.yml //= depend_on settings.local.yml +//= require qs/dist/qs OSM = { <% if defined?(PIWIK) %> @@ -25,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 %>, @@ -145,7 +146,7 @@ OSM = { return args; } - hash = qs.parse(hash.substr(i + 1)); + hash = Qs.parse(hash.substr(i + 1)); var map = (hash.map || '').split('/'), zoom = parseInt(map[0], 10),