X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1a6230fb25f44491156dd20b07a4bfd8a86cca56..86b4d1bc2c05a68053c7485217144a7fcf8ef4e8:/app/models/node.rb

diff --git a/app/models/node.rb b/app/models/node.rb
index 5a8e03ef1..b027f2fd4 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -55,40 +55,44 @@ class Node < GeoRecord
       p = XML::Parser.new
       p.string = xml
       doc = p.parse
-  
-      node = Node.new
 
       doc.find('//osm/node').each do |pt|
-        node.lat = pt['lat'].to_f
-        node.lon = pt['lon'].to_f
+	return Node.from_xml_node(pt, create)
+      end
+    rescue
+      return nil
+    end
+  end
 
-        return nil unless node.in_world?
+  def self.from_xml_node(pt, create=false)
+    node = Node.new
+    
+    node.version = pt['version']
+    node.lat = pt['lat'].to_f
+    node.lon = pt['lon'].to_f
 
-        unless create
-          if pt['id'] != '0'
-            node.id = pt['id'].to_i
-          end
-        end
+    return nil unless node.in_world?
 
-        node.visible = pt['visible'] and pt['visible'] == 'true'
+    unless create
+      if pt['id'] != '0'
+	node.id = pt['id'].to_i
+      end
+    end
 
-        if create
-          node.timestamp = Time.now
-        else
-          if pt['timestamp']
-            node.timestamp = Time.parse(pt['timestamp'])
-          end
-        end
+    node.visible = pt['visible'] and pt['visible'] == 'true'
 
-        tags = []
+    if create
+      node.timestamp = Time.now
+    else
+      if pt['timestamp']
+	node.timestamp = Time.parse(pt['timestamp'])
+      end
+    end
 
-        pt.find('tag').each do |tag|
-          node.add_tag_key_val(tag['k'],tag['v'])
-        end
+    tags = []
 
-      end
-    rescue
-      node = nil
+    pt.find('tag').each do |tag|
+      node.add_tag_key_val(tag['k'],tag['v'])
     end
 
     return node
@@ -96,35 +100,56 @@ class Node < GeoRecord
 
   def save_with_history!
     t = Time.now
-
-    Node.transaction do 
-      # apply timestamp to the new node
+    Node.transaction do
+      self.version += 1
       self.timestamp = t
       self.save!
-    end
 
-    # Create a NodeTag
-    NodeTag.transaction do 
+      # Create a NodeTag
       tags = self.tags
-
       NodeTag.delete_all(['id = ?', self.id])
-
-      sequence_id = 1
       tags.each do |k,v|
-        tag = NodeTag.new
-        tag.k = k 
-        tag.v = v 
-        tag.id = self.id
-        tag.sequence_id = sequence_id
-        tag.save!
-        sequence_id += 1
+	tag = NodeTag.new
+	tag.k = k 
+	tag.v = v 
+	tag.id = self.id
+	tag.save!
       end 
-    end 
-    # Create an OldNode
-    old_node = OldNode.from_node(self)
-    old_node.timestamp = t
-    old_node.save_with_dependencies!
 
+      # Create an OldNode
+      old_node = OldNode.from_node(self)
+      old_node.timestamp = t
+      old_node.save_with_dependencies!
+    end
+  end
+
+  def delete_with_history(user)
+    if self.visible
+      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])
+	raise OSM::APIPreconditionFailedError.new
+      else
+	self.user_id = user.id
+	self.visible = 0
+	save_with_history!
+      end
+    else
+      raise OSM::APIAlreadyDeletedError.new
+    end
+  end
+
+  def update_from(new_node, user)
+    if new_node.version != version
+      raise OSM::APIVersionMismatchError.new(new_node.version, version)
+    end
+
+    self.user_id = user.id
+    self.latitude = new_node.latitude 
+    self.longitude = new_node.longitude
+    self.tags = new_node.tags
+    self.visible = true
+    save_with_history!
   end
 
   def to_xml
@@ -160,15 +185,12 @@ class Node < GeoRecord
 
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
+    el1['version'] = self.version.to_s
     return el1
   end
 
   def tags_as_hash
-    hash = {}
-    Tags.split(self.tags) do |k,v|
-      hash[k] = v
-    end
-    hash
+    return tags
   end
 
   def tags