Merge remote-tracking branch 'openstreetmap/pull/1330'

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 1f33b067bc3db3301161ff6943a622a7e5f0f05a..5131629acfd57140e0c3eedf06e0d7cefc87aaaa 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,35 +1,55 @@
 class SiteController < ApplicationController
-  layout 'site'
+  layout "site"
   layout :map_layout, :only => [:index, :export]
 
-  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]
+  before_action :authorize_web
+  before_action :set_locale
+  before_action :redirect_browse_params, :only => :index
+  before_action :redirect_map_params, :only => [:index, :edit, :export]
+  before_action :require_user, :only => [:welcome]
+  before_action :require_oauth, :only => [:index]
 
   def index
-    unless STATUS == :database_readonly or STATUS == :database_offline
-      session[:location] ||= OSM::IPLocation(request.env['REMOTE_ADDR'])
+    unless STATUS == :database_readonly || STATUS == :database_offline
+      session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"])
     end
   end
 
   def permalink
-    lon, lat, zoom = ShortLink::decode(params[:code])
-    new_params = params.except(:code, :lon, :lat, :zoom)
+    lon, lat, zoom = ShortLink.decode(params[:code])
+    new_params = params.except(:code, :lon, :lat, :zoom, :layers, :node, :way, :relation, :changeset)
 
-    if new_params.has_key? :m
+    if new_params.key? :m
       new_params.delete :m
       new_params[:mlat] = lat
       new_params[:mlon] = lon
     end
 
-    new_params[:controller] = 'site'
-    new_params[:action] = 'index'
+    if params.key? :node
+      new_params[:controller] = "browse"
+      new_params[:action] = "node"
+      new_params[:id] = params[:node]
+    elsif params.key? :way
+      new_params[:controller] = "browse"
+      new_params[:action] = "way"
+      new_params[:id] = params[:way]
+    elsif params.key? :relation
+      new_params[:controller] = "browse"
+      new_params[:action] = "relation"
+      new_params[:id] = params[:relation]
+    elsif params.key? :changeset
+      new_params[:controller] = "browse"
+      new_params[:action] = "changeset"
+      new_params[:id] = params[:changeset]
+    else
+      new_params[:controller] = "site"
+      new_params[:action] = "index"
+    end
+
     new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}"
+    new_params[:anchor] += "&layers=#{params[:layers]}" if params.key? :layers
 
-    redirect_to new_params
+    redirect_to Hash[new_params]
   end
 
   def key
@@ -42,8 +62,10 @@ class SiteController < ApplicationController
 
     if editor == "remote"
       require_oauth
-      render :action => :index
+      render :action => :index, :layout => map_layout
       return
+    else
+      require_user
     end
 
     if params[:node]
@@ -82,6 +104,12 @@ class SiteController < ApplicationController
   def about
   end
 
+  def export
+  end
+
+  def offline
+  end
+
   def preview
     render :text => RichText.new(params[:format], params[:text]).to_html
   end
@@ -115,12 +143,12 @@ class SiteController < ApplicationController
 
     if params[:layers]
       anchor << "layers=#{params.delete(:layers)}"
-    elsif params.delete(:notes) == 'yes'
+    elsif params.delete(:notes) == "yes"
       anchor << "layers=N"
     end
 
     if anchor.present?
-      redirect_to params.merge(:anchor => anchor.join('&'))
+      redirect_to Hash[params].merge(:anchor => anchor.join("&"))
     end
   end
 end