From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 31 Jul 2013 19:43:51 +0000 (-0700)
Subject: Include object in share link
X-Git-Tag: live~5361^2~8
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/a125ee829a5df5c4947c951b39c9f49a0b40e65a?ds=sidebyside

Include object in share link
---

diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js
index 023dc878d..5d2412183 100644
--- a/app/assets/javascripts/browse.js
+++ b/app/assets/javascripts/browse.js
@@ -57,8 +57,8 @@ $(document).ready(function () {
       object.version = params.version - 1;
     }
 
-    addObjectToMap(object, map, {
-      zoom: true, 
+    map.addObject(object, {
+      zoom: true,
       callback: function(extent) {
         $("#loading").hide();
         $("#browse_map .geolink").show();
diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 19e1f16de..489a29c87 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -136,7 +136,7 @@ $(document).ready(function () {
   }
 
   if (params.object) {
-    addObjectToMap(params.object, map, { zoom: params.object_zoom });
+    map.addObject(params.object, { zoom: params.object_zoom });
   }
 
   $("body").on("click", "a.set_position", setPositionLink(map));
@@ -195,7 +195,7 @@ function setPositionLink(map) {
       }
 
       if (data.type && data.id) {
-        addObjectToMap(data, map, { zoom: true, style: { opacity: 0.2, fill: false } });
+        map.addObject(data, { zoom: true, style: { opacity: 0.2, fill: false } });
       }
 
       map.markerLayer.clearLayers();
diff --git a/app/assets/javascripts/leaflet.extend.js.erb b/app/assets/javascripts/leaflet.extend.js.erb
index a50df013e..a645ed253 100644
--- a/app/assets/javascripts/leaflet.extend.js.erb
+++ b/app/assets/javascripts/leaflet.extend.js.erb
@@ -37,6 +37,10 @@ L.extend(L.Map.prototype, {
       params.mlon = marker.getLatLng().lng.toFixed(precision);
     }
 
+    if (this._object) {
+      params[this._object.type] = this._object.id;
+    }
+
     var url = 'http://' + OSM.SERVER_URL + '/',
       query = querystring.stringify(params),
       hash = OSM.formatHash(this);
@@ -50,7 +54,8 @@ L.extend(L.Map.prototype, {
   getShortUrl: function(marker) {
     var zoom = this.getZoom(),
       latLng = marker && this.hasLayer(marker) ? marker.getLatLng() : this.getCenter(),
-      str = '',
+      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)),
@@ -83,12 +88,63 @@ 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;
+    }
+
+    var query = querystring.stringify(params);
+    if (query) {
+      str += '?' + query;
     }
 
-    return (window.location.hostname.match(/^www\.openstreetmap\.org/i) ?
-            'http://osm.org/go/' : 'http://' + window.location.hostname + '/go/') + str;
+    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
+          }
+        });
+
+        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);
+
+        if (options.zoom) map.fitBounds(map._objectLayer.getBounds());
+        if (options.callback) options.callback(map._objectLayer.getBounds());
+
+        map._objectLayer.addTo(map);
+      }
+    });
   }
 });
 
diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index 6d26763f8..98299070d 100644
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -1,5 +1,3 @@
-var objectLoader;
-
 function getUserIcon(url) {
   return L.icon({
     iconUrl: url || <%= asset_path('marker-red.png').to_json %>,
@@ -10,41 +8,3 @@ function getUserIcon(url) {
     shadowSize: [41, 41]
   });
 }
-
-function addObjectToMap(object, map, options) {
-  if (objectLoader) objectLoader.abort();
-  if (map.objectLayer) map.removeLayer(map.objectLayer);
-
-  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
-        }
-      });
-
-      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);
-
-      if (options.zoom) map.fitBounds(map.objectLayer.getBounds());
-      if (options.callback) options.callback(map.objectLayer.getBounds());
-
-      map.objectLayer.addTo(map);
-    }
-  });
-}