Instruct iD to load gpx file

When one clicks on the edit link of an uploaded GPX file, this instructs
the iD editor to load the respective GPX data from the appropriate URL.

See https://github.com/openstreetmap/iD/issues/970#issuecomment-43439476.

diff --git a/app/views/site/_id.html.erb b/app/views/site/_id.html.erb
index f88942669ecbb19595f5b6f62c4378ae68175e4e..db611f4286855f0603816515435f367d59525c33 100644 (file)
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -26,9 +26,13 @@
       params.background = hashParams.background;
     }
 
+<% 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>

diff --git a/config/routes.rb b/config/routes.rb
index e9f593d92bdc4b4d53da185f2bfc0ceff03bf4bf..3357f911dd599ca2a408e28f0cb6f79c22cbf2e0 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -194,7 +194,7 @@ OpenStreetMap::Application.routes.draw do
   match '/traces/mine/page/:page' => 'trace#mine', :via => :get
   match '/traces/mine' => 'trace#mine', :via => :get
   match '/trace/create' => 'trace#create', :via => [:get, :post]
-  match '/trace/:id/data' => 'trace#data', :via => :get, :id => /\d+/
+  match '/trace/:id/data' => 'trace#data', :via => :get, :id => /\d+/, :as => "trace_data"
   match '/trace/:id/edit' => 'trace#edit', :via => [:get, :post, :patch], :id => /\d+/, :as => "trace_edit"
   match '/trace/:id/delete' => 'trace#delete', :via => :post, :id => /\d+/