Merge branch 'redesign'

[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 059009a0c9af07c535e5d3e97411d4a55d509c73..cb0c53fc39472e20cb8faffe43f50e0202f32319 100644 (file)
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -6,7 +6,9 @@
     var params = {};
 
     var mapParams = OSM.mapParams();
-    if (mapParams.object) {
+    if (mapParams.object &&
+        mapParams.object.type !== 'note' &&
+        mapParams.object.type !== 'changeset') {
       params.id = mapParams.object.type[0] + mapParams.object.id;
     } else {
 <% if @lat && @lon -%>
@@ -17,10 +19,15 @@
     }
 
     var hashParams = OSM.params(location.hash.substring(1));
+
     if (hashParams.background) {
       params.background = hashParams.background;
     }
 
+    if (hashParams.gpx) {
+      params.gpx = hashParams.gpx;
+    }
+
     $('#id-embed').attr('src', '<%= id_url :locale => params[:locale] %>#' + querystring.stringify(params));
   </script>
 <% else %>