Merge remote-tracking branch 'osmlab/hash'

[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 f1abfb4bab61de9144a1bf91255d5d8ff07d88d7..a50df013e51799871b0f845744a3044c15c9e605 100644 (file)
--- a/app/assets/javascripts/leaflet.extend.js.erb
+++ b/app/assets/javascripts/leaflet.extend.js.erb
@@ -29,22 +29,22 @@ L.extend(L.Map.prototype, {
   },
 
   getUrl: function(marker) {
-    var center = this.getCenter(),
-        zoom = this.getZoom(),
-        toZoom = zoomPrecision(zoom),
-        params = {
-          lat: toZoom(center.lat),
-          lon: toZoom(center.lng),
-          zoom: zoom,
-          layers: this.getLayersCode()
-        };
+    var precision = zoomPrecision(this.getZoom()),
+        params = {};
 
     if (marker && this.hasLayer(marker)) {
-      params.mlat = toZoom(marker.getLatLng().lat);
-      params.mlon = toZoom(marker.getLatLng().lng);
+      params.mlat = marker.getLatLng().lat.toFixed(precision);
+      params.mlon = marker.getLatLng().lng.toFixed(precision);
     }
 
-    return 'http://' + OSM.SERVER_URL + '/?' + querystring.stringify(params);
+    var url = 'http://' + OSM.SERVER_URL + '/',
+      query = querystring.stringify(params),
+      hash = OSM.formatHash(this);
+
+    if (query) url += '?' + query;
+    if (hash) url += hash;
+
+    return url;
   },
 
   getShortUrl: function(marker) {
@@ -93,3 +93,6 @@ L.extend(L.Map.prototype, {
 });
 
 L.Icon.Default.imagePath = <%= "#{asset_prefix}/images".to_json %>;
+
+L.Hash.prototype.parseHash = OSM.parseHash;
+L.Hash.prototype.formatHash = OSM.formatHash;