Update to iD v1.2.1

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 767220c7905ed0be8bae70bf324a07f6c1c77be7..280f39fd8c32b597b7cbc13094044e5827033d02 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,16 +1,101 @@
 class SiteController < ApplicationController
 class SiteController < ApplicationController

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

   before_filter :authorize_web
   before_filter :authorize_web

-  before_filter :require_user, :only => [:edit]
+  before_filter :set_locale
+  before_filter :redirect_map_params, :only => [:index, :edit, :export]
+  before_filter :require_user, :only => [:edit, :welcome]
+  before_filter :require_oauth, :only => [: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.except(:code, :lon, :lat, :zoom)
+
+    if new_params.has_key? :m
+      new_params.delete :m
+      new_params[:mlat] = lat
+      new_params[:mlon] = lon
+    end
+
+    new_params[:controller] = 'site'
+    new_params[:action] = 'index'
+    new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}"

 
 

-  def goto_way
-    way = Way.find(params[:id])
+    redirect_to new_params
+  end
+
+  def key
+    expires_in 7.days, :public => true
+  end
+
+  def edit
+    editor = preferred_editor

 
 

-    begin
-      node = way.way_nodes.first.node
-      redirect_to :controller => 'site', :action => 'index', :lat => node.latitude, :lon => node.longitude, :zoom => 6
-    rescue
-      redirect_to :back
+    if editor == "remote"
+      render :action => :index
+      return
+    end
+
+    @extra_body_class = "site-edit-#{editor}"
+
+    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[:note]
+      note = Note.find(params[:note])
+      @lat = note.lat
+      @lon = note.lon
+    elsif params[:gpx]
+      trace = Trace.visible_to(@user).find(params[:gpx])
+      @lat = trace.latitude
+      @lon = trace.longitude

     end
   end
 
     end
   end
 

+  def copyright
+    @locale = params[:copyright_locale] || I18n.locale
+  end
+
+  def welcome
+  end
+
+  def preview
+    render :text => RichText.new(params[:format], params[:text]).to_html
+  end
+
+  def id
+    render "id", :layout => false
+  end
+
+  private
+
+  def redirect_map_params
+    anchor = []
+
+    if params[:lat] && params[:lon]
+      anchor << "map=#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}"
+    end
+
+    if params[:layers]
+      anchor << "layers=#{params.delete(:layers)}"
+    elsif params.delete(:notes) == 'yes'
+      anchor << "layers=N"
+    end
+
+    if anchor.present?
+      redirect_to params.merge(:anchor => anchor.join('&'))
+    end
+  end

 end
 end