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

Rewrite layer parameters in shortlinks correctly

Browse source 
Fixes #762
This commit is contained in:
Tom Hughes 2014-06-17 21:15:36 +01:00
parent 103fd8a38f
commit c9e9ef1a89
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
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, :node, :way, :relation, :changeset)
new_params = params.except(:code, :lon, :lat, :zoom, :layers, :node, :way, :relation, :changeset)
if new_params.has_key? :m
new_params.delete :m
@ -48,6 +48,10 @@ class SiteController < ApplicationController
new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}"
if params.has_key? :layers
new_params[:anchor] += "&layers=#{params[:layers]}"
end
redirect_to new_params
end

2
test/controllers/site_controller_test.rb
View file

@ -119,7 +119,7 @@ class SiteControllerTest < ActionController::TestCase
get :permalink, :code => 'wBz3--', :layers => 'T'
assert_response :redirect
assert_redirected_to :controller => :site, :action => :index, :layers => 'T', :anchor => 'map=3/4.8779296875/3.955078125'
assert_redirected_to :controller => :site, :action => :index, :anchor => 'map=3/4.8779296875/3.955078125&layers=T'
get :permalink, :code => 'wBz3--', :node => 1
assert_response :redirect

4
test/integration/short_links_test.rb
View file

@ -25,9 +25,9 @@ class ShortLinksTest < ActionDispatch::IntegrationTest
# test with layers and a marker
get '/go/' + short_link + "?m&layers=B000FTF"
assert_redirected_to :controller => 'site', :action => 'index', :mlat => lat.to_s, :mlon => lon.to_s, :layers => "B000FTF", :anchor => anchor
assert_redirected_to :controller => 'site', :action => 'index', :mlat => lat.to_s, :mlon => lon.to_s, :anchor => "#{anchor}&layers=B000FTF"
get '/go/' + short_link + "?layers=B000FTF&m"
assert_redirected_to :controller => 'site', :action => 'index', :mlat => lat.to_s, :mlon => lon.to_s, :layers => "B000FTF", :anchor => anchor
assert_redirected_to :controller => 'site', :action => 'index', :mlat => lat.to_s, :mlon => lon.to_s, :anchor => "#{anchor}&layers=B000FTF"
# test with some random query parameters we haven't even implemented yet
get '/go/' + short_link + "?foobar=yes"