cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve redirection of shortlinks

Browse source 
If a shortlink includes an object reference then redirect to a new
style browse URL for that object.

Fixes #702
This commit is contained in:
Tom Hughes 2014-02-15 12:42:52 +00:00
parent b947358134
commit 47841829d8
2 changed files with 38 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/controllers/site_controller.rb
View file

@ -17,7 +17,7 @@ class SiteController < ApplicationController
def permalink
lon, lat, zoom = ShortLink::decode(params[:code])
new_params = params.except(:code, :lon, :lat, :zoom)
new_params = params.except(:code, :lon, :lat, :zoom, :node, :way, :relation, :changeset)
if new_params.has_key? :m
new_params.delete :m
@ -25,8 +25,27 @@ class SiteController < ApplicationController
new_params[:mlon] = lon
end
new_params[:controller] = 'site'
new_params[:action] = 'index'
if params.has_key? :node
new_params[:controller] = 'browse'
new_params[:action] = 'node'
new_params[:id] = params[:node]
elsif params.has_key? :way
new_params[:controller] = 'browse'
new_params[:action] = 'way'
new_params[:id] = params[:way]
elsif params.has_key? :relation
new_params[:controller] = 'browse'
new_params[:action] = 'relation'
new_params[:id] = params[:relation]
elsif params.has_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}"
redirect_to new_params