tweak lat lon decision logic for the edit tab. made it more similar to logic in index...

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

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 6be1061591dda7b665b20ceed5b5b81ae79e96d3..a8789bc78707029a060a7db3f2de2d50cba86846 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -27,14 +27,13 @@ class Relation < ActiveRecord::Base
 
   def self.from_xml(xml, create=false)
     begin
 
   def self.from_xml(xml, create=false)
     begin

-      p = XML::Parser.new
-      p.string = xml
+      p = XML::Parser.string(xml)

       doc = p.parse
 
       doc.find('//osm/relation').each do |pt|
         return Relation.from_xml_node(pt, create)
       end
       doc = p.parse
 
       doc.find('//osm/relation').each do |pt|
         return Relation.from_xml_node(pt, create)
       end

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

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


@@ -52,7 +51,7 @@ class Relation < ActiveRecord::Base
     # The follow block does not need to be executed because they are dealt with 
     # in create_with_history, update_from and delete_with_history
     if create
     # The follow block does not need to be executed because they are dealt with 
     # in create_with_history, update_from and delete_with_history
     if create

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

       relation.visible = true
       relation.version = 0
     else
       relation.visible = true
       relation.version = 0
     else


@@ -254,6 +253,7 @@ class Relation < ActiveRecord::Base
       raise OSM::APIPreconditionFailedError.new
     end
     self.changeset_id = new_relation.changeset_id
       raise OSM::APIPreconditionFailedError.new
     end
     self.changeset_id = new_relation.changeset_id

+    self.changeset = new_relation.changeset

     self.tags = new_relation.tags
     self.members = new_relation.members
     self.visible = true
     self.tags = new_relation.tags
     self.members = new_relation.members
     self.visible = true


@@ -334,7 +334,7 @@ class Relation < ActiveRecord::Base
       # changed then we have to monitor their before and after state.
       tags_changed = false
 
       # changed then we have to monitor their before and after state.
       tags_changed = false
 

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

       self.version += 1
       self.timestamp = t
       self.save!
       self.version += 1
       self.timestamp = t
       self.save!


@@ -373,6 +373,10 @@ class Relation < ActiveRecord::Base
         tag.id = self.id
         tag.save!
       end
         tag.id = self.id
         tag.save!
       end

+      
+      # reload, so that all of the members are accessible in their
+      # new state.
+      self.reload

 
       # same pattern as before, but this time we're collecting the
       # changed members in an array, as the bounding box updates for
 
       # same pattern as before, but this time we're collecting the
       # changed members in an array, as the bounding box updates for