From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 11 Nov 2013 18:04:10 +0000 (-0800)
Subject: Merge map.js.erb and leaflet.extend.js.erb
X-Git-Tag: live~4674^2~124
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/14136b27c2e242ae3913b427113f5294be4b76e0

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 1cd6e224d..f66f231ef 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -10,13 +10,12 @@
 //= require leaflet
 //= require leaflet.osm
 //= require leaflet.hash
+//= require leaflet.map
 //= require leaflet.zoom
-//= require leaflet.extend
 //= require leaflet.locationfilter
 //= require i18n/translations
 //= require oauth
 //= require piwik
-//= require map
 //= require richtext
 //= require querystring
 
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 057fa1314..e01ff3cb9 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -16,7 +16,7 @@
 $(document).ready(function () {
   var params = OSM.mapParams();
 
-  var map = L.map("map", {
+  var map = new L.OSM.Map("map", {
     zoomControl: false,
     layerControl: false
   });
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 e0fb3c461..606a713b7 100644
--- 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]
+  });
+}
diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
deleted file mode 100644
index 98299070d..000000000
--- a/app/assets/javascripts/map.js.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-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]
-  });
-}