Eliminate templating from most javascript

[rails.git] / app / assets / javascripts / leaflet.map.js

diff --git a/app/assets/javascripts/leaflet.map.js.erb b/app/assets/javascripts/leaflet.map.js
similarity index 95%
rename from app/assets/javascripts/leaflet.map.js.erb
rename to app/assets/javascripts/leaflet.map.js
index 14cddafce7ca6001026981991d8df91df8702e1e..2201afe68a83baa73cd891fa43162980e7aa327c 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js.erb
+++ b/app/assets/javascripts/leaflet.map.js
@@ -261,9 +261,9 @@ L.OSM.Map = L.Map.extend({
 L.Icon.Default.imagePath = "/images";
 
 L.Icon.Default.imageUrls = {
-  "/images/marker-icon.png": "<%= asset_path("images/marker-icon.png") %>",
-  "/images/marker-icon-2x.png": "<%= asset_path("images/marker-icon-2x.png") %>",
-  "/images/marker-shadow.png": "<%= asset_path("images/marker-shadow.png") %>"
+  "/images/marker-icon.png": OSM.MARKER_ICON,
+  "/images/marker-icon-2x.png": OSM.MARKER_ICON_2X,
+  "/images/marker-shadow.png": OSM.MARKER_SHADOW
 };
 
 L.extend(L.Icon.Default.prototype, {
@@ -277,11 +277,11 @@ L.extend(L.Icon.Default.prototype, {
 
 function getUserIcon(url) {
   return L.icon({
-    iconUrl: url || <%= asset_path('marker-red.png').to_json %>,
+    iconUrl: url || OSM.MARKER_RED,
     iconSize: [25, 41],
     iconAnchor: [12, 41],
     popupAnchor: [1, -34],
-    shadowUrl: <%= asset_path('images/marker-shadow.png').to_json %>,
+    shadowUrl: OSM.MARKER_SHADOW,
     shadowSize: [41, 41]
   });
 }