Update to iD v1.3.6

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index fb034e22c3b3b3c4ffd07af0b2a7c2eb5668aa82..779ea1a885dbbfd58064c772ed026c6be3ab6bdf 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,30 +1,15 @@
 class SiteController < ApplicationController
 class SiteController < ApplicationController

-  layout 'site', :except => [:key, :permalink]
-  layout false, :only => [:key, :permalink]
+  layout 'site'
+  layout :map_layout, :only => [:index, :export]

 
   before_filter :authorize_web
   before_filter :set_locale
 
   before_filter :authorize_web
   before_filter :set_locale

+  before_filter :redirect_browse_params, :only => :index
+  before_filter :redirect_map_params, :only => [:index, :edit, :export]

   before_filter :require_user, :only => [:edit, :welcome]
   before_filter :require_oauth, :only => [:index]
 
   def index
   before_filter :require_user, :only => [:edit, :welcome]
   before_filter :require_oauth, :only => [:index]
 
   def index

-    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('&'))
-      return
-    end
-

     unless STATUS == :database_readonly or STATUS == :database_offline
       session[:location] ||= OSM::IPLocation(request.env['REMOTE_ADDR'])
     end
     unless STATUS == :database_readonly or STATUS == :database_offline
       session[:location] ||= OSM::IPLocation(request.env['REMOTE_ADDR'])
     end


@@ -49,30 +34,38 @@ class SiteController < ApplicationController
 
   def key
     expires_in 7.days, :public => true
 
   def key
     expires_in 7.days, :public => true

+    render :layout => false

   end
 
   def edit
   end
 
   def edit

-    editor = params[:editor] || @user.preferred_editor || DEFAULT_EDITOR
+    editor = preferred_editor

 
     if editor == "remote"
 
     if editor == "remote"

-      render :action => :index
+      require_oauth
+      render :action => :index, :layout => map_layout

       return
     end
 
       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
     if params[:node]
       bbox = Node.find(params[:node]).bbox.to_unscaled
       @lat = bbox.centre_lat
       @lon = bbox.centre_lon

+      @zoom = 18

     elsif params[:way]
       bbox = Way.find(params[:way]).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

+      @zoom = 17
+    elsif params[:note]
+      note = Note.find(params[:note])
+      @lat = note.lat
+      @lon = note.lon
+      @zoom = 17

     elsif params[:gpx]
       trace = Trace.visible_to(@user).find(params[:gpx])
       @lat = trace.latitude
       @lon = trace.longitude
     elsif params[:gpx]
       trace = Trace.visible_to(@user).find(params[:gpx])
       @lat = trace.latitude
       @lon = trace.longitude

+      @zoom = 16

     end
   end
 
     end
   end
 


@@ -83,6 +76,18 @@ class SiteController < ApplicationController
   def welcome
   end
 
   def welcome
   end
 

+  def help
+  end
+
+  def about
+  end
+
+  def export
+  end
+
+  def offline
+  end
+

   def preview
     render :text => RichText.new(params[:format], params[:text]).to_html
   end
   def preview
     render :text => RichText.new(params[:format], params[:text]).to_html
   end


@@ -90,4 +95,38 @@ class SiteController < ApplicationController
   def id
     render "id", :layout => false
   end
   def id
     render "id", :layout => false
   end

+
+  private
+
+  def redirect_browse_params
+    if params[:node]
+      redirect_to node_path(params[:node])
+    elsif params[:way]
+      redirect_to way_path(params[:way])
+    elsif params[:relation]
+      redirect_to relation_path(params[:relation])
+    elsif params[:note]
+      redirect_to browse_note_path(params[:note])
+    elsif params[:query]
+      redirect_to search_path(:query => params[:query])
+    end
+  end
+
+  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