Update to latest osm-community-index

[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 0a29d374e823758fe9ea30d9f596415583e9eeee..529ac3beadc18f2ef823b61404c730be7dbf9d98 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_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 %>,


@@ -107,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]);