]> git.openstreetmap.org Git - rails.git/blobdiff - app/controllers/site_controller.rb
Redirect short links properly
[rails.git] / app / controllers / site_controller.rb
index 1ea3f7cb0ac6f8fb4adb34d044a2841f2d9656d0..3b0a19cf91d70d2c516076ca4ab71074fe1dc886 100644 (file)
@@ -8,6 +8,23 @@ class SiteController < ApplicationController
   before_filter :require_oauth, :only => [:index]
 
   def index
   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
@@ -15,19 +32,18 @@ class SiteController < ApplicationController
 
   def permalink
     lon, lat, zoom = ShortLink::decode(params[:code])
 
   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
     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
     end
-    new_params[:zoom] = zoom
+
     new_params[:controller] = 'site'
     new_params[:action] = 'index'
     new_params[:controller] = 'site'
     new_params[:action] = 'index'
+    new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}"
+
     redirect_to new_params
   end
 
     redirect_to new_params
   end
 
@@ -65,4 +81,8 @@ class SiteController < ApplicationController
   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
+
+  def id
+    render "id", :layout => false
+  end
 end
 end