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

diff --git a/app/models/node.rb b/app/models/node.rb
index 872c5c922..7f9b939db 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,5 +1,6 @@
-class Node < GeoRecord
+class Node < ActiveRecord::Base
   require 'xml/libxml'
+  include GeoRecord
 
   set_table_name 'current_nodes'
   
@@ -12,17 +13,14 @@ class Node < GeoRecord
   has_many :way_nodes
   has_many :node_tags, :foreign_key => :id
   belongs_to :user
+  
+  has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
+  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder
  
   def validate_position
     errors.add_to_base("Node is not in the world") unless in_world?
   end
 
-  def in_world?
-    return false if self.lat < -90 or self.lat > 90
-    return false if self.lon < -180 or self.lon > 180
-    return true
-  end
-
   #
   # Search for nodes matching tags within bounding_box
   #
@@ -57,7 +55,7 @@ class Node < GeoRecord
       doc = p.parse
 
       doc.find('//osm/node').each do |pt|
-	return Node.from_xml_node(pt, create)
+        return Node.from_xml_node(pt, create)
       end
     rescue
       return nil
@@ -66,7 +64,8 @@ class Node < GeoRecord
 
   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
 
@@ -74,7 +73,7 @@ class Node < GeoRecord
 
     unless create
       if pt['id'] != '0'
-	node.id = pt['id'].to_i
+        node.id = pt['id'].to_i
       end
     end
 
@@ -84,7 +83,7 @@ class Node < GeoRecord
       node.timestamp = Time.now
     else
       if pt['timestamp']
-	node.timestamp = Time.parse(pt['timestamp'])
+        node.timestamp = Time.parse(pt['timestamp'])
       end
     end
 
@@ -108,11 +107,11 @@ class Node < GeoRecord
       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!
+        tag = NodeTag.new
+        tag.k = k 
+        tag.v = v 
+        tag.id = self.id
+        tag.save!
       end 
 
       # Create an OldNode
@@ -122,6 +121,35 @@ class Node < GeoRecord
     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
     doc = OSM::API.new.get_xml_doc
     doc.root << to_xml_node()
@@ -160,11 +188,7 @@ class Node < GeoRecord
   end
 
   def tags_as_hash
-    hash = {}
-    Tags.split(self.tags) do |k,v|
-      hash[k] = v
-    end
-    hash
+    return tags
   end
 
   def tags