X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1d8e66016c4cdf465d06198cfbbfe76613ed3bfc..c8d4e4eee3835e9b92fe7cb62c22a07fa2f95f5d:/app/controllers/site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 1478c5773..c16daf37f 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,33 +1,77 @@
 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 :require_oauth, :only => [:index]
 
-  def export
-    render :action => 'index'
+  def index
+    if params[:lat] && params[:lon]
+      params[:anchor] = "#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}"
+      redirect_to params
+      return
+    end
+
+    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
+    new_params = params.except(:code, :lon, :lat, :zoom)
+
     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'
+    new_params[:anchor] = "#{zoom}/#{lat}/#{lon}"
+
     redirect_to new_params
   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
+
+  def id
+    render "id", :layout => false
+  end
 end