Merge map.js.erb and leaflet.extend.js.erb

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

diff --git a/app/assets/javascripts/leaflet.extend.js.erb b/app/assets/javascripts/leaflet.map.js.erb
similarity index 94%
rename from app/assets/javascripts/leaflet.extend.js.erb
rename to app/assets/javascripts/leaflet.map.js.erb
index e0fb3c461bad4caf61c1dfe1d6e0346b3edc7543..606a713b7ffa896303f8b8337818786d5e07d93f 100644 (file)
--- a/app/assets/javascripts/leaflet.extend.js.erb
+++ b/app/assets/javascripts/leaflet.map.js.erb
@@ -9,7 +9,7 @@ L.extend(L.LatLngBounds.prototype, {
   }
 });
 
-L.extend(L.Map.prototype, {
+L.OSM.Map = L.Map.extend({
   getLayersCode: function () {
     var layerConfig = '';
     for (var i in this._layers) { // TODO: map.eachLayer
@@ -183,3 +183,14 @@ L.extend(L.Icon.Default.prototype, {
 
 L.Hash.prototype.parseHash = OSM.parseHash;
 L.Hash.prototype.formatHash = OSM.formatHash;
+
+function getUserIcon(url) {
+  return L.icon({
+    iconUrl: url || <%= asset_path('marker-red.png').to_json %>,
+    iconSize: [25, 41],
+    iconAnchor: [12, 41],
+    popupAnchor: [1, -34],
+    shadowUrl: <%= asset_path('images/marker-shadow.png').to_json %>,
+    shadowSize: [41, 41]
+  });
+}