Fix for correct boolean handling in query.

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

diff --git a/app/models/way.rb b/app/models/way.rb
index 92b69ed7dc15c472c6779c5d5673736cdc65c89d..94a6fa7548faf23299219d5e7f9d5aed72e82847 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -27,14 +27,13 @@ class Way < 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/way').each do |pt|
         return Way.from_xml_node(pt, create)
       end
       doc = p.parse
 
       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


@@ -203,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


@@ -228,7 +229,7 @@ class Way < ActiveRecord::Base
     self.nds.each do |n|
       node = Node.find(:first, :conditions => ["id = ?", n])
       unless node and node.visible
     self.nds.each do |n|
       node = Node.find(:first, :conditions => ["id = ?", n])
       unless node and node.visible

-        return false
+        raise OSM::APIPreconditionFailedError.new("The node with id #{n} either does not exist, or is not visible")

       end
     end
     return true
       end
     end
     return true


@@ -249,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


@@ -257,30 +260,6 @@ class Way < ActiveRecord::Base
     end
   end
 
     end
   end
 

-  # delete a way and its nodes that aren't part of other ways, with history
-
-  # FIXME: merge the potlatch code to delete the relations
-  #        and refactor to use delete_with_history!
-  # This really needs the ids and versions of the nodes/relations to be passed in too
-  # so that we can do the version checking before the delete
-  def delete_with_relations_and_nodes_and_history(changeset_id)
-    # delete the nodes not used by other ways
-    self.unshared_node_ids.each do |node_id|
-      n = Node.find(node_id)
-      n.changeset_id = changeset_id
-      n.visible = false
-      # FIXME next line is bad
-      n.save_with_history!
-    end
-    
-    self.changeset_id = changeset_id
-    self.tags = []
-    self.nds = []
-    self.visible = false
-    # FIXME next line is bad
-    self.save_with_history!
-  end
-

   # Find nodes that belong to this way only
   def unshared_node_ids
     node_ids = self.nodes.collect { |node| node.id }
   # Find nodes that belong to this way only
   def unshared_node_ids
     node_ids = self.nodes.collect { |node| node.id }


@@ -319,11 +298,12 @@ class Way < ActiveRecord::Base
   def save_with_history!
     t = Time.now
 
   def save_with_history!
     t = Time.now
 

-    # 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


@@ -355,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