Use a pessimistic version constraint for libxml

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index e6d09f18d787b3b1d436bda46ac21f76cb6defb1..65029e4efe86f3579bda6287ebb2225c26a68641 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -32,9 +32,9 @@ 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
       # Decide on a lat lon to initialise potlatch with. Various ways of doing this
       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']
         @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("|")


@@ -63,7 +64,7 @@ class SiteController < ApplicationController
         #Currently this results in potlatch starting up at 0,0 (Atlantic ocean).
       end
 
         #Currently this results in potlatch starting up at 0,0 (Atlantic ocean).
       end
 

-      @zoom = '14' if @zoom.nil?
+      @zoom = '17' if @zoom.nil?

     end
   end
 end
     end
   end
 end