Moved a bunch of time functions into UTC. Fixes bugs which we only see for 4 hours...

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

diff --git a/app/models/way.rb b/app/models/way.rb
index dbc1197a9e039ec003b1e623e92bdf97e9c1faf2..6e4f30d81751ef6ea01bec7de6370cd7ce95664a 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -33,7 +33,7 @@ class Way < ActiveRecord::Base
       doc.find('//osm/way').each do |pt|
         return Way.from_xml_node(pt, create)
       end
       doc.find('//osm/way').each do |pt|
         return Way.from_xml_node(pt, create)
       end

-    rescue LibXML::XML::Error => ex
+    rescue LibXML::XML::Error, ArgumentError => ex

       raise OSM::APIBadXMLError.new("way", xml, ex.message)
     end
   end
       raise OSM::APIBadXMLError.new("way", xml, ex.message)
     end
   end


@@ -51,7 +51,7 @@ class Way < ActiveRecord::Base
 
     # This next section isn't required for the create, update, or delete of ways
     if create
 
     # This next section isn't required for the create, update, or delete of ways
     if create

-      way.timestamp = Time.now
+      way.timestamp = Time.now.getutc

       way.visible = true
     else
       if pt['timestamp']
       way.visible = true
     else
       if pt['timestamp']


@@ -202,7 +202,9 @@ class Way < ActiveRecord::Base
     if !new_way.preconditions_ok?
       raise OSM::APIPreconditionFailedError.new
     end
     if !new_way.preconditions_ok?
       raise OSM::APIPreconditionFailedError.new
     end

+

     self.changeset_id = new_way.changeset_id
     self.changeset_id = new_way.changeset_id

+    self.changeset = new_way.changeset

     self.tags = new_way.tags
     self.nds = new_way.nds
     self.visible = true
     self.tags = new_way.tags
     self.nds = new_way.nds
     self.visible = true


@@ -248,6 +250,8 @@ class Way < ActiveRecord::Base
         raise OSM::APIPreconditionFailedError.new("You need to make sure that this way is not a member of a relation.")
       else
         self.changeset_id = new_way.changeset_id
         raise OSM::APIPreconditionFailedError.new("You need to make sure that this way is not a member of a relation.")
       else
         self.changeset_id = new_way.changeset_id

+        self.changeset = new_way.changeset
+

         self.tags = []
         self.nds = []
         self.visible = false
         self.tags = []
         self.nds = []
         self.visible = false


@@ -292,13 +296,14 @@ class Way < ActiveRecord::Base
   private
   
   def save_with_history!
   private
   
   def save_with_history!

-    t = Time.now
+    t = Time.now.getutc

 
 

-    # update the bounding box, but don't save it as the controller knows the 
-    # lifetime of the change better. note that this has to be done both before 
+    # update the bounding box, note that this has to be done both before 

     # and after the save, so that nodes from both versions are included in the 
     # and after the save, so that nodes from both versions are included in the 

-    # bbox.
-    changeset.update_bbox!(bbox) unless nodes.empty?
+    # bbox. we use a copy of the changeset so that it isn't reloaded
+    # later in the save.
+    cs = self.changeset
+    cs.update_bbox!(bbox) unless nodes.empty?

 
     Way.transaction do
       self.version += 1
 
     Way.transaction do
       self.version += 1


@@ -330,14 +335,18 @@ class Way < ActiveRecord::Base
       old_way.timestamp = t
       old_way.save_with_dependencies!
 
       old_way.timestamp = t
       old_way.save_with_dependencies!
 

+      # reload the way so that the nodes array points to the correct
+      # new set of nodes.
+      self.reload
+

       # update and commit the bounding box, now that way nodes 
       # have been updated and we're in a transaction.
       # update and commit the bounding box, now that way nodes 
       # have been updated and we're in a transaction.

-      changeset.update_bbox!(bbox) unless nodes.empty?
+      cs.update_bbox!(bbox) unless nodes.empty?

 
       # tell the changeset we updated one element only
 
       # tell the changeset we updated one element only

-      changeset.add_changes! 1
+      cs.add_changes! 1

 
 

-      changeset.save!
+      cs.save!

     end
   end
 
     end
   end