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

Remove BBOX expansion performance optimization

Browse source 
Closes #1749
Fixes #1742
This commit is contained in:
mmd-osm 2018-02-13 23:07:30 +01:00 • committed by Tom Hughes
parent 93d94bb1f9
commit cea403dce0
2 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/models/changeset.rb
View file

@ -55,9 +55,6 @@ class Changeset < ActiveRecord::Base
before_save :update_closed_at before_save :update_closed_at
# over-expansion factor to use when updating the bounding box
EXPAND = 0.1
# maximum number of elements allowed in a changeset # maximum number of elements allowed in a changeset
MAX_ELEMENTS = 10000 MAX_ELEMENTS = 10000
@ -127,12 +124,9 @@ class Changeset < ActiveRecord::Base
end end
## ##
# expand the bounding box to include the given bounding box. also, # expand the bounding box to include the given bounding box.
# expand a little bit more in the direction of the expansion, so that
# further expansions may be unnecessary. this is an optimisation
# suggested on the wiki page by kleptog.
def update_bbox!(bbox_update) def update_bbox!(bbox_update)
bbox.expand!(bbox_update, EXPAND) bbox.expand!(bbox_update)
# update active record. rails 2.1's dirty handling should take care of # update active record. rails 2.1's dirty handling should take care of
# whether this object needs saving or not. # whether this object needs saving or not.
@ -141,8 +135,7 @@ class Changeset < ActiveRecord::Base
## ##
# the number of elements is also passed in so that we can ensure that # the number of elements is also passed in so that we can ensure that
# a single changeset doesn't contain too many elements. this, of course, # a single changeset doesn't contain too many elements.
# destroys the optimisation described in the bbox method above.
def add_changes!(elements) def add_changes!(elements)
self.num_changes += elements self.num_changes += elements
end end

8
test/controllers/changeset_controller_test.rb
View file

@ -581,7 +581,6 @@ CHANGESET
changeset_id = @response.body.to_i changeset_id = @response.body.to_i
# upload some widely-spaced nodes, spiralling positive and negative to cause # upload some widely-spaced nodes, spiralling positive and negative to cause
# largest bbox over-expansion possible.
diff = <<CHANGESET.strip_heredoc diff = <<CHANGESET.strip_heredoc
<osmChange> <osmChange>
<create> <create>
@ -619,7 +618,7 @@ CHANGESET
assert cs.min_lon >= -180 * GeoRecord::SCALE, "Minimum longitude (#{cs.min_lon / GeoRecord::SCALE}) should be >= -180 to be valid." assert cs.min_lon >= -180 * GeoRecord::SCALE, "Minimum longitude (#{cs.min_lon / GeoRecord::SCALE}) should be >= -180 to be valid."
assert cs.max_lon <= 180 * GeoRecord::SCALE, "Maximum longitude (#{cs.max_lon / GeoRecord::SCALE}) should be <= 180 to be valid." assert cs.max_lon <= 180 * GeoRecord::SCALE, "Maximum longitude (#{cs.max_lon / GeoRecord::SCALE}) should be <= 180 to be valid."
assert cs.min_lat >= -90 * GeoRecord::SCALE, "Minimum latitude (#{cs.min_lat / GeoRecord::SCALE}) should be >= -90 to be valid." assert cs.min_lat >= -90 * GeoRecord::SCALE, "Minimum latitude (#{cs.min_lat / GeoRecord::SCALE}) should be >= -90 to be valid."
assert cs.max_lat >= 90 * GeoRecord::SCALE, "Maximum latitude (#{cs.max_lat / GeoRecord::SCALE}) should be <= 90 to be valid." assert cs.max_lat <= 90 * GeoRecord::SCALE, "Maximum latitude (#{cs.max_lat / GeoRecord::SCALE}) should be <= 90 to be valid."
end end
## ##
@ -1568,11 +1567,10 @@ CHANGESET
# get the bounding box back from the changeset # get the bounding box back from the changeset
get :read, :params => { :id => changeset_id } get :read, :params => { :id => changeset_id }
assert_response :success, "Couldn't read back changeset for the third time." assert_response :success, "Couldn't read back changeset for the third time."
# note that the 3.1 here is because of the bbox overexpansion
assert_select "osm>changeset[min_lon='1.0000000']", 1 assert_select "osm>changeset[min_lon='1.0000000']", 1
assert_select "osm>changeset[max_lon='3.1000000']", 1 assert_select "osm>changeset[max_lon='3.0000000']", 1
assert_select "osm>changeset[min_lat='1.0000000']", 1 assert_select "osm>changeset[min_lat='1.0000000']", 1
assert_select "osm>changeset[max_lat='3.1000000']", 1 assert_select "osm>changeset[max_lat='3.0000000']", 1
end end
## ##