Wrap 'changeset.changeset.no_comment' in italics with <i></i>. Right

[rails.git] / app / models / changeset.rb

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 31d927e9a6649094b7ff9825519bad8ccff26365..5c961a06470c1999d74df7565707559956811135 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -42,29 +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.
     # 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 > Time.now) and (num_changes <= MAX_ELEMENTS))
+    return ((closed_at > Time.now.getutc) and (num_changes <= MAX_ELEMENTS))

   end
 
   def set_closed_time_now
     if is_open?
   end
 
   def set_closed_time_now
     if is_open?

-      self.closed_at = Time.now
+      self.closed_at = Time.now.getutc

     end
   end
   
   def self.from_xml(xml, create=false)
     begin
     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
       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.
           # 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
           # initially we have no changes in a changeset
           cs.num_changes = 0
         end


@@ -86,6 +85,20 @@ class Changeset < ActiveRecord::Base
   def bbox
     @bbox ||= [ min_lon, min_lat, max_lon, max_lat ]
   end
   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, 
 
   ##
   # expand the bounding box to include the given bounding box. also, 


@@ -141,19 +154,9 @@ class Changeset < ActiveRecord::Base
   end
 
   def save_with_tags!
   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
     # 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 = Time.now + IDLE_TIMEOUT
-      end

       self.save!
 
       tags = self.tags
       self.save!
 
       tags = self.tags


@@ -168,6 +171,20 @@ class Changeset < ActiveRecord::Base
       end
     end
   end
       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
   
   def to_xml
     doc = OSM::API.new.get_xml_doc


@@ -222,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 
   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
     end
     
     # can't change a closed changeset