Correct path for mapnik marker images

Fixes #2759

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
index 3b9dee6ba422653e75dced72c1b9f84c5a0812f4..c6eb382eca6fc25659b6da4587ff24f8c4eb1835 100644 (file)
--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -21,3 +21,7 @@
 //= link_directory ../../../vendor/assets/swfobject
 
 //= link html5shiv/dist/html5shiv.js
+
+//= link leaflet/dist/images/marker-icon.png
+//= link leaflet/dist/images/marker-icon-2x.png
+//= link leaflet/dist/images/marker-shadow.png

diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index 0a29d374e823758fe9ea30d9f596415583e9eeee..5c15e08e6f13d62654e47019a9b601eb6841443f 100644 (file)
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -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 %>,