X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d04c6d6ccd8d42fe3fc983433b8befe6a999dbdc..3d6e1c67fb2291c6933f37bac3b9a3f518e8487a:/app/models/node.rb

diff --git a/app/models/node.rb b/app/models/node.rb
index ecaa3f45a..872c5c922 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,5 +1,3 @@
-# The node model represents a current existing node, that is, the latest version. Use OldNode for historical nodes.
-
 class Node < GeoRecord
   require 'xml/libxml'
 
@@ -10,18 +8,15 @@ class Node < GeoRecord
   validates_numericality_of :latitude, :longitude
   validate :validate_position
 
-  has_many :ways, :through => :way_nodes
   has_many :old_nodes, :foreign_key => :id
   has_many :way_nodes
+  has_many :node_tags, :foreign_key => :id
   belongs_to :user
  
-  # Sanity check the latitude and longitude and add an error if it's broken
   def validate_position
     errors.add_to_base("Node is not in the world") unless in_world?
   end
 
-  # Is this node withing -90 > latitude > 90 and -180 > longitude > 180>
-  # * returns true/false
   def in_world?
     return false if self.lat < -90 or self.lat > 90
     return false if self.lon < -180 or self.lon > 180
@@ -60,64 +55,79 @@ 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 nil unless node.in_world?
+	return Node.from_xml_node(pt, create)
+      end
+    rescue
+      return nil
+    end
+  end
 
-        unless create
-          if pt['id'] != '0'
-            node.id = pt['id'].to_i
-          end
-        end
+  def self.from_xml_node(pt, create=false)
+    node = Node.new
 
-        node.visible = pt['visible'] and pt['visible'] == 'true'
+    node.lat = pt['lat'].to_f
+    node.lon = pt['lon'].to_f
 
-        if create
-          node.timestamp = Time.now
-        else
-          if pt['timestamp']
-            node.timestamp = Time.parse(pt['timestamp'])
-          end
-        end
+    return nil unless node.in_world?
 
-        tags = []
+    unless create
+      if pt['id'] != '0'
+	node.id = pt['id'].to_i
+      end
+    end
 
-        pt.find('tag').each do |tag|
-          tags << [tag['k'],tag['v']]
-        end
+    node.visible = pt['visible'] and pt['visible'] == 'true'
 
-        node.tags = Tags.join(tags)
+    if create
+      node.timestamp = Time.now
+    else
+      if pt['timestamp']
+	node.timestamp = Time.parse(pt['timestamp'])
       end
-    rescue
-      node = nil
+    end
+
+    tags = []
+
+    pt.find('tag').each do |tag|
+      node.add_tag_key_val(tag['k'],tag['v'])
     end
 
     return node
   end
 
-  # Save this node with the appropriate OldNode object to represent it's history.
   def save_with_history!
+    t = Time.now
     Node.transaction do
-      self.timestamp = Time.now
+      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.save!
+      old_node.timestamp = t
+      old_node.save_with_dependencies!
     end
   end
 
-  # Turn this Node in to a complete OSM XML object with <osm> wrapper
   def to_xml
     doc = OSM::API.new.get_xml_doc
     doc.root << to_xml_node()
     return doc
   end
 
-  # Turn this Node in to an XML Node without the <osm> wrapper.
   def to_xml_node(user_display_name_cache = nil)
     el1 = XML::Node.new 'node'
     el1['id'] = self.id.to_s
@@ -136,7 +146,7 @@ class Node < GeoRecord
 
     el1['user'] = user_display_name_cache[self.user_id] unless user_display_name_cache[self.user_id].nil?
 
-    Tags.split(self.tags) do |k,v|
+    self.tags.each do |k,v|
       el2 = XML::Node.new('tag')
       el2['k'] = k.to_s
       el2['v'] = v.to_s
@@ -145,10 +155,10 @@ class Node < GeoRecord
 
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
+    el1['version'] = self.version.to_s
     return el1
   end
 
-  # Return the node's tags as a Hash of keys and their values
   def tags_as_hash
     hash = {}
     Tags.split(self.tags) do |k,v|
@@ -156,4 +166,26 @@ class Node < GeoRecord
     end
     hash
   end
+
+  def tags
+    unless @tags
+      @tags = {}
+      self.node_tags.each do |tag|
+        @tags[tag.k] = tag.v
+      end
+    end
+    @tags
+  end
+
+  def tags=(t)
+    @tags = t 
+  end 
+
+  def add_tag_key_val(k,v)
+    @tags = Hash.new unless @tags
+    @tags[k] = v
+  end
+
+
+
 end