From: Tom Hughes Date: Sat, 8 Aug 2020 09:47:02 +0000 (+0100) Subject: Correct path for mapnik marker images X-Git-Tag: live~2849 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/a78da07f0b771b9c65195e304cc8c8a31c9155df Correct path for mapnik marker images Fixes #2759 --- diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index 3b9dee6ba..c6eb382ec 100644 --- 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 0a29d374e..5c15e08e6 100644 --- 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 %>,