Merged 17073:17076 from trunk.

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 5c961a06470c1999d74df7565707559956811135..4efd4f9e7f755e0655d4ee89f55bfcf989e6ed62 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -112,10 +112,10 @@ class Changeset < ActiveRecord::Base
 
     # FIXME - this looks nasty and violates DRY... is there any prettier 
     # way to do this? 
-    @bbox[0] = array[0] + EXPAND * (@bbox[0] - @bbox[2]) if array[0] < @bbox[0]
-    @bbox[1] = array[1] + EXPAND * (@bbox[1] - @bbox[3]) if array[1] < @bbox[1]
-    @bbox[2] = array[2] + EXPAND * (@bbox[2] - @bbox[0]) if array[2] > @bbox[2]
-    @bbox[3] = array[3] + EXPAND * (@bbox[3] - @bbox[1]) if array[3] > @bbox[3]
+    @bbox[0] = [-180 * GeoRecord::SCALE, array[0] + EXPAND * (@bbox[0] - @bbox[2])].max if array[0] < @bbox[0]
+    @bbox[1] = [ -90 * GeoRecord::SCALE, array[1] + EXPAND * (@bbox[1] - @bbox[3])].max if array[1] < @bbox[1]
+    @bbox[2] = [ 180 * GeoRecord::SCALE, array[2] + EXPAND * (@bbox[2] - @bbox[0])].min if array[2] > @bbox[2]
+    @bbox[3] = [  90 * GeoRecord::SCALE, array[3] + EXPAND * (@bbox[3] - @bbox[1])].min if array[3] > @bbox[3]
 
     # update active record. rails 2.1's dirty handling should take care of
     # whether this object needs saving or not.

diff --git a/test/functional/changeset_controller_test.rb b/test/functional/changeset_controller_test.rb
index a840dd2338e8b85b9b8fff30222063705c02c6e9..76ec0866adcf9899df439126009147ef95b583cd 100644 (file)
--- a/test/functional/changeset_controller_test.rb
+++ b/test/functional/changeset_controller_test.rb
@@ -419,6 +419,57 @@ EOF
     end
   end
 
+  def test_upload_large_changeset
+    basic_authorization users(:public_user).email, "test"
+
+    # create a changeset
+    content "<osm><changeset/></osm>"
+    put :create
+    assert_response :success, "Should be able to create a changeset: #{@response.body}"
+    changeset_id = @response.body.to_i
+    
+    # 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>
+EOF
+
+    # upload it, which used to cause an error like "PGError: ERROR: 
+    # integer out of range" (bug #2152). but shouldn't any more.
+    content diff
+    post :upload, :id => changeset_id
+    assert_response :success, 
+      "can't upload a spatially-large diff to changeset: #{@response.body}"
+
+    # check that the changeset bbox is within bounds
+    cs = Changeset.find(changeset_id)
+    assert cs.min_lon >= -180 * SCALE, "Minimum longitude (#{cs.min_lon / SCALE}) should be >= -180 to be valid."
+    assert cs.max_lon <=  180 * SCALE, "Maximum longitude (#{cs.max_lon / SCALE}) should be <= 180 to be valid."
+    assert cs.min_lat >=  -90 * SCALE, "Minimum latitude (#{cs.min_lat / SCALE}) should be >= -90 to be valid."
+    assert cs.max_lat >=   90 * SCALE, "Maximum latitude (#{cs.max_lat / SCALE}) should be <= 90 to be valid."
+  end
+
   ##
   # test that deleting stuff in a transaction doesn't bypass the checks
   # to ensure that used elements are not deleted.