Update Potlatch 2 to r24481 build

[rails.git] / app / controllers / site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index e6d09f18d787b3b1d436bda46ac21f76cb6defb1..301d4a96641bb6d8557536c8ebf3de00baa600c1 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -32,7 +32,7 @@ class SiteController < ApplicationController
   end
 
   def edit
-    editor = @user.preferred_editor || DEFAULT_EDITOR
+    editor = params[:editor] || @user.preferred_editor || DEFAULT_EDITOR
 
     if editor == "josm"
       render :action => :index
@@ -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("|")