X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a90be5e69a478e2b49ae676b649a78589f85a50e..d9c6758ee6184692fd4219befe13adf6dfa6e32b:/app/models/changeset.rb

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index f67d2118d..9dc60de48 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -12,8 +12,15 @@ class Changeset < ActiveRecord::Base
   has_many :old_ways
   has_many :old_relations
   
-  validates_presence_of :user_id, :created_at, :closed_at
-  
+  validates_presence_of :id, :on => :update
+  validates_presence_of :user_id, :created_at, :closed_at, :num_changes
+  validates_uniqueness_of :id
+  validates_numericality_of :id, :on => :update, :integer_only => true
+  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, :greater_than_or_equal_to => 1
+  validates_numericality_of :num_changes, :integer_only => true, :greater_than_or_equal_to => 0
+  validates_associated :user
+
   # over-expansion factor to use when updating the bounding box
   EXPAND = 0.1
 
@@ -25,6 +32,9 @@ class Changeset < ActiveRecord::Base
   MAX_TIME_OPEN = 1
 
   # idle timeout increment, one hour as a rational number of days.
+  # NOTE: DO NOT CHANGE THIS TO 1.hour! when this was done the idle
+  # timeout changed to 1 second, which meant all changesets closed 
+  # almost immediately.
   IDLE_TIMEOUT = Rational(1,24)
 
   # Use a method like this, so that we can easily change how we
@@ -39,6 +49,10 @@ class Changeset < ActiveRecord::Base
     return ((closed_at > DateTime.now) and (num_changes <= MAX_ELEMENTS))
   end
 
+  def set_closed_time_now
+    self.closed_at = DateTime.now
+  end
+  
   def self.from_xml(xml, create=false)
     begin
       p = XML::Parser.new
@@ -215,7 +229,7 @@ class Changeset < ActiveRecord::Base
     
     # can't change a closed changeset
     unless is_open?
-      raise OSM::APIChangesetAlreadyClosedError
+      raise OSM::APIChangesetAlreadyClosedError.new(self)
     end
 
     # copy the other's tags