X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/094855be22a06ceeef5366bdf103b303deb38a12..8ae5d94b2f16d6f2cf1739e19ebc3793a18a0a4a:/app/models/changeset.rb

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 803cbb52f..3f6df27f6 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -19,7 +19,8 @@ class Changeset < ActiveRecord::Base
   validates_numericality_of :min_lat, :max_lat, :min_lon, :max_lat, :allow_nil => true, :integer_only => true
   validates_numericality_of :user_id,  :integer_only => true
   validates_numericality_of :num_changes, :integer_only => true, :greater_than_or_equal_to => 0
-  validates_associated :user
+
+  before_save :update_closed_at
 
   # over-expansion factor to use when updating the bounding box
   EXPAND = 0.1
@@ -116,16 +117,21 @@ class Changeset < ActiveRecord::Base
     # nils, just use the bounding box update to write over them.
     @bbox = bbox.zip(array).collect { |a, b| a.nil? ? b : a }
 
-    # FIXME - this looks nasty and violates DRY... is there any prettier
-    # way to do this?
-    @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.
-    self.min_lon, self.min_lat, self.max_lon, self.max_lat = @bbox
+    # only try to update the bbox if there is a value for every coordinate
+    # which there will be from the previous line as long as both array and
+    # bbox are all non-nil. 
+    if has_valid_bbox? and array.all?
+      # FIXME - this looks nasty and violates DRY... is there any prettier
+      # way to do this?
+      @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.
+      self.min_lon, self.min_lat, self.max_lon, self.max_lat = @bbox
+    end
   end
 
   ##
@@ -187,7 +193,7 @@ class Changeset < ActiveRecord::Base
   # set the auto-close time to be one hour in the future unless
   # that would make it more than 24h long, in which case clip to
   # 24h, as this has been decided is a reasonable time limit.
-  def before_save
+  def update_closed_at
     if self.is_open?
       if (closed_at - created_at) > (MAX_TIME_OPEN - IDLE_TIMEOUT)
         self.closed_at = created_at + MAX_TIME_OPEN