Merge remote-tracking branch 'osmlab/user-display'

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

diff --git a/app/assets/javascripts/leaflet.extend.js.erb b/app/assets/javascripts/leaflet.extend.js.erb
index a645ed253b7149ee04cfa58aa7c4806be62c58cb..0df6fd381280eedbe7ac10ed2045938d22fe6c12 100644 (file)
--- a/app/assets/javascripts/leaflet.extend.js.erb
+++ b/app/assets/javascripts/leaflet.extend.js.erb
@@ -33,8 +33,9 @@ L.extend(L.Map.prototype, {
         params = {};
 
     if (marker && this.hasLayer(marker)) {
         params = {};
 
     if (marker && this.hasLayer(marker)) {

-      params.mlat = marker.getLatLng().lat.toFixed(precision);
-      params.mlon = marker.getLatLng().lng.toFixed(precision);
+      var latLng = marker.getLatLng().wrap();
+      params.mlat = latLng.lat.toFixed(precision);
+      params.mlon = latLng.lng.toFixed(precision);

     }
 
     if (this._object) {
     }
 
     if (this._object) {


@@ -53,7 +54,7 @@ L.extend(L.Map.prototype, {
 
   getShortUrl: function(marker) {
     var zoom = this.getZoom(),
 
   getShortUrl: function(marker) {
     var zoom = this.getZoom(),

-      latLng = marker && this.hasLayer(marker) ? marker.getLatLng() : this.getCenter(),
+      latLng = marker && this.hasLayer(marker) ? marker.getLatLng().wrap() : this.getCenter().wrap(),

       str = window.location.hostname.match(/^www\.openstreetmap\.org/i) ?
         'http://osm.org/go/' : 'http://' + window.location.hostname + '/go/',
       char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_~",
       str = window.location.hostname.match(/^www\.openstreetmap\.org/i) ?
         'http://osm.org/go/' : 'http://' + window.location.hostname + '/go/',
       char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_~",


@@ -145,6 +146,12 @@ L.extend(L.Map.prototype, {
         map._objectLayer.addTo(map);
       }
     });
         map._objectLayer.addTo(map);
       }
     });

+  },
+
+  removeObject: function() {
+    this._object = null;
+    if (this._objectLoader) this._objectLoader.abort();
+    if (this._objectLayer) this.removeLayer(this._objectLayer);

   }
 });
 
   }
 });