Cleaned up some unreachable code. Added first test on the 'old' node controller.

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

diff --git a/app/models/node.rb b/app/models/node.rb
index e7058a5adee06268b22ff9ffd562d25cc9138c56..c2a61906b1a1dc60d6e360d30d435d11ce3eebac 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -75,7 +75,7 @@ class Node < ActiveRecord::Base
   def self.from_xml_node(pt, create=false)
     node = Node.new
     
-    node.version = pt['version']
+    node.version = pt['version'].to_i
     node.lat = pt['lat'].to_f
     node.lon = pt['lon'].to_f
     node.changeset_id = pt['changeset'].to_i
@@ -133,12 +133,12 @@ class Node < ActiveRecord::Base
   end
 
   # Should probably be renamed delete_from to come in line with update
-  def delete_with_history(new_node, user)
+  def delete_with_history!(new_node, user)
     if self.visible
       check_consistency(self, new_node, user)
       if WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id", :conditions => [ "current_ways.visible = 1 AND current_way_nodes.node_id = ?", self.id ])
         raise OSM::APIPreconditionFailedError.new
-      elsif RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='node' and member_id=?", self.id])
+      elsif RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='node' and member_id=? ", self.id])
         raise OSM::APIPreconditionFailedError.new
       else
         self.changeset_id = new_node.changeset_id
@@ -161,6 +161,13 @@ class Node < ActiveRecord::Base
     self.visible = true
     save_with_history!
   end
+  
+  def create_with_history(user)
+    check_create_consistency(self, user)
+    self.version = 0
+    self.visible = true
+    save_with_history!
+  end
 
   def to_xml
     doc = OSM::API.new.get_xml_doc
@@ -220,6 +227,11 @@ class Node < ActiveRecord::Base
 
   def add_tag_key_val(k,v)
     @tags = Hash.new unless @tags
+
+    # duplicate tags are now forbidden, so we can't allow values
+    # in the hash to be overwritten.
+    raise OSM::APIDuplicateTagsError.new if @tags.include? k
+
     @tags[k] = v
   end