X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3c22a53c931c8f55cea820a0bc3604311aa45100..66811558659c5b0e4b276e0be185e64a522846ff:/app/assets/javascripts/leaflet.extend.js.erb?ds=sidebyside

diff --git a/app/assets/javascripts/leaflet.extend.js.erb b/app/assets/javascripts/leaflet.extend.js.erb
index 84ad92920..cec25081b 100644
--- a/app/assets/javascripts/leaflet.extend.js.erb
+++ b/app/assets/javascripts/leaflet.extend.js.erb
@@ -30,21 +30,33 @@ L.extend(L.Map.prototype, {
 
   getUrl: function(marker) {
     var precision = zoomPrecision(this.getZoom()),
-        params = { layers: this.getLayersCode() };
+        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);
     }
 
-    return 'http://' + OSM.SERVER_URL + '/?' + querystring.stringify(params) +
-      OSM.formatHash({lat: this.getCenter().lat, lon: this.getCenter().lng, zoom: this.getZoom()});
+    if (this._object) {
+      params[this._object.type] = this._object.id;
+    }
+
+    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) {
     var zoom = this.getZoom(),
-      latLng = marker && this.hasLayer(marker) ? marker.getLatLng() : this.getCenter(),
-      str = '',
+      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_~",
       x = Math.round((latLng.lng + 180.0) * ((1 << 30) / 90.0)),
       y = Math.round((latLng.lat + 90.0) * ((1 << 30) / 45.0)),
@@ -77,13 +89,96 @@ L.extend(L.Map.prototype, {
       return (x << 1) | y;
     }
 
+    var params = {};
+
     if (marker && this.hasLayer(marker)) {
-      str += '?m'
+      params.m = '';
+    }
+
+    if (this._object) {
+      params[this._object.type] = this._object.id;
     }
 
-    return (window.location.hostname.match(/^www\.openstreetmap\.org/i) ?
-            'http://osm.org/go/' : 'http://' + window.location.hostname + '/go/') + str;
+    var query = querystring.stringify(params);
+    if (query) {
+      str += '?' + query;
+    }
+
+    return str;
+  },
+
+  addObject: function(object, options) {
+    this._object = object;
+
+    if (this._objectLoader) this._objectLoader.abort();
+    if (this._objectLayer) this.removeLayer(this._objectLayer);
+
+    var map = this;
+    this._objectLoader = $.ajax({
+      url: OSM.apiUrl(object),
+      dataType: "xml",
+      success: function (xml) {
+        map._objectLayer = new L.OSM.DataLayer(null, {
+          styles: {
+            node: options.style,
+            way: options.style,
+            area: options.style,
+            changeset: {
+              weight: 2,
+              color: '#e90',
+              fillOpacity: 0
+            }
+          }
+        });
+
+        map._objectLayer.interestingNode = function (node, ways, relations) {
+          if (object.type === "node") {
+            return true;
+          } else if (object.type === "relation") {
+            for (var i = 0; i < relations.length; i++)
+              if (relations[i].members.indexOf(node) != -1)
+                return true;
+          } else {
+            return false;
+          }
+        };
+
+        map._objectLayer.addData(xml);
+
+        var bounds = map._objectLayer.getBounds();
+
+        if (options.zoom && bounds.isValid()) map.fitBounds(bounds);
+        if (options.callback) options.callback(bounds);
+
+        map._objectLayer.addTo(map);
+      }
+    });
+  },
+
+  removeObject: function() {
+    this._object = null;
+    if (this._objectLoader) this._objectLoader.abort();
+    if (this._objectLayer) this.removeLayer(this._objectLayer);
+  }
+});
+
+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-shadow-2x.png": "<%= asset_path("images/marker-shadow-2x.png") %>"
+};
+
+L.extend(L.Icon.Default.prototype, {
+  _oldGetIconUrl: L.Icon.Default.prototype._getIconUrl,
+
+  _getIconUrl:  function (name) {
+    var url = this._oldGetIconUrl(name);
+    return L.Icon.Default.imageUrls[url];
   }
 });
 
-L.Icon.Default.imagePath = <%= "#{asset_prefix}/images".to_json %>;
+L.Hash.prototype.parseHash = OSM.parseHash;
+L.Hash.prototype.formatHash = OSM.formatHash;