Forward the `comment` hash parameter to iD

[rails.git] / app / views / site / _id.html.erb

diff --git a/app/views/site/_id.html.erb b/app/views/site/_id.html.erb
index 195873c34c30194cf9491c0989691aaae6ae076d..7ddee6218269792a64b18bbc4301ce15945d84e3 100644 (file)
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -6,10 +6,12 @@
     var params = {};
 
     var mapParams = OSM.mapParams();
     var params = {};
 
     var mapParams = OSM.mapParams();

-    if (mapParams.object &&
-        mapParams.object.type !== 'note' &&
-        mapParams.object.type !== 'changeset') {
+    if (mapParams.object) {

       params.id = mapParams.object.type[0] + mapParams.object.id;
       params.id = mapParams.object.type[0] + mapParams.object.id;

+      mapParams = OSM.parseHash(location.hash);
+      if (mapParams.center) {
+        params.map = mapParams.zoom + '/' + mapParams.center.lng + '/' + mapParams.center.lat;
+      }

     } else {
 <% if @lat && @lon -%>
       params.map = '16/<%= @lon %>/<%= @lat %>';
     } else {
 <% if @lat && @lon -%>
       params.map = '16/<%= @lon %>/<%= @lat %>';


@@ -19,10 +21,23 @@
     }
 
     var hashParams = OSM.params(location.hash.substring(1));
     }
 
     var hashParams = OSM.params(location.hash.substring(1));

+

     if (hashParams.background) {
       params.background = hashParams.background;
     }
 
     if (hashParams.background) {
       params.background = hashParams.background;
     }
 

+    if (hashParams.comment) {
+      params.comment = hashParams.comment;
+    }
+
+<% if params[:gpx] -%>
+    params.gpx = '<%= trace_data_url(params[:gpx]) %>';
+<% else -%>
+    if (hashParams.gpx) {
+      params.gpx = hashParams.gpx;
+    }
+<% end -%>
+

     $('#id-embed').attr('src', '<%= id_url :locale => params[:locale] %>#' + querystring.stringify(params));
   </script>
 <% else %>
     $('#id-embed').attr('src', '<%= id_url :locale => params[:locale] %>#' + querystring.stringify(params));
   </script>
 <% else %>