Refactor note add/update code

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index d08f34a0a29b0a2689e759c327b227896419f9a7..606143f4f9ceaaa48fe79c40a1d6def05216f0a9 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,12 +1,15 @@
 class SiteController < ApplicationController
   layout 'site', :except => [:key, :permalink]
 class SiteController < ApplicationController
   layout 'site', :except => [:key, :permalink]

+  layout false, :only => [:key, :permalink]

 
   before_filter :authorize_web
   before_filter :set_locale
   before_filter :require_user, :only => [:edit]
 
 
   before_filter :authorize_web
   before_filter :set_locale
   before_filter :require_user, :only => [:edit]
 

-  def export
-    render :action => 'index'
+  def index
+    unless STATUS == :database_readonly or STATUS == :database_offline
+      session[:location] ||= OSM::IPLocation(request.env['REMOTE_ADDR'])
+    end

   end
 
   def permalink
   end
 
   def permalink


@@ -32,40 +35,33 @@ 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
       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
-        @lat = params['lat'].to_f
-        @zoom = params['zoom'].to_i
-
-      elsif params['mlon'] and params['mlat']
-        @lon = params['mlon'].to_f
-        @lat = params['mlat'].to_f
-        @zoom = params['zoom'].to_i
-
-      elsif params['gpx']
-        #use gpx id to locate (dealt with below)
-
-      elsif cookies.key?("_osm_location")
-        @lon, @lat, @zoom, layers = cookies["_osm_location"].split("|")
+      return
+    end

 
 

-      elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil?
-        @lon = @user.home_lon
-        @lat = @user.home_lat
+    if params[:node]
+      bbox = Node.find(params[:node]).bbox.to_unscaled
+      @lat = bbox.centre_lat
+      @lon = bbox.centre_lon
+    elsif params[:way]
+      bbox = Way.find(params[:way]).bbox.to_unscaled
+      @lat = bbox.centre_lat
+      @lon = bbox.centre_lon
+    elsif params[:gpx]
+      trace = Trace.visible_to(@user).find(params[:gpx])
+      @lat = trace.latitude
+      @lon = trace.longitude
+    end
+  end

 
 

-      else
-        #catch all.  Do nothing.  lat=nil, lon=nil
-        #Currently this results in potlatch starting up at 0,0 (Atlantic ocean).
-      end
+  def copyright
+    @locale = params[:copyright_locale] || I18n.locale
+  end

 
 

-      @zoom = '14' if @zoom.nil?
-    end
+  def preview
+    render :text => RichText.new(params[:format], params[:text]).to_html

   end
 end
   end
 end