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

Added a query method for querying bounding boxes, times and users of changesets. Needs (much) more testing.

Browse source
This commit is contained in:
Matt Amos 2008-11-07 18:24:34 +00:00
parent 748a7a0a03
commit b875d14b7c
6 changed files with 148 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

17
test/fixtures/changesets.yml vendored
View file

@ -1,9 +1,17 @@
# FIXME! all of these changesets need their bounding boxes set correctly!
#
<% SCALE = 10000000 unless defined?(SCALE) %>
# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
normal_user_first_change:
id: 1
user_id: 1
created_at: "2007-01-01 00:00:00"
open: true
min_lon: <%= 1 * SCALE %>
min_lat: <%= 1 * SCALE %>
max_lon: <%= 5 * SCALE %>
max_lat: <%= 5 * SCALE %>
second_user_first_change:
id: 2
@ -22,3 +30,12 @@ normal_user_version_change:
user_id: 1
created_at: "2008-01-01 00:00:00"
open: true
# changeset to contain all the invalid stuff that is in the
# fixtures (nodes outside the world, etc...)
invalid_changeset:
id: 5
user_id: 0
created_at: "2008-01-01 00:00:00"
open: false

18
test/fixtures/current_nodes.yml vendored
View file

@ -55,7 +55,7 @@ node_too_far_north:
id: 6
latitude: <%= 90.01*SCALE %>
longitude: <%= 6*SCALE %>
changeset_id: 1
changeset_id: 5
visible: true
version: 1
tile: <%= QuadTile.tile_for_point(90.01,6) %>
@ -65,7 +65,7 @@ node_north_limit:
id: 11
latitude: <%= 90*SCALE %>
longitude: <%= 11*SCALE %>
changeset_id: 1
changeset_id: 5
visible: true
version: 1
tile: <%= QuadTile.tile_for_point(90,11) %>
@ -75,7 +75,7 @@ node_too_far_south:
id: 7
latitude: <%= -90.01*SCALE %>
longitude: <%= 7*SCALE %>
changeset_id: 1
changeset_id: 5
visible: true
version: 1
tile: <%= QuadTile.tile_for_point(-90.01,7) %>
@ -85,7 +85,7 @@ node_south_limit:
id: 12
latitude: <%= -90*SCALE %>
longitude: <%= 12*SCALE %>
changeset_id: 1
changeset_id: 5
visible: true
version: 1
tile: <%= QuadTile.tile_for_point(-90,12) %>
@ -95,7 +95,7 @@ node_too_far_west:
id: 8
latitude: <%= 8*SCALE %>
longitude: <%= -180.01*SCALE %>
changeset_id: 1
changeset_id: 5
visible: true
version: 1
tile: <%= QuadTile.tile_for_point(8,-180.01) %>
@ -105,7 +105,7 @@ node_west_limit:
id: 13
latitude: <%= 13*SCALE %>
longitude: <%= -180*SCALE %>
changeset_id: 1
changeset_id: 5
visible: true
version: 1
tile: <%= QuadTile.tile_for_point(13,-180) %>
@ -115,7 +115,7 @@ node_too_far_east:
id: 9
latitude: <%= 9*SCALE %>
longitude: <%= 180.01*SCALE %>
changeset_id: 1
changeset_id: 5
visible: true
version: 1
tile: <%= QuadTile.tile_for_point(9,180.01) %>
@ -125,7 +125,7 @@ node_east_limit:
id: 14
latitude: <%= 14*SCALE %>
longitude: <%= 180*SCALE %>
changeset_id: 1
changeset_id: 5
visible: true
version: 1
tile: <%= QuadTile.tile_for_point(14,180) %>
@ -135,7 +135,7 @@ node_totally_wrong:
id: 10
latitude: <%= 200*SCALE %>
longitude: <%= 200*SCALE %>
changeset_id: 1
changeset_id: 5
visible: true
version: 1
tile: <%= QuadTile.tile_for_point(200,200) %>

18
test/fixtures/nodes.yml vendored
View file

@ -55,7 +55,7 @@ node_too_far_north:
id: 6
latitude: <%= 90.01*SCALE %>
longitude: <%= 6*SCALE %>
changeset_id: 1
changeset_id: 5
visible: true
version: 1
tile: <%= QuadTile.tile_for_point(90.01,6) %>
@ -65,7 +65,7 @@ node_north_limit:
id: 11
latitude: <%= 90*SCALE %>
longitude: <%= 11*SCALE %>
changeset_id: 1
changeset_id: 5
visible: true
version: 1
tile: <%= QuadTile.tile_for_point(90,11) %>
@ -75,7 +75,7 @@ node_too_far_south:
id: 7
latitude: <%= -90.01*SCALE %>
longitude: <%= 7*SCALE %>
changeset_id: 1
changeset_id: 5
visible: true
version: 1
tile: <%= QuadTile.tile_for_point(-90.01,7) %>
@ -85,7 +85,7 @@ node_south_limit:
id: 12
latitude: <%= -90*SCALE %>
longitude: <%= 12*SCALE %>
changeset_id: 1
changeset_id: 5
visible: true
version: 1
tile: <%= QuadTile.tile_for_point(-90,12) %>
@ -95,7 +95,7 @@ node_too_far_west:
id: 8
latitude: <%= 8*SCALE %>
longitude: <%= -180.01*SCALE %>
changeset_id: 1
changeset_id: 5
visible: true
version: 1
tile: <%= QuadTile.tile_for_point(8,-180.01) %>
@ -105,7 +105,7 @@ node_west_limit:
id: 13
latitude: <%= 13*SCALE %>
longitude: <%= -180*SCALE %>
changeset_id: 1
changeset_id: 5
visible: true
version: 1
tile: <%= QuadTile.tile_for_point(13,-180) %>
@ -115,7 +115,7 @@ node_too_far_east:
id: 9
latitude: <%= 9*SCALE %>
longitude: <%= 180.01*SCALE %>
changeset_id: 1
changeset_id: 5
visible: true
version: 1
tile: <%= QuadTile.tile_for_point(9,180.01) %>
@ -125,7 +125,7 @@ node_east_limit:
id: 14
latitude: <%= 14*SCALE %>
longitude: <%= 180*SCALE %>
changeset_id: 1
changeset_id: 5
visible: true
version: 1
tile: <%= QuadTile.tile_for_point(14,180) %>
@ -135,7 +135,7 @@ node_totally_wrong:
id: 10
latitude: <%= 200*SCALE %>
longitude: <%= 200*SCALE %>
changeset_id: 1
changeset_id: 5
visible: true
version: 1
tile: <%= QuadTile.tile_for_point(200,200) %>

8
test/functional/changeset_controller_test.rb
View file

@ -576,6 +576,14 @@ EOF
check_after_include(changeset_id, -2, 5, [-2, -1, 4, 5])
end
##
# check searching for changesets by bbox
def test_changeset_by_bbox
get :query, :bbox => "-10,-10, 10, 10"
assert_response :success, "can't get changesets in bbox"
# FIXME: write the actual test bit after fixing the fixtures!
end
#------------------------------------------------------------
# utility functions
#------------------------------------------------------------