Don't add a geographic condition when fetching an RSS feed with no bbox

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index d08f34a0a29b0a2689e759c327b227896419f9a7..73f38f78c6b0ccf4eee941270940a701e3936eaa 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -32,13 +32,11 @@ class SiteController < ApplicationController
   end
 
   def edit
   end
 
   def edit

-    editor = @user.preferred_editor || DEFAULT_EDITOR
+    editor = params[:editor] || @user.preferred_editor || DEFAULT_EDITOR

 
 

-    if editor == "josm"
+    if editor == "remote"

       render :action => :index
     else
       render :action => :index
     else

-      session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token])
-

       # Decide on a lat lon to initialise potlatch with. Various ways of doing this
       if params['lon'] and params['lat']
         @lon = params['lon'].to_f
       # Decide on a lat lon to initialise potlatch with. Various ways of doing this
       if params['lon'] and params['lat']
         @lon = params['lon'].to_f


@@ -51,7 +49,8 @@ class SiteController < ApplicationController
         @zoom = params['zoom'].to_i
 
       elsif params['gpx']
         @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("|")
 
       elsif cookies.key?("_osm_location")
         @lon, @lat, @zoom, layers = cookies["_osm_location"].split("|")