def setup
super
- @badbigbbox = %w(-0.1,-0.1,1.1,1.1 10,10,11,11)
- @badmalformedbbox = %w(-0.1 hello
+ @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)
+ @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
# -------------------------------------
def test_map
- node = current_nodes(:used_node_1)
+ node = create(:node, :lat => 7, :lon => 7)
+ tag = create(:node_tag, :node => node)
+ way1 = create(:way_node, :node => node).way
+ way2 = create(:way_node, :node => node).way
+ relation = create(:relation_member, :member => node).relation
+
# Need to split the min/max lat/lon out into their own variables here
# so that we can test they are returned later.
minlon = node.lon - 0.1
assert_response :success, "Expected scucess with the map call"
assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do
assert_select "bounds[minlon='#{minlon}'][minlat='#{minlat}'][maxlon='#{maxlon}'][maxlat='#{maxlat}']", :count => 1
- assert_select "node[id='#{node.id}'][lat='#{node.lat}'][lon='#{node.lon}'][version='#{node.version}'][changeset='#{node.changeset_id}'][visible='#{node.visible}'][timestamp='#{node.timestamp.xmlschema}']", :count => 1 do
+ assert_select "node[id='#{node.id}'][lat='#{format('%.7f', node.lat)}'][lon='#{format('%.7f', node.lon)}'][version='#{node.version}'][changeset='#{node.changeset_id}'][visible='#{node.visible}'][timestamp='#{node.timestamp.xmlschema}']", :count => 1 do
# This should really be more generic
- assert_select "tag[k='test'][v='yes']"
+ assert_select "tag[k='#{tag.k}'][v='#{tag.v}']"
end
assert_select "way", :count => 2
- assert_select "way[id='1']", :count => 1
- assert_select "way[id='3']", :count => 1
+ assert_select "way[id='#{way1.id}']", :count => 1
+ assert_select "way[id='#{way2.id}']", :count => 1
assert_select "relation", :count => 1
- assert_select "relation[id='1']", :count => 1
+ assert_select "relation[id='#{relation.id}']", :count => 1
end
end
# This differs from the above test in that we are making the bbox exactly
# the same as the node we are looking at
def test_map_inclusive
- node = current_nodes(:used_node_1)
+ node = create(:node, :lat => 7, :lon => 7)
+ tag = create(:node_tag, :node => node)
+ way1 = create(:way_node, :node => node).way
+ way2 = create(:way_node, :node => node).way
+ relation = create(:relation_member, :member => node).relation
+
bbox = "#{node.lon},#{node.lat},#{node.lon},#{node.lat}"
get :map, :bbox => bbox
assert_response :success, "The map call should have succeeded"
assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do
assert_select "bounds[minlon='#{node.lon}'][minlat='#{node.lat}'][maxlon='#{node.lon}'][maxlat='#{node.lat}']", :count => 1
- assert_select "node[id='#{node.id}'][lat='#{node.lat}'][lon='#{node.lon}'][version='#{node.version}'][changeset='#{node.changeset_id}'][visible='#{node.visible}'][timestamp='#{node.timestamp.xmlschema}']", :count => 1 do
+ assert_select "node[id='#{node.id}'][lat='#{format('%.7f', node.lat)}'][lon='#{format('%.7f', node.lon)}'][version='#{node.version}'][changeset='#{node.changeset_id}'][visible='#{node.visible}'][timestamp='#{node.timestamp.xmlschema}']", :count => 1 do
# This should really be more generic
- assert_select "tag[k='test'][v='yes']"
+ assert_select "tag[k='#{tag.k}'][v='#{tag.v}']"
end
assert_select "way", :count => 2
- assert_select "way[id='1']", :count => 1
- assert_select "way[id='3']", :count => 1
+ assert_select "way[id='#{way1.id}']", :count => 1
+ assert_select "way[id='#{way2.id}']", :count => 1
assert_select "relation", :count => 1
- assert_select "relation[id='1']", :count => 1
+ assert_select "relation[id='#{relation.id}']", :count => 1
end
end
def test_map_complete_way
- node = current_nodes(:used_node_2)
+ node = create(:node, :lat => 7, :lon => 7)
+ # create a couple of nodes well outside of the bbox
+ node2 = create(:node, :lat => 45, :lon => 45)
+ node3 = create(:node, :lat => 10, :lon => 10)
+ way1 = create(:way_node, :node => node).way
+ create(:way_node, :way => way1, :node => node2, :sequence_id => 2)
+ way2 = create(:way_node, :node => node).way
+ create(:way_node, :way => way2, :node => node3, :sequence_id => 2)
+ relation = create(:relation_member, :member => way1).relation
+
bbox = "#{node.lon},#{node.lat},#{node.lon},#{node.lat}"
get :map, :bbox => bbox
assert_response :success, "The map call should have succeeded"
assert_select "osm[version='#{API_VERSION}'][generator='#{GENERATOR}']", :count => 1 do
assert_select "bounds[minlon='#{node.lon}'][minlat='#{node.lat}'][maxlon='#{node.lon}'][maxlat='#{node.lat}']", :count => 1
assert_select "node", :count => 3
- assert_select "node[id='4']", :count => 1
- assert_select "node[id='11']", :count => 1
- assert_select "node[id='15']", :count => 1
+ assert_select "node[id='#{node.id}']", :count => 1
+ assert_select "node[id='#{node2.id}']", :count => 1
+ assert_select "node[id='#{node3.id}']", :count => 1
assert_select "way", :count => 2
- assert_select "way[id='5']", :count => 1
- assert_select "way[id='7']", :count => 1
+ assert_select "way[id='#{way1.id}']", :count => 1
+ assert_select "way[id='#{way2.id}']", :count => 1
assert_select "relation", :count => 1
- assert_select "relation[id='8']", :count => 1
+ assert_select "relation[id='#{relation.id}']", :count => 1
end
end
end
def test_tracepoints
- point = gpx_files(:public_trace_file)
+ point = create(:trace, :visibility => "public", :latitude => 1, :longitude => 1) do |trace|
+ create(:tracepoint, :trace => trace, :latitude => 1 * GeoRecord::SCALE, :longitude => 1 * GeoRecord::SCALE)
+ end
minlon = point.longitude - 0.001
minlat = point.latitude - 0.001
maxlon = point.longitude + 0.001
end
def test_tracepoints_trackable
- point = gpx_files(:trackable_trace_file)
+ point = create(:trace, :visibility => "trackable", :latitude => 51.51, :longitude => -0.14) do |trace|
+ create(:tracepoint, :trace => trace, :trackid => 1, :latitude => (51.510 * GeoRecord::SCALE).to_i, :longitude => (-0.140 * GeoRecord::SCALE).to_i)
+ create(:tracepoint, :trace => trace, :trackid => 2, :latitude => (51.511 * GeoRecord::SCALE).to_i, :longitude => (-0.141 * GeoRecord::SCALE).to_i)
+ end
minlon = point.longitude - 0.002
minlat = point.latitude - 0.002
maxlon = point.longitude + 0.002
end
def test_tracepoints_identifiable
- point = gpx_files(:identifiable_trace_file)
+ point = create(:trace, :visibility => "identifiable", :latitude => 51.512, :longitude => 0.142) do |trace|
+ create(:tracepoint, :trace => trace, :latitude => (51.512 * GeoRecord::SCALE).to_i, :longitude => (0.142 * GeoRecord::SCALE).to_i)
+ end
minlon = point.longitude - 0.002
minlat = point.latitude - 0.002
maxlon = point.longitude + 0.002
assert_select "api", :count => 1 do
assert_select "version[minimum='#{API_VERSION}'][maximum='#{API_VERSION}']", :count => 1
assert_select "area[maximum='#{MAX_REQUEST_AREA}']", :count => 1
+ assert_select "note_area[maximum='#{MAX_NOTE_REQUEST_AREA}']", :count => 1
assert_select "tracepoints[per_page='#{TRACEPOINTS_PER_PAGE}']", :count => 1
assert_select "changesets[maximum_elements='#{Changeset::MAX_ELEMENTS}']", :count => 1
assert_select "status[database='online']", :count => 1
end
def test_permissions_basic_auth
- basic_authorization(users(:normal_user).email, "test")
+ basic_authorization(create(:user).email, "test")
get :permissions
assert_response :success
assert_select "osm > permissions", :count => 1 do
projects / rails.git / blobdiff