Adding some amf create poi tests. Minor bugfix tweaks to the amf controller

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

diff --git a/app/models/node.rb b/app/models/node.rb
index b2650b61da5db244c7b3c999c60593f4b5049f23..ce2bd5c74aa4eb6d45fdfabab0e094333db1c64d 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -79,14 +79,16 @@ class Node < ActiveRecord::Base
   def self.from_xml_node(pt, create=false)
     node = Node.new
     
+    raise OSM::APIBadXMLError.new("node", pt, "lat missing") if pt['lat'].nil?
+    raise OSM::APIBadXMLError.new("node", pt, "lon missing") if pt['lon'].nil?
     node.lat = pt['lat'].to_f
     node.lon = pt['lon'].to_f
     node.changeset_id = pt['changeset'].to_i
 
-    return nil unless node.in_world?
+    raise OSM::APIBadUserInput.new("The node is outside this world") unless node.in_world?
 
     # version must be present unless creating
-    return nil unless create or not pt['version'].nil?
+    raise OSM::APIBadXMLError.new("node", pt, "Version is required when updating") unless create or not pt['version'].nil?
     node.version = create ? 0 : pt['version'].to_i
 
     unless create
@@ -117,42 +119,12 @@ class Node < ActiveRecord::Base
   end
 
   ##
-  # the bounding box around a node
+  # the bounding box around a node, which is used for determining the changeset's
+  # bounding box
   def bbox
     [ longitude, latitude, longitude, latitude ]
   end
 
-  def save_with_history!
-    t = Time.now
-    Node.transaction do
-      self.version += 1
-      self.timestamp = t
-      self.save!
-
-      # Create a NodeTag
-      tags = self.tags
-      NodeTag.delete_all(['id = ?', self.id])
-      tags.each do |k,v|
-        tag = NodeTag.new
-        tag.k = k 
-        tag.v = v 
-        tag.id = self.id
-        tag.save!
-      end 
-
-      # Create an OldNode
-      old_node = OldNode.from_node(self)
-      old_node.timestamp = t
-      old_node.save_with_dependencies!
-
-      # tell the changeset we updated one element only
-      changeset.add_changes! 1
-
-      # save the changeset in case of bounding box updates
-      changeset.save!
-    end
-  end
-
   # Should probably be renamed delete_from to come in line with update
   def delete_with_history!(new_node, user)
     unless self.visible
@@ -201,6 +173,7 @@ class Node < ActiveRecord::Base
   
   def create_with_history(user)
     check_create_consistency(self, user)
+    self.id = nil
     self.version = 0
     self.visible = true
 
@@ -292,5 +265,38 @@ class Node < ActiveRecord::Base
   def fix_placeholders!(id_map)
     # nodes don't refer to anything, so there is nothing to do here
   end
+  
+  private
 
+  def save_with_history!
+    t = Time.now
+    Node.transaction do
+      self.version += 1
+      self.timestamp = t
+      self.save!
+
+      # Create a NodeTag
+      tags = self.tags
+      NodeTag.delete_all(['id = ?', self.id])
+      tags.each do |k,v|
+        tag = NodeTag.new
+        tag.k = k 
+        tag.v = v 
+        tag.id = self.id
+        tag.save!
+      end 
+
+      # Create an OldNode
+      old_node = OldNode.from_node(self)
+      old_node.timestamp = t
+      old_node.save_with_dependencies!
+
+      # tell the changeset we updated one element only
+      changeset.add_changes! 1
+
+      # save the changeset in case of bounding box updates
+      changeset.save!
+    end
+  end
+  
 end