X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/04a6c41be94cea2175e49aa290bf204e69c41a5c..f20a85a5c5c68f4b87a3f4d9faa1de0ba780ce3b:/app/controllers/site_controller.rb?ds=sidebyside diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 5e77b6691..73f38f78c 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -34,7 +34,7 @@ class SiteController < ApplicationController def edit editor = params[:editor] || @user.preferred_editor || DEFAULT_EDITOR - if editor == "josm" + if editor == "remote" render :action => :index else # Decide on a lat lon to initialise potlatch with. Various ways of doing this @@ -49,7 +49,8 @@ class SiteController < ApplicationController @zoom = params['zoom'].to_i elsif params['gpx'] - #use gpx id to locate (dealt with below) + @lon = Trace.find(params['gpx']).longitude + @lat = Trace.find(params['gpx']).latitude elsif cookies.key?("_osm_location") @lon, @lat, @zoom, layers = cookies["_osm_location"].split("|")