Fix rubocop warnings
This commit is contained in:
Tom Hughes
parent
95eda2d381
commit
5b33f3f8e3
61 changed files with 547 additions and 541 deletions
|
|
@ -17,8 +17,8 @@ class AmfControllerTest < ActionController::TestCase
|
|||
end
|
||||
|
||||
def test_getpresets
|
||||
user_en_de = create(:user, :languages => %w(en de))
|
||||
user_de = create(:user, :languages => %w(de))
|
||||
user_en_de = create(:user, :languages => %w[en de])
|
||||
user_de = create(:user, :languages => %w[de])
|
||||
[user_en_de, user_de].each do |user|
|
||||
amf_content "getpresets", "/1", ["#{user.email}:test", ""]
|
||||
post :amf_read
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@ require "api_controller"
|
|||
class ApiControllerTest < ActionController::TestCase
|
||||
def setup
|
||||
super
|
||||
@badbigbbox = %w(-0.1,-0.1,1.1,1.1 10,10,11,11)
|
||||
@badmalformedbbox = %w(-0.1 hello
|
||||
10N2W10.1N2.1W)
|
||||
@badlatmixedbbox = %w(0,0.1,0.1,0 -0.1,80,0.1,70 0.24,54.34,0.25,54.33)
|
||||
@badlonmixedbbox = %w(80,-0.1,70,0.1 54.34,0.24,54.33,0.25)
|
||||
@badbigbbox = %w[-0.1,-0.1,1.1,1.1 10,10,11,11]
|
||||
@badmalformedbbox = %w[-0.1 hello
|
||||
10N2W10.1N2.1W]
|
||||
@badlatmixedbbox = %w[0,0.1,0.1,0 -0.1,80,0.1,70 0.24,54.34,0.25,54.33]
|
||||
@badlonmixedbbox = %w[80,-0.1,70,0.1 54.34,0.24,54.33,0.25]
|
||||
# @badlatlonoutboundsbbox = %w{ 191,-0.1,193,0.1 -190.1,89.9,-190,90 }
|
||||
@goodbbox = %w(-0.1,-0.1,0.1,0.1 51.1,-0.1,51.2,0
|
||||
-0.1,%20-0.1,%200.1,%200.1 -0.1edcd,-0.1d,0.1,0.1 -0.1E,-0.1E,0.1S,0.1N S0.1,W0.1,N0.1,E0.1)
|
||||
@goodbbox = %w[-0.1,-0.1,0.1,0.1 51.1,-0.1,51.2,0
|
||||
-0.1,%20-0.1,%200.1,%200.1 -0.1edcd,-0.1d,0.1,0.1 -0.1E,-0.1E,0.1S,0.1N S0.1,W0.1,N0.1,E0.1]
|
||||
# That last item in the goodbbox really shouldn't be there, as the API should
|
||||
# reall reject it, however this is to test to see if the api changes.
|
||||
end
|
||||
|
|
@ -217,7 +217,7 @@ class ApiControllerTest < ActionController::TestCase
|
|||
end
|
||||
|
||||
def test_map_without_bbox
|
||||
%w(trackpoints map).each do |tq|
|
||||
%w[trackpoints map].each do |tq|
|
||||
get tq
|
||||
assert_response :bad_request
|
||||
assert_equal "The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat", @response.body, "A bbox param was expected"
|
||||
|
|
@ -238,7 +238,7 @@ class ApiControllerTest < ActionController::TestCase
|
|||
|
||||
def test_bbox_too_big
|
||||
@badbigbbox.each do |bbox|
|
||||
%w(trackpoints map).each do |tq|
|
||||
%w[trackpoints map].each do |tq|
|
||||
get tq, :bbox => bbox
|
||||
assert_response :bad_request, "The bbox:#{bbox} was expected to be too big"
|
||||
assert_equal "The maximum bbox size is #{MAX_REQUEST_AREA}, and your request was too large. Either request a smaller area, or use planet.osm", @response.body, "bbox: #{bbox}"
|
||||
|
|
@ -248,7 +248,7 @@ class ApiControllerTest < ActionController::TestCase
|
|||
|
||||
def test_bbox_malformed
|
||||
@badmalformedbbox.each do |bbox|
|
||||
%w(trackpoints map).each do |tq|
|
||||
%w[trackpoints map].each do |tq|
|
||||
get tq, :bbox => bbox
|
||||
assert_response :bad_request, "The bbox:#{bbox} was expected to be malformed"
|
||||
assert_equal "The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat", @response.body, "bbox: #{bbox}"
|
||||
|
|
@ -258,7 +258,7 @@ class ApiControllerTest < ActionController::TestCase
|
|||
|
||||
def test_bbox_lon_mixedup
|
||||
@badlonmixedbbox.each do |bbox|
|
||||
%w(trackpoints map).each do |tq|
|
||||
%w[trackpoints map].each do |tq|
|
||||
get tq, :bbox => bbox
|
||||
assert_response :bad_request, "The bbox:#{bbox} was expected to have the longitude mixed up"
|
||||
assert_equal "The minimum longitude must be less than the maximum longitude, but it wasn't", @response.body, "bbox: #{bbox}"
|
||||
|
|
@ -268,7 +268,7 @@ class ApiControllerTest < ActionController::TestCase
|
|||
|
||||
def test_bbox_lat_mixedup
|
||||
@badlatmixedbbox.each do |bbox|
|
||||
%w(trackpoints map).each do |tq|
|
||||
%w[trackpoints map].each do |tq|
|
||||
get tq, :bbox => bbox
|
||||
assert_response :bad_request, "The bbox:#{bbox} was expected to have the latitude mixed up"
|
||||
assert_equal "The minimum latitude must be less than the maximum latitude, but it wasn't", @response.body, "bbox: #{bbox}"
|
||||
|
|
@ -333,7 +333,7 @@ class ApiControllerTest < ActionController::TestCase
|
|||
end
|
||||
|
||||
def test_changes_zoom_invalid
|
||||
zoom_to_test = %w(p -1 0 17 one two)
|
||||
zoom_to_test = %w[p -1 0 17 one two]
|
||||
zoom_to_test.each do |zoom|
|
||||
get :changes, :zoom => zoom
|
||||
assert_response :bad_request
|
||||
|
|
@ -354,7 +354,7 @@ class ApiControllerTest < ActionController::TestCase
|
|||
end
|
||||
|
||||
def test_changes_hours_invalid
|
||||
invalid = %w(-21 335 -1 0 25 26 100 one two three ping pong :)
|
||||
invalid = %w[-21 335 -1 0 25 26 100 one two three ping pong :]
|
||||
invalid.each do |hour|
|
||||
get :changes, :hours => hour
|
||||
assert_response :bad_request, "Problem with the hour: #{hour}"
|
||||
|
|
|
|||
|
|
@ -327,22 +327,22 @@ class ChangesetControllerTest < ActionController::TestCase
|
|||
|
||||
# simple diff to change a node, way and relation by removing
|
||||
# their tags
|
||||
diff = <<EOF
|
||||
<osmChange>
|
||||
<modify>
|
||||
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
|
||||
<way id='#{way.id}' changeset='#{changeset_id}' version='1'>
|
||||
<nd ref='#{node.id}'/>
|
||||
</way>
|
||||
</modify>
|
||||
<modify>
|
||||
<relation id='#{relation.id}' changeset='#{changeset_id}' version='1'>
|
||||
<member type='way' role='some' ref='#{way.id}'/>
|
||||
<member type='node' role='some' ref='#{node.id}'/>
|
||||
<member type='relation' role='some' ref='#{other_relation.id}'/>
|
||||
</relation>
|
||||
</modify>
|
||||
</osmChange>
|
||||
diff = <<EOF.strip_heredoc
|
||||
<osmChange>
|
||||
<modify>
|
||||
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
|
||||
<way id='#{way.id}' changeset='#{changeset_id}' version='1'>
|
||||
<nd ref='#{node.id}'/>
|
||||
</way>
|
||||
</modify>
|
||||
<modify>
|
||||
<relation id='#{relation.id}' changeset='#{changeset_id}' version='1'>
|
||||
<member type='way' role='some' ref='#{way.id}'/>
|
||||
<member type='node' role='some' ref='#{node.id}'/>
|
||||
<member type='relation' role='some' ref='#{other_relation.id}'/>
|
||||
</relation>
|
||||
</modify>
|
||||
</osmChange>
|
||||
EOF
|
||||
|
||||
# upload it
|
||||
|
|
@ -357,22 +357,22 @@ EOF
|
|||
|
||||
# simple diff to change a node, way and relation by removing
|
||||
# their tags
|
||||
diff = <<EOF
|
||||
<osmChange>
|
||||
<modify>
|
||||
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
|
||||
<way id='#{way.id}' changeset='#{changeset_id}' version='1'>
|
||||
<nd ref='#{node.id}'/>
|
||||
</way>
|
||||
</modify>
|
||||
<modify>
|
||||
<relation id='#{relation.id}' changeset='#{changeset_id}' version='1'>
|
||||
<member type='way' role='some' ref='#{way.id}'/>
|
||||
<member type='node' role='some' ref='#{node.id}'/>
|
||||
<member type='relation' role='some' ref='#{other_relation.id}'/>
|
||||
</relation>
|
||||
</modify>
|
||||
</osmChange>
|
||||
diff = <<EOF.strip_heredoc
|
||||
<osmChange>
|
||||
<modify>
|
||||
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
|
||||
<way id='#{way.id}' changeset='#{changeset_id}' version='1'>
|
||||
<nd ref='#{node.id}'/>
|
||||
</way>
|
||||
</modify>
|
||||
<modify>
|
||||
<relation id='#{relation.id}' changeset='#{changeset_id}' version='1'>
|
||||
<member type='way' role='some' ref='#{way.id}'/>
|
||||
<member type='node' role='some' ref='#{node.id}'/>
|
||||
<member type='relation' role='some' ref='#{other_relation.id}'/>
|
||||
</relation>
|
||||
</modify>
|
||||
</osmChange>
|
||||
EOF
|
||||
|
||||
# upload it
|
||||
|
|
@ -387,22 +387,22 @@ EOF
|
|||
|
||||
# simple diff to change a node, way and relation by removing
|
||||
# their tags
|
||||
diff = <<EOF
|
||||
<osmChange>
|
||||
<modify>
|
||||
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
|
||||
<way id='#{way.id}' changeset='#{changeset_id}' version='1'>
|
||||
<nd ref='#{node.id}'/>
|
||||
</way>
|
||||
</modify>
|
||||
<modify>
|
||||
<relation id='#{relation.id}' changeset='#{changeset_id}' version='1'>
|
||||
<member type='way' role='some' ref='#{way.id}'/>
|
||||
<member type='node' role='some' ref='#{node.id}'/>
|
||||
<member type='relation' role='some' ref='#{other_relation.id}'/>
|
||||
</relation>
|
||||
</modify>
|
||||
</osmChange>
|
||||
diff = <<EOF.strip_heredoc
|
||||
<osmChange>
|
||||
<modify>
|
||||
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
|
||||
<way id='#{way.id}' changeset='#{changeset_id}' version='1'>
|
||||
<nd ref='#{node.id}'/>
|
||||
</way>
|
||||
</modify>
|
||||
<modify>
|
||||
<relation id='#{relation.id}' changeset='#{changeset_id}' version='1'>
|
||||
<member type='way' role='some' ref='#{way.id}'/>
|
||||
<member type='node' role='some' ref='#{node.id}'/>
|
||||
<member type='relation' role='some' ref='#{other_relation.id}'/>
|
||||
</relation>
|
||||
</modify>
|
||||
</osmChange>
|
||||
EOF
|
||||
|
||||
# upload it
|
||||
|
|
@ -429,25 +429,25 @@ EOF
|
|||
basic_authorization user.email, "test"
|
||||
|
||||
# simple diff to create a node way and relation using placeholders
|
||||
diff = <<EOF
|
||||
<osmChange>
|
||||
<create>
|
||||
<node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>
|
||||
<tag k='foo' v='bar'/>
|
||||
<tag k='baz' v='bat'/>
|
||||
</node>
|
||||
<way id='-1' changeset='#{changeset.id}'>
|
||||
<nd ref='#{node.id}'/>
|
||||
</way>
|
||||
</create>
|
||||
<create>
|
||||
<relation id='-1' changeset='#{changeset.id}'>
|
||||
<member type='way' role='some' ref='#{way.id}'/>
|
||||
<member type='node' role='some' ref='#{node.id}'/>
|
||||
<member type='relation' role='some' ref='#{relation.id}'/>
|
||||
</relation>
|
||||
</create>
|
||||
</osmChange>
|
||||
diff = <<EOF.strip_heredoc
|
||||
<osmChange>
|
||||
<create>
|
||||
<node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>
|
||||
<tag k='foo' v='bar'/>
|
||||
<tag k='baz' v='bat'/>
|
||||
</node>
|
||||
<way id='-1' changeset='#{changeset.id}'>
|
||||
<nd ref='#{node.id}'/>
|
||||
</way>
|
||||
</create>
|
||||
<create>
|
||||
<relation id='-1' changeset='#{changeset.id}'>
|
||||
<member type='way' role='some' ref='#{way.id}'/>
|
||||
<member type='node' role='some' ref='#{node.id}'/>
|
||||
<member type='relation' role='some' ref='#{relation.id}'/>
|
||||
</relation>
|
||||
</create>
|
||||
</osmChange>
|
||||
EOF
|
||||
|
||||
# upload it
|
||||
|
|
@ -509,7 +509,7 @@ EOF
|
|||
delete << used_node.to_xml_node
|
||||
|
||||
# update the changeset to one that this user owns
|
||||
%w(node way relation).each do |type|
|
||||
%w[node way relation].each do |type|
|
||||
delete.find("//osmChange/delete/#{type}").each do |n|
|
||||
n["changeset"] = changeset.id.to_s
|
||||
end
|
||||
|
|
@ -582,29 +582,29 @@ EOF
|
|||
|
||||
# upload some widely-spaced nodes, spiralling positive and negative to cause
|
||||
# largest bbox over-expansion possible.
|
||||
diff = <<EOF
|
||||
<osmChange>
|
||||
<create>
|
||||
<node id='-1' lon='-20' lat='-10' changeset='#{changeset_id}'/>
|
||||
<node id='-10' lon='20' lat='10' changeset='#{changeset_id}'/>
|
||||
<node id='-2' lon='-40' lat='-20' changeset='#{changeset_id}'/>
|
||||
<node id='-11' lon='40' lat='20' changeset='#{changeset_id}'/>
|
||||
<node id='-3' lon='-60' lat='-30' changeset='#{changeset_id}'/>
|
||||
<node id='-12' lon='60' lat='30' changeset='#{changeset_id}'/>
|
||||
<node id='-4' lon='-80' lat='-40' changeset='#{changeset_id}'/>
|
||||
<node id='-13' lon='80' lat='40' changeset='#{changeset_id}'/>
|
||||
<node id='-5' lon='-100' lat='-50' changeset='#{changeset_id}'/>
|
||||
<node id='-14' lon='100' lat='50' changeset='#{changeset_id}'/>
|
||||
<node id='-6' lon='-120' lat='-60' changeset='#{changeset_id}'/>
|
||||
<node id='-15' lon='120' lat='60' changeset='#{changeset_id}'/>
|
||||
<node id='-7' lon='-140' lat='-70' changeset='#{changeset_id}'/>
|
||||
<node id='-16' lon='140' lat='70' changeset='#{changeset_id}'/>
|
||||
<node id='-8' lon='-160' lat='-80' changeset='#{changeset_id}'/>
|
||||
<node id='-17' lon='160' lat='80' changeset='#{changeset_id}'/>
|
||||
<node id='-9' lon='-179.9' lat='-89.9' changeset='#{changeset_id}'/>
|
||||
<node id='-18' lon='179.9' lat='89.9' changeset='#{changeset_id}'/>
|
||||
</create>
|
||||
</osmChange>
|
||||
diff = <<EOF.strip_heredoc
|
||||
<osmChange>
|
||||
<create>
|
||||
<node id='-1' lon='-20' lat='-10' changeset='#{changeset_id}'/>
|
||||
<node id='-10' lon='20' lat='10' changeset='#{changeset_id}'/>
|
||||
<node id='-2' lon='-40' lat='-20' changeset='#{changeset_id}'/>
|
||||
<node id='-11' lon='40' lat='20' changeset='#{changeset_id}'/>
|
||||
<node id='-3' lon='-60' lat='-30' changeset='#{changeset_id}'/>
|
||||
<node id='-12' lon='60' lat='30' changeset='#{changeset_id}'/>
|
||||
<node id='-4' lon='-80' lat='-40' changeset='#{changeset_id}'/>
|
||||
<node id='-13' lon='80' lat='40' changeset='#{changeset_id}'/>
|
||||
<node id='-5' lon='-100' lat='-50' changeset='#{changeset_id}'/>
|
||||
<node id='-14' lon='100' lat='50' changeset='#{changeset_id}'/>
|
||||
<node id='-6' lon='-120' lat='-60' changeset='#{changeset_id}'/>
|
||||
<node id='-15' lon='120' lat='60' changeset='#{changeset_id}'/>
|
||||
<node id='-7' lon='-140' lat='-70' changeset='#{changeset_id}'/>
|
||||
<node id='-16' lon='140' lat='70' changeset='#{changeset_id}'/>
|
||||
<node id='-8' lon='-160' lat='-80' changeset='#{changeset_id}'/>
|
||||
<node id='-17' lon='160' lat='80' changeset='#{changeset_id}'/>
|
||||
<node id='-9' lon='-179.9' lat='-89.9' changeset='#{changeset_id}'/>
|
||||
<node id='-18' lon='179.9' lat='89.9' changeset='#{changeset_id}'/>
|
||||
</create>
|
||||
</osmChange>
|
||||
EOF
|
||||
|
||||
# upload it, which used to cause an error like "PGError: ERROR:
|
||||
|
|
@ -645,7 +645,7 @@ EOF
|
|||
delete << used_node.to_xml_node
|
||||
|
||||
# update the changeset to one that this user owns
|
||||
%w(node way relation).each do |type|
|
||||
%w[node way relation].each do |type|
|
||||
delete.find("//osmChange/delete/#{type}").each do |n|
|
||||
n["changeset"] = changeset.id.to_s
|
||||
end
|
||||
|
|
@ -689,7 +689,7 @@ EOF
|
|||
delete << used_node.to_xml_node
|
||||
|
||||
# update the changeset to one that this user owns
|
||||
%w(node way relation).each do |type|
|
||||
%w[node way relation].each do |type|
|
||||
delete.find("//osmChange/delete/#{type}").each do |n|
|
||||
n["changeset"] = changeset.id.to_s
|
||||
end
|
||||
|
|
@ -739,14 +739,14 @@ EOF
|
|||
basic_authorization changeset.user.email, "test"
|
||||
|
||||
# simple diff to create a node way and relation using placeholders
|
||||
diff = <<EOF
|
||||
<osmChange>
|
||||
<create>
|
||||
<node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>
|
||||
<tag k='foo' v='#{'x' * 256}'/>
|
||||
</node>
|
||||
</create>
|
||||
</osmChange>
|
||||
diff = <<EOF.strip_heredoc
|
||||
<osmChange>
|
||||
<create>
|
||||
<node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>
|
||||
<tag k='foo' v='#{'x' * 256}'/>
|
||||
</node>
|
||||
</create>
|
||||
</osmChange>
|
||||
EOF
|
||||
|
||||
# upload it
|
||||
|
|
@ -770,26 +770,26 @@ EOF
|
|||
basic_authorization changeset.user.email, "test"
|
||||
|
||||
# simple diff to create a node way and relation using placeholders
|
||||
diff = <<EOF
|
||||
<osmChange>
|
||||
<create>
|
||||
<node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>
|
||||
<tag k='foo' v='bar'/>
|
||||
<tag k='baz' v='bat'/>
|
||||
</node>
|
||||
</create>
|
||||
<modify>
|
||||
<way id='#{way.id}' changeset='#{changeset.id}' version='1'>
|
||||
<nd ref='-1'/>
|
||||
<nd ref='#{node.id}'/>
|
||||
</way>
|
||||
<relation id='#{relation.id}' changeset='#{changeset.id}' version='1'>
|
||||
<member type='way' role='some' ref='#{way.id}'/>
|
||||
<member type='node' role='some' ref='-1'/>
|
||||
<member type='relation' role='some' ref='#{relation.id}'/>
|
||||
</relation>
|
||||
</modify>
|
||||
</osmChange>
|
||||
diff = <<EOF.strip_heredoc
|
||||
<osmChange>
|
||||
<create>
|
||||
<node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>
|
||||
<tag k='foo' v='bar'/>
|
||||
<tag k='baz' v='bat'/>
|
||||
</node>
|
||||
</create>
|
||||
<modify>
|
||||
<way id='#{way.id}' changeset='#{changeset.id}' version='1'>
|
||||
<nd ref='-1'/>
|
||||
<nd ref='#{node.id}'/>
|
||||
</way>
|
||||
<relation id='#{relation.id}' changeset='#{changeset.id}' version='1'>
|
||||
<member type='way' role='some' ref='#{way.id}'/>
|
||||
<member type='node' role='some' ref='-1'/>
|
||||
<member type='relation' role='some' ref='#{relation.id}'/>
|
||||
</relation>
|
||||
</modify>
|
||||
</osmChange>
|
||||
EOF
|
||||
|
||||
# upload it
|
||||
|
|
@ -832,28 +832,28 @@ EOF
|
|||
basic_authorization changeset.user.email, "test"
|
||||
|
||||
# simple diff to create a node way and relation using placeholders
|
||||
diff = <<EOF
|
||||
<osmChange>
|
||||
<modify>
|
||||
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
|
||||
<way id='#{way.id}' changeset='#{changeset.id}' version='1'>
|
||||
<nd ref='#{node.id}'/>
|
||||
</way>
|
||||
</modify>
|
||||
<modify>
|
||||
<relation id='#{relation.id}' changeset='#{changeset.id}' version='1'>
|
||||
<member type='way' role='some' ref='#{way.id}'/>
|
||||
<member type='node' role='some' ref='#{node.id}'/>
|
||||
<member type='relation' role='some' ref='#{other_relation.id}'/>
|
||||
</relation>
|
||||
</modify>
|
||||
<create>
|
||||
<node id='-1' lon='0' lat='0' changeset='#{other_changeset.id}'>
|
||||
<tag k='foo' v='bar'/>
|
||||
<tag k='baz' v='bat'/>
|
||||
</node>
|
||||
</create>
|
||||
</osmChange>
|
||||
diff = <<EOF.strip_heredoc
|
||||
<osmChange>
|
||||
<modify>
|
||||
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
|
||||
<way id='#{way.id}' changeset='#{changeset.id}' version='1'>
|
||||
<nd ref='#{node.id}'/>
|
||||
</way>
|
||||
</modify>
|
||||
<modify>
|
||||
<relation id='#{relation.id}' changeset='#{changeset.id}' version='1'>
|
||||
<member type='way' role='some' ref='#{way.id}'/>
|
||||
<member type='node' role='some' ref='#{node.id}'/>
|
||||
<member type='relation' role='some' ref='#{other_relation.id}'/>
|
||||
</relation>
|
||||
</modify>
|
||||
<create>
|
||||
<node id='-1' lon='0' lat='0' changeset='#{other_changeset.id}'>
|
||||
<tag k='foo' v='bar'/>
|
||||
<tag k='baz' v='bat'/>
|
||||
</node>
|
||||
</create>
|
||||
</osmChange>
|
||||
EOF
|
||||
|
||||
# upload it
|
||||
|
|
@ -878,19 +878,19 @@ EOF
|
|||
# change the location of a node multiple times, each time referencing
|
||||
# the last version. doesn't this depend on version numbers being
|
||||
# sequential?
|
||||
diff = <<EOF
|
||||
<osmChange>
|
||||
<modify>
|
||||
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
|
||||
<node id='#{node.id}' lon='1' lat='0' changeset='#{changeset.id}' version='2'/>
|
||||
<node id='#{node.id}' lon='1' lat='1' changeset='#{changeset.id}' version='3'/>
|
||||
<node id='#{node.id}' lon='1' lat='2' changeset='#{changeset.id}' version='4'/>
|
||||
<node id='#{node.id}' lon='2' lat='2' changeset='#{changeset.id}' version='5'/>
|
||||
<node id='#{node.id}' lon='3' lat='2' changeset='#{changeset.id}' version='6'/>
|
||||
<node id='#{node.id}' lon='3' lat='3' changeset='#{changeset.id}' version='7'/>
|
||||
<node id='#{node.id}' lon='9' lat='9' changeset='#{changeset.id}' version='8'/>
|
||||
</modify>
|
||||
</osmChange>
|
||||
diff = <<EOF.strip_heredoc
|
||||
<osmChange>
|
||||
<modify>
|
||||
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
|
||||
<node id='#{node.id}' lon='1' lat='0' changeset='#{changeset.id}' version='2'/>
|
||||
<node id='#{node.id}' lon='1' lat='1' changeset='#{changeset.id}' version='3'/>
|
||||
<node id='#{node.id}' lon='1' lat='2' changeset='#{changeset.id}' version='4'/>
|
||||
<node id='#{node.id}' lon='2' lat='2' changeset='#{changeset.id}' version='5'/>
|
||||
<node id='#{node.id}' lon='3' lat='2' changeset='#{changeset.id}' version='6'/>
|
||||
<node id='#{node.id}' lon='3' lat='3' changeset='#{changeset.id}' version='7'/>
|
||||
<node id='#{node.id}' lon='9' lat='9' changeset='#{changeset.id}' version='8'/>
|
||||
</modify>
|
||||
</osmChange>
|
||||
EOF
|
||||
|
||||
# upload it
|
||||
|
|
@ -914,13 +914,13 @@ EOF
|
|||
|
||||
basic_authorization changeset.user.email, "test"
|
||||
|
||||
diff = <<EOF
|
||||
<osmChange>
|
||||
<modify>
|
||||
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
|
||||
<node id='#{node.id}' lon='1' lat='1' changeset='#{changeset.id}' version='1'/>
|
||||
</modify>
|
||||
</osmChange>
|
||||
diff = <<EOF.strip_heredoc
|
||||
<osmChange>
|
||||
<modify>
|
||||
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
|
||||
<node id='#{node.id}' lon='1' lat='1' changeset='#{changeset.id}' version='1'/>
|
||||
</modify>
|
||||
</osmChange>
|
||||
EOF
|
||||
|
||||
# upload it
|
||||
|
|
@ -937,12 +937,12 @@ EOF
|
|||
|
||||
basic_authorization changeset.user.email, "test"
|
||||
|
||||
diff = <<EOF
|
||||
<osmChange>
|
||||
<modify>
|
||||
<node id='1' lon='1' lat='1' changeset='#{changeset.id}'/>
|
||||
</modify>
|
||||
</osmChange>
|
||||
diff = <<EOF.strip_heredoc
|
||||
<osmChange>
|
||||
<modify>
|
||||
<node id='1' lon='1' lat='1' changeset='#{changeset.id}'/>
|
||||
</modify>
|
||||
</osmChange>
|
||||
EOF
|
||||
|
||||
# upload it
|
||||
|
|
@ -959,12 +959,12 @@ EOF
|
|||
|
||||
basic_authorization changeset.user.email, "test"
|
||||
|
||||
diff = <<EOF
|
||||
<osmChange>
|
||||
<ping>
|
||||
<node id='1' lon='1' lat='1' changeset='#{changeset.id}' />
|
||||
</ping>
|
||||
</osmChange>
|
||||
diff = <<EOF.strip_heredoc
|
||||
<osmChange>
|
||||
<ping>
|
||||
<node id='1' lon='1' lat='1' changeset='#{changeset.id}' />
|
||||
</ping>
|
||||
</osmChange>
|
||||
EOF
|
||||
content diff
|
||||
post :upload, :id => changeset.id
|
||||
|
|
@ -985,18 +985,18 @@ EOF
|
|||
|
||||
basic_authorization changeset.user.email, "test"
|
||||
|
||||
diff = <<EOF
|
||||
<osmChange>
|
||||
<modify><node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}'
|
||||
version='1'></node>
|
||||
<node id='#{node.id}' lon='1' lat='1' changeset='#{changeset.id}' version='2'><tag k='k' v='v'/></node></modify>
|
||||
<modify>
|
||||
<relation id='#{relation.id}' changeset='#{changeset.id}' version='1'><member
|
||||
type='way' role='some' ref='#{way.id}'/><member
|
||||
type='node' role='some' ref='#{node.id}'/>
|
||||
<member type='relation' role='some' ref='#{other_relation.id}'/>
|
||||
</relation>
|
||||
</modify></osmChange>
|
||||
diff = <<EOF.strip_heredoc
|
||||
<osmChange>
|
||||
<modify><node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}'
|
||||
version='1'></node>
|
||||
<node id='#{node.id}' lon='1' lat='1' changeset='#{changeset.id}' version='2'><tag k='k' v='v'/></node></modify>
|
||||
<modify>
|
||||
<relation id='#{relation.id}' changeset='#{changeset.id}' version='1'><member
|
||||
type='way' role='some' ref='#{way.id}'/><member
|
||||
type='node' role='some' ref='#{node.id}'/>
|
||||
<member type='relation' role='some' ref='#{other_relation.id}'/>
|
||||
</relation>
|
||||
</modify></osmChange>
|
||||
EOF
|
||||
|
||||
# upload it
|
||||
|
|
@ -1021,20 +1021,20 @@ EOF
|
|||
|
||||
basic_authorization changeset.user.email, "test"
|
||||
|
||||
diff = <<EOF
|
||||
<osmChange>
|
||||
<create>
|
||||
<node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>
|
||||
<tag k="foo" v="bar"/>
|
||||
</node>
|
||||
</create>
|
||||
<modify>
|
||||
<node id='-1' lon='1' lat='1' changeset='#{changeset.id}' version='1'/>
|
||||
</modify>
|
||||
<delete>
|
||||
<node id='-1' lon='2' lat='2' changeset='#{changeset.id}' version='2'/>
|
||||
</delete>
|
||||
</osmChange>
|
||||
diff = <<EOF.strip_heredoc
|
||||
<osmChange>
|
||||
<create>
|
||||
<node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>
|
||||
<tag k="foo" v="bar"/>
|
||||
</node>
|
||||
</create>
|
||||
<modify>
|
||||
<node id='-1' lon='1' lat='1' changeset='#{changeset.id}' version='1'/>
|
||||
</modify>
|
||||
<delete>
|
||||
<node id='-1' lon='2' lat='2' changeset='#{changeset.id}' version='2'/>
|
||||
</delete>
|
||||
</osmChange>
|
||||
EOF
|
||||
|
||||
# upload it
|
||||
|
|
@ -1056,14 +1056,14 @@ EOF
|
|||
|
||||
basic_authorization changeset.user.email, "test"
|
||||
|
||||
diff = <<EOF
|
||||
<osmChange>
|
||||
<create>
|
||||
<node id='-1' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
|
||||
<node id='-1' lon='1' lat='1' changeset='#{changeset.id}' version='1'/>
|
||||
<node id='-1' lon='2' lat='2' changeset='#{changeset.id}' version='2'/>
|
||||
</create>
|
||||
</osmChange>
|
||||
diff = <<EOF.strip_heredoc
|
||||
<osmChange>
|
||||
<create>
|
||||
<node id='-1' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
|
||||
<node id='-1' lon='1' lat='1' changeset='#{changeset.id}' version='1'/>
|
||||
<node id='-1' lon='2' lat='2' changeset='#{changeset.id}' version='2'/>
|
||||
</create>
|
||||
</osmChange>
|
||||
EOF
|
||||
|
||||
# upload it
|
||||
|
|
@ -1082,20 +1082,20 @@ EOF
|
|||
|
||||
basic_authorization changeset.user.email, "test"
|
||||
|
||||
diff = <<EOF
|
||||
<osmChange>
|
||||
<create>
|
||||
<node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>
|
||||
<node id="-2" lon="1" lat="1" changeset="#{changeset.id}" version="1"/>
|
||||
<node id="-3" lon="2" lat="2" changeset="#{changeset.id}" version="1"/>
|
||||
<way id="-1" changeset="#{changeset.id}" version="1">
|
||||
<nd ref="-1"/>
|
||||
<nd ref="-2"/>
|
||||
<nd ref="-3"/>
|
||||
<nd ref="-4"/>
|
||||
</way>
|
||||
</create>
|
||||
</osmChange>
|
||||
diff = <<EOF.strip_heredoc
|
||||
<osmChange>
|
||||
<create>
|
||||
<node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>
|
||||
<node id="-2" lon="1" lat="1" changeset="#{changeset.id}" version="1"/>
|
||||
<node id="-3" lon="2" lat="2" changeset="#{changeset.id}" version="1"/>
|
||||
<way id="-1" changeset="#{changeset.id}" version="1">
|
||||
<nd ref="-1"/>
|
||||
<nd ref="-2"/>
|
||||
<nd ref="-3"/>
|
||||
<nd ref="-4"/>
|
||||
</way>
|
||||
</create>
|
||||
</osmChange>
|
||||
EOF
|
||||
|
||||
# upload it
|
||||
|
|
@ -1106,20 +1106,20 @@ EOF
|
|||
assert_equal "Placeholder node not found for reference -4 in way -1", @response.body
|
||||
|
||||
# the same again, but this time use an existing way
|
||||
diff = <<EOF
|
||||
<osmChange>
|
||||
<create>
|
||||
<node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>
|
||||
<node id="-2" lon="1" lat="1" changeset="#{changeset.id}" version="1"/>
|
||||
<node id="-3" lon="2" lat="2" changeset="#{changeset.id}" version="1"/>
|
||||
<way id="#{way.id}" changeset="#{changeset.id}" version="1">
|
||||
<nd ref="-1"/>
|
||||
<nd ref="-2"/>
|
||||
<nd ref="-3"/>
|
||||
<nd ref="-4"/>
|
||||
</way>
|
||||
</create>
|
||||
</osmChange>
|
||||
diff = <<EOF.strip_heredoc
|
||||
<osmChange>
|
||||
<create>
|
||||
<node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>
|
||||
<node id="-2" lon="1" lat="1" changeset="#{changeset.id}" version="1"/>
|
||||
<node id="-3" lon="2" lat="2" changeset="#{changeset.id}" version="1"/>
|
||||
<way id="#{way.id}" changeset="#{changeset.id}" version="1">
|
||||
<nd ref="-1"/>
|
||||
<nd ref="-2"/>
|
||||
<nd ref="-3"/>
|
||||
<nd ref="-4"/>
|
||||
</way>
|
||||
</create>
|
||||
</osmChange>
|
||||
EOF
|
||||
|
||||
# upload it
|
||||
|
|
@ -1139,20 +1139,20 @@ EOF
|
|||
|
||||
basic_authorization changeset.user.email, "test"
|
||||
|
||||
diff = <<EOF
|
||||
<osmChange>
|
||||
<create>
|
||||
<node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>
|
||||
<node id="-2" lon="1" lat="1" changeset="#{changeset.id}" version="1"/>
|
||||
<node id="-3" lon="2" lat="2" changeset="#{changeset.id}" version="1"/>
|
||||
<relation id="-1" changeset="#{changeset.id}" version="1">
|
||||
<member type="node" role="foo" ref="-1"/>
|
||||
<member type="node" role="foo" ref="-2"/>
|
||||
<member type="node" role="foo" ref="-3"/>
|
||||
<member type="node" role="foo" ref="-4"/>
|
||||
</relation>
|
||||
</create>
|
||||
</osmChange>
|
||||
diff = <<EOF.strip_heredoc
|
||||
<osmChange>
|
||||
<create>
|
||||
<node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>
|
||||
<node id="-2" lon="1" lat="1" changeset="#{changeset.id}" version="1"/>
|
||||
<node id="-3" lon="2" lat="2" changeset="#{changeset.id}" version="1"/>
|
||||
<relation id="-1" changeset="#{changeset.id}" version="1">
|
||||
<member type="node" role="foo" ref="-1"/>
|
||||
<member type="node" role="foo" ref="-2"/>
|
||||
<member type="node" role="foo" ref="-3"/>
|
||||
<member type="node" role="foo" ref="-4"/>
|
||||
</relation>
|
||||
</create>
|
||||
</osmChange>
|
||||
EOF
|
||||
|
||||
# upload it
|
||||
|
|
@ -1163,20 +1163,20 @@ EOF
|
|||
assert_equal "Placeholder Node not found for reference -4 in relation -1.", @response.body
|
||||
|
||||
# the same again, but this time use an existing relation
|
||||
diff = <<EOF
|
||||
<osmChange>
|
||||
<create>
|
||||
<node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>
|
||||
<node id="-2" lon="1" lat="1" changeset="#{changeset.id}" version="1"/>
|
||||
<node id="-3" lon="2" lat="2" changeset="#{changeset.id}" version="1"/>
|
||||
<relation id="#{relation.id}" changeset="#{changeset.id}" version="1">
|
||||
<member type="node" role="foo" ref="-1"/>
|
||||
<member type="node" role="foo" ref="-2"/>
|
||||
<member type="node" role="foo" ref="-3"/>
|
||||
<member type="way" role="bar" ref="-1"/>
|
||||
</relation>
|
||||
</create>
|
||||
</osmChange>
|
||||
diff = <<EOF.strip_heredoc
|
||||
<osmChange>
|
||||
<create>
|
||||
<node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>
|
||||
<node id="-2" lon="1" lat="1" changeset="#{changeset.id}" version="1"/>
|
||||
<node id="-3" lon="2" lat="2" changeset="#{changeset.id}" version="1"/>
|
||||
<relation id="#{relation.id}" changeset="#{changeset.id}" version="1">
|
||||
<member type="node" role="foo" ref="-1"/>
|
||||
<member type="node" role="foo" ref="-2"/>
|
||||
<member type="node" role="foo" ref="-3"/>
|
||||
<member type="way" role="bar" ref="-1"/>
|
||||
</relation>
|
||||
</create>
|
||||
</osmChange>
|
||||
EOF
|
||||
|
||||
# upload it
|
||||
|
|
@ -1342,19 +1342,19 @@ EOF
|
|||
changeset_id = @response.body.to_i
|
||||
|
||||
# add a diff to it
|
||||
diff = <<EOF
|
||||
<osmChange>
|
||||
<modify>
|
||||
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
|
||||
<node id='#{node.id}' lon='1' lat='0' changeset='#{changeset_id}' version='2'/>
|
||||
<node id='#{node.id}' lon='1' lat='1' changeset='#{changeset_id}' version='3'/>
|
||||
<node id='#{node.id}' lon='1' lat='2' changeset='#{changeset_id}' version='4'/>
|
||||
<node id='#{node.id}' lon='2' lat='2' changeset='#{changeset_id}' version='5'/>
|
||||
<node id='#{node.id}' lon='3' lat='2' changeset='#{changeset_id}' version='6'/>
|
||||
<node id='#{node.id}' lon='3' lat='3' changeset='#{changeset_id}' version='7'/>
|
||||
<node id='#{node.id}' lon='9' lat='9' changeset='#{changeset_id}' version='8'/>
|
||||
</modify>
|
||||
</osmChange>
|
||||
diff = <<EOF.strip_heredoc
|
||||
<osmChange>
|
||||
<modify>
|
||||
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
|
||||
<node id='#{node.id}' lon='1' lat='0' changeset='#{changeset_id}' version='2'/>
|
||||
<node id='#{node.id}' lon='1' lat='1' changeset='#{changeset_id}' version='3'/>
|
||||
<node id='#{node.id}' lon='1' lat='2' changeset='#{changeset_id}' version='4'/>
|
||||
<node id='#{node.id}' lon='2' lat='2' changeset='#{changeset_id}' version='5'/>
|
||||
<node id='#{node.id}' lon='3' lat='2' changeset='#{changeset_id}' version='6'/>
|
||||
<node id='#{node.id}' lon='3' lat='3' changeset='#{changeset_id}' version='7'/>
|
||||
<node id='#{node.id}' lon='9' lat='9' changeset='#{changeset_id}' version='8'/>
|
||||
</modify>
|
||||
</osmChange>
|
||||
EOF
|
||||
|
||||
# upload it
|
||||
|
|
@ -1387,33 +1387,33 @@ EOF
|
|||
assert_response :success
|
||||
changeset_id = @response.body.to_i
|
||||
|
||||
diff = <<OSMFILE
|
||||
<osmChange version="0.6" generator="JOSM">
|
||||
<create version="0.6" generator="JOSM">
|
||||
<node id='-1' visible='true' changeset='#{changeset_id}' lat='51.49619982187321' lon='-0.18722061869438314' />
|
||||
<node id='-2' visible='true' changeset='#{changeset_id}' lat='51.496359883909605' lon='-0.18653093576241928' />
|
||||
<node id='-3' visible='true' changeset='#{changeset_id}' lat='51.49598132358285' lon='-0.18719613290981638' />
|
||||
<node id='-4' visible='true' changeset='#{changeset_id}' lat='51.4961591711078' lon='-0.18629015888084607' />
|
||||
<node id='-5' visible='true' changeset='#{changeset_id}' lat='51.49582126021711' lon='-0.18708186591517145' />
|
||||
<node id='-6' visible='true' changeset='#{changeset_id}' lat='51.49591018437858' lon='-0.1861432441734455' />
|
||||
<node id='-7' visible='true' changeset='#{changeset_id}' lat='51.49560784152179' lon='-0.18694719410005425' />
|
||||
<node id='-8' visible='true' changeset='#{changeset_id}' lat='51.49567389979617' lon='-0.1860289771788006' />
|
||||
<node id='-9' visible='true' changeset='#{changeset_id}' lat='51.49543761398892' lon='-0.186820684213126' />
|
||||
<way id='-10' action='modiy' visible='true' changeset='#{changeset_id}'>
|
||||
<nd ref='-1' />
|
||||
<nd ref='-2' />
|
||||
<nd ref='-3' />
|
||||
<nd ref='-4' />
|
||||
<nd ref='-5' />
|
||||
<nd ref='-6' />
|
||||
<nd ref='-7' />
|
||||
<nd ref='-8' />
|
||||
<nd ref='-9' />
|
||||
<tag k='highway' v='residential' />
|
||||
<tag k='name' v='Foobar Street' />
|
||||
</way>
|
||||
</create>
|
||||
</osmChange>
|
||||
diff = <<OSMFILE.strip_heredoc
|
||||
<osmChange version="0.6" generator="JOSM">
|
||||
<create version="0.6" generator="JOSM">
|
||||
<node id='-1' visible='true' changeset='#{changeset_id}' lat='51.49619982187321' lon='-0.18722061869438314' />
|
||||
<node id='-2' visible='true' changeset='#{changeset_id}' lat='51.496359883909605' lon='-0.18653093576241928' />
|
||||
<node id='-3' visible='true' changeset='#{changeset_id}' lat='51.49598132358285' lon='-0.18719613290981638' />
|
||||
<node id='-4' visible='true' changeset='#{changeset_id}' lat='51.4961591711078' lon='-0.18629015888084607' />
|
||||
<node id='-5' visible='true' changeset='#{changeset_id}' lat='51.49582126021711' lon='-0.18708186591517145' />
|
||||
<node id='-6' visible='true' changeset='#{changeset_id}' lat='51.49591018437858' lon='-0.1861432441734455' />
|
||||
<node id='-7' visible='true' changeset='#{changeset_id}' lat='51.49560784152179' lon='-0.18694719410005425' />
|
||||
<node id='-8' visible='true' changeset='#{changeset_id}' lat='51.49567389979617' lon='-0.1860289771788006' />
|
||||
<node id='-9' visible='true' changeset='#{changeset_id}' lat='51.49543761398892' lon='-0.186820684213126' />
|
||||
<way id='-10' action='modiy' visible='true' changeset='#{changeset_id}'>
|
||||
<nd ref='-1' />
|
||||
<nd ref='-2' />
|
||||
<nd ref='-3' />
|
||||
<nd ref='-4' />
|
||||
<nd ref='-5' />
|
||||
<nd ref='-6' />
|
||||
<nd ref='-7' />
|
||||
<nd ref='-8' />
|
||||
<nd ref='-9' />
|
||||
<tag k='highway' v='residential' />
|
||||
<tag k='name' v='Foobar Street' />
|
||||
</way>
|
||||
</create>
|
||||
</osmChange>
|
||||
OSMFILE
|
||||
|
||||
# upload it
|
||||
|
|
@ -1450,26 +1450,26 @@ OSMFILE
|
|||
changeset_id = @response.body.to_i
|
||||
|
||||
# add a diff to it
|
||||
diff = <<EOF
|
||||
<osmChange>
|
||||
<delete>
|
||||
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
|
||||
</delete>
|
||||
<create>
|
||||
<node id='-1' lon='9' lat='9' changeset='#{changeset_id}' version='0'/>
|
||||
<node id='-2' lon='8' lat='9' changeset='#{changeset_id}' version='0'/>
|
||||
<node id='-3' lon='7' lat='9' changeset='#{changeset_id}' version='0'/>
|
||||
</create>
|
||||
<modify>
|
||||
<node id='#{node2.id}' lon='20' lat='15' changeset='#{changeset_id}' version='1'/>
|
||||
<way id='#{way.id}' changeset='#{changeset_id}' version='1'>
|
||||
<nd ref='#{node2.id}'/>
|
||||
<nd ref='-1'/>
|
||||
<nd ref='-2'/>
|
||||
<nd ref='-3'/>
|
||||
</way>
|
||||
</modify>
|
||||
</osmChange>
|
||||
diff = <<EOF.strip_heredoc
|
||||
<osmChange>
|
||||
<delete>
|
||||
<node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
|
||||
</delete>
|
||||
<create>
|
||||
<node id='-1' lon='9' lat='9' changeset='#{changeset_id}' version='0'/>
|
||||
<node id='-2' lon='8' lat='9' changeset='#{changeset_id}' version='0'/>
|
||||
<node id='-3' lon='7' lat='9' changeset='#{changeset_id}' version='0'/>
|
||||
</create>
|
||||
<modify>
|
||||
<node id='#{node2.id}' lon='20' lat='15' changeset='#{changeset_id}' version='1'/>
|
||||
<way id='#{way.id}' changeset='#{changeset_id}' version='1'>
|
||||
<nd ref='#{node2.id}'/>
|
||||
<nd ref='-1'/>
|
||||
<nd ref='-2'/>
|
||||
<nd ref='-3'/>
|
||||
</way>
|
||||
</modify>
|
||||
</osmChange>
|
||||
EOF
|
||||
|
||||
# upload it
|
||||
|
|
|
|||
|
|
@ -253,7 +253,7 @@ class GeocoderControllerTest < ActionController::TestCase
|
|||
].each do |code|
|
||||
post :search, :query => code
|
||||
assert_response :success
|
||||
assert_equal %w(us_postcode osm_nominatim), assigns(:sources)
|
||||
assert_equal %w[us_postcode osm_nominatim], assigns(:sources)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -269,20 +269,20 @@ class GeocoderControllerTest < ActionController::TestCase
|
|||
"CR2 6XH",
|
||||
"DN55 1PT"
|
||||
].each do |code|
|
||||
search_check code, %w(uk_postcode osm_nominatim)
|
||||
search_check code, %w[uk_postcode osm_nominatim]
|
||||
end
|
||||
end
|
||||
|
||||
##
|
||||
# Test identification of Canadian postcodes
|
||||
def test_identify_ca_postcode
|
||||
search_check "A1B 2C3", %w(ca_postcode osm_nominatim)
|
||||
search_check "A1B 2C3", %w[ca_postcode osm_nominatim]
|
||||
end
|
||||
|
||||
##
|
||||
# Test identification fall through to the default case
|
||||
def test_identify_default
|
||||
search_check "foo bar baz", %w(osm_nominatim geonames)
|
||||
search_check "foo bar baz", %w[osm_nominatim geonames]
|
||||
end
|
||||
|
||||
##
|
||||
|
|
@ -467,7 +467,7 @@ class GeocoderControllerTest < ActionController::TestCase
|
|||
assert_response :success
|
||||
assert_template :search
|
||||
assert_template :layout => "map"
|
||||
assert_equal %w(latlon osm_nominatim_reverse geonames_reverse), assigns(:sources)
|
||||
assert_equal %w[latlon osm_nominatim_reverse geonames_reverse], assigns(:sources)
|
||||
assert_nil @controller.params[:query]
|
||||
assert_in_delta lat, @controller.params[:lat]
|
||||
assert_in_delta lon, @controller.params[:lon]
|
||||
|
|
@ -476,7 +476,7 @@ class GeocoderControllerTest < ActionController::TestCase
|
|||
assert_response :success
|
||||
assert_template :search
|
||||
assert_template :layout => "xhr"
|
||||
assert_equal %w(latlon osm_nominatim_reverse geonames_reverse), assigns(:sources)
|
||||
assert_equal %w[latlon osm_nominatim_reverse geonames_reverse], assigns(:sources)
|
||||
assert_nil @controller.params[:query]
|
||||
assert_in_delta lat, @controller.params[:lat]
|
||||
assert_in_delta lon, @controller.params[:lon]
|
||||
|
|
|
|||
|
|
@ -741,15 +741,15 @@ class RelationControllerTest < ActionController::TestCase
|
|||
|
||||
basic_authorization(user.email, "test")
|
||||
|
||||
doc_str = <<OSM
|
||||
<osm>
|
||||
<relation changeset='#{changeset.id}'>
|
||||
<member ref='#{node1.id}' type='node' role='first'/>
|
||||
<member ref='#{node2.id}' type='node' role='second'/>
|
||||
<member ref='#{way1.id}' type='way' role='third'/>
|
||||
<member ref='#{way2.id}' type='way' role='fourth'/>
|
||||
</relation>
|
||||
</osm>
|
||||
doc_str = <<OSM.strip_heredoc
|
||||
<osm>
|
||||
<relation changeset='#{changeset.id}'>
|
||||
<member ref='#{node1.id}' type='node' role='first'/>
|
||||
<member ref='#{node2.id}' type='node' role='second'/>
|
||||
<member ref='#{way1.id}' type='way' role='third'/>
|
||||
<member ref='#{way2.id}' type='way' role='fourth'/>
|
||||
</relation>
|
||||
</osm>
|
||||
OSM
|
||||
doc = XML::Parser.string(doc_str).parse
|
||||
|
||||
|
|
@ -801,15 +801,15 @@ OSM
|
|||
node1 = create(:node)
|
||||
node2 = create(:node)
|
||||
|
||||
doc_str = <<OSM
|
||||
<osm>
|
||||
<relation changeset='#{changeset.id}'>
|
||||
<member ref='#{node1.id}' type='node' role='forward'/>
|
||||
<member ref='#{node2.id}' type='node' role='forward'/>
|
||||
<member ref='#{node1.id}' type='node' role='forward'/>
|
||||
<member ref='#{node2.id}' type='node' role='forward'/>
|
||||
</relation>
|
||||
</osm>
|
||||
doc_str = <<OSM.strip_heredoc
|
||||
<osm>
|
||||
<relation changeset='#{changeset.id}'>
|
||||
<member ref='#{node1.id}' type='node' role='forward'/>
|
||||
<member ref='#{node2.id}' type='node' role='forward'/>
|
||||
<member ref='#{node1.id}' type='node' role='forward'/>
|
||||
<member ref='#{node2.id}' type='node' role='forward'/>
|
||||
</relation>
|
||||
</osm>
|
||||
OSM
|
||||
doc = XML::Parser.string(doc_str).parse
|
||||
|
||||
|
|
@ -844,15 +844,15 @@ OSM
|
|||
node3 = create(:node)
|
||||
node4 = create(:node)
|
||||
|
||||
doc_str = <<OSM
|
||||
<osm>
|
||||
<relation changeset='#{changeset.id}'>
|
||||
<member ref='#{node1.id}' type='node' role='forward'/>
|
||||
<member ref='#{node4.id}' type='node' role='forward'/>
|
||||
<member ref='#{node3.id}' type='node' role='forward'/>
|
||||
<member ref='#{node2.id}' type='node' role='forward'/>
|
||||
</relation>
|
||||
</osm>
|
||||
doc_str = <<OSM.strip_heredoc
|
||||
<osm>
|
||||
<relation changeset='#{changeset.id}'>
|
||||
<member ref='#{node1.id}' type='node' role='forward'/>
|
||||
<member ref='#{node4.id}' type='node' role='forward'/>
|
||||
<member ref='#{node3.id}' type='node' role='forward'/>
|
||||
<member ref='#{node2.id}' type='node' role='forward'/>
|
||||
</relation>
|
||||
</osm>
|
||||
OSM
|
||||
doc = XML::Parser.string(doc_str).parse
|
||||
basic_authorization(user.email, "test")
|
||||
|
|
|
|||
|
|
@ -539,7 +539,7 @@ class TraceControllerTest < ActionController::TestCase
|
|||
trace = Trace.order(:id => :desc).first
|
||||
assert_equal "a.gpx", trace.name
|
||||
assert_equal "New Trace", trace.description
|
||||
assert_equal %w(new trace), trace.tags.order(:tag).collect(&:tag)
|
||||
assert_equal %w[new trace], trace.tags.order(:tag).collect(&:tag)
|
||||
assert_equal "trackable", trace.visibility
|
||||
assert_equal false, trace.inserted
|
||||
assert_equal File.new(fixture).read, File.new(trace.trace_name).read
|
||||
|
|
@ -817,7 +817,7 @@ class TraceControllerTest < ActionController::TestCase
|
|||
trace = Trace.find(response.body.to_i)
|
||||
assert_equal "a.gpx", trace.name
|
||||
assert_equal "New Trace", trace.description
|
||||
assert_equal %w(new trace), trace.tags.order(:tag).collect(&:tag)
|
||||
assert_equal %w[new trace], trace.tags.order(:tag).collect(&:tag)
|
||||
assert_equal "trackable", trace.visibility
|
||||
assert_equal false, trace.inserted
|
||||
assert_equal File.new(fixture).read, File.new(trace.trace_name).read
|
||||
|
|
@ -835,7 +835,7 @@ class TraceControllerTest < ActionController::TestCase
|
|||
trace = Trace.find(response.body.to_i)
|
||||
assert_equal "a.gpx", trace.name
|
||||
assert_equal "New Trace", trace.description
|
||||
assert_equal %w(new trace), trace.tags.order(:tag).collect(&:tag)
|
||||
assert_equal %w[new trace], trace.tags.order(:tag).collect(&:tag)
|
||||
assert_equal "public", trace.visibility
|
||||
assert_equal false, trace.inserted
|
||||
assert_equal File.new(fixture).read, File.new(trace.trace_name).read
|
||||
|
|
@ -854,7 +854,7 @@ class TraceControllerTest < ActionController::TestCase
|
|||
trace = Trace.find(response.body.to_i)
|
||||
assert_equal "a.gpx", trace.name
|
||||
assert_equal "New Trace", trace.description
|
||||
assert_equal %w(new trace), trace.tags.order(:tag).collect(&:tag)
|
||||
assert_equal %w[new trace], trace.tags.order(:tag).collect(&:tag)
|
||||
assert_equal "private", trace.visibility
|
||||
assert_equal false, trace.inserted
|
||||
assert_equal File.new(fixture).read, File.new(trace.trace_name).read
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue