X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bbbf2569865bad3198c05587083e670bdba8b592..6e64d5474ffe6fde6a31f642c008c152a99c60a2:/app/models/changeset.rb?ds=sidebyside

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 9dc60de48..5c961a064 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -17,7 +17,7 @@ class Changeset < ActiveRecord::Base
   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 :user_id,  :integer_only => true
   validates_numericality_of :num_changes, :integer_only => true, :greater_than_or_equal_to => 0
   validates_associated :user
 
@@ -27,15 +27,11 @@ class Changeset < ActiveRecord::Base
   # maximum number of elements allowed in a changeset
   MAX_ELEMENTS = 50000
 
-  # maximum time a changeset is allowed to be open for (note that this
-  # is in days - so one hour is Rational(1,24)).
-  MAX_TIME_OPEN = 1
+  # maximum time a changeset is allowed to be open for.
+  MAX_TIME_OPEN = 1.day
 
-  # 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)
+  # idle timeout increment, one hour seems reasonable.
+  IDLE_TIMEOUT = 1.hour
 
   # Use a method like this, so that we can easily change how we
   # determine whether a changeset is open, without breaking code in at 
@@ -46,27 +42,28 @@ class Changeset < ActiveRecord::Base
     # note that this may not be a hard limit - due to timing changes and
     # concurrency it is possible that some changesets may be slightly 
     # longer than strictly allowed or have slightly more changes in them.
-    return ((closed_at > DateTime.now) and (num_changes <= MAX_ELEMENTS))
+    return ((closed_at > Time.now.getutc) and (num_changes <= MAX_ELEMENTS))
   end
 
   def set_closed_time_now
-    self.closed_at = DateTime.now
+    if is_open?
+      self.closed_at = Time.now.getutc
+    end
   end
   
   def self.from_xml(xml, create=false)
     begin
-      p = XML::Parser.new
-      p.string = xml
+      p = XML::Parser.string(xml)
       doc = p.parse
 
       cs = Changeset.new
 
       doc.find('//osm/changeset').each do |pt|
         if create
-          cs.created_at = Time.now
+          cs.created_at = Time.now.getutc
           # initial close time is 1h ahead, but will be increased on each
           # modification.
-          cs.closed_at = Time.now + IDLE_TIMEOUT
+          cs.closed_at = cs.created_at + IDLE_TIMEOUT
           # initially we have no changes in a changeset
           cs.num_changes = 0
         end
@@ -88,6 +85,20 @@ class Changeset < ActiveRecord::Base
   def bbox
     @bbox ||= [ min_lon, min_lat, max_lon, max_lat ]
   end
+  
+  def has_valid_bbox?
+    not bbox.include? nil
+  end
+  
+  ##
+  # returns area of the changset bbox as a rough comparitive quantity for use of changset displays
+  def area
+     if has_valid_bbox?
+	     (max_lon - min_lon) * (max_lat - min_lat)
+     else
+	     0
+     end
+  end
 
   ##
   # expand the bounding box to include the given bounding box. also, 
@@ -143,19 +154,9 @@ class Changeset < ActiveRecord::Base
   end
 
   def save_with_tags!
-    t = Time.now
-
     # do the changeset update and the changeset tags update in the
     # same transaction to ensure consistency.
     Changeset.transaction do
-      # 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.
-      if (closed_at - created_at) > (MAX_TIME_OPEN - IDLE_TIMEOUT)
-        self.closed_at = created_at + MAX_TIME_OPEN
-      else
-        self.closed_at = DateTime.now + IDLE_TIMEOUT
-      end
       self.save!
 
       tags = self.tags
@@ -170,6 +171,20 @@ class Changeset < ActiveRecord::Base
       end
     end
   end
+
+  ##
+  # 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
+    if self.is_open?
+      if (closed_at - created_at) > (MAX_TIME_OPEN - IDLE_TIMEOUT)
+        self.closed_at = created_at + MAX_TIME_OPEN
+      else
+        self.closed_at = Time.now.getutc + IDLE_TIMEOUT
+      end
+    end
+  end
   
   def to_xml
     doc = OSM::API.new.get_xml_doc
@@ -224,7 +239,7 @@ class Changeset < ActiveRecord::Base
   def update_from(other, user)
     # ensure that only the user who opened the changeset may modify it.
     unless user.id == self.user_id 
-      raise OSM::APIUserChangesetMismatchError 
+      raise OSM::APIUserChangesetMismatchError.new
     end
     
     # can't change a closed changeset