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 2a826770d4144b2eafa680ebdd0f189f56de0b79..606143f4f9ceaaa48fe79c40a1d6def05216f0a9 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,15 +1,67 @@
 class SiteController < ApplicationController
 class SiteController < ApplicationController

-  layout 'site',:except => [:key]
+  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
+    lon, lat, zoom = ShortLink::decode(params[:code])
+    new_params = params.clone
+    new_params.delete :code
+    if new_params.has_key? :m
+      new_params.delete :m
+      new_params[:mlat] = lat
+      new_params[:mlon] = lon
+    else
+      new_params[:lat] = lat
+      new_params[:lon] = lon
+    end
+    new_params[:zoom] = zoom
+    new_params[:controller] = 'site'
+    new_params[:action] = 'index'
+    redirect_to new_params

   end
 
   def key
     expires_in 7.days, :public => true
   end
   end
 
   def key
     expires_in 7.days, :public => true
   end

+
+  def edit
+    editor = params[:editor] || @user.preferred_editor || DEFAULT_EDITOR
+
+    if editor == "remote"
+      render :action => :index
+      return
+    end
+
+    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
+
+  def copyright
+    @locale = params[:copyright_locale] || I18n.locale
+  end
+
+  def preview
+    render :text => RichText.new(params[:format], params[:text]).to_html
+  end

 end
 end