X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/df11677afd55ef592330a05c43ed4baa81b60572..700da2b3470de2a7826472160e1c93d8a983fefa:/app/models/node.rb

diff --git a/app/models/node.rb b/app/models/node.rb
index acd251918..c8770922d 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,6 +1,8 @@
-class Node < GeoRecord
+class Node < ActiveRecord::Base
   require 'xml/libxml'
 
+  include GeoRecord
+
   set_table_name 'current_nodes'
   
   validates_presence_of :user_id, :timestamp
@@ -8,21 +10,23 @@ class Node < GeoRecord
   validates_numericality_of :latitude, :longitude
   validate :validate_position
 
+  belongs_to :user
+
   has_many :old_nodes, :foreign_key => :id
+
   has_many :way_nodes
+  has_many :ways, :through => :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
+
+  # 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
 
-  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 +61,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
@@ -75,7 +79,7 @@ class Node < GeoRecord
 
     unless create
       if pt['id'] != '0'
-	node.id = pt['id'].to_i
+        node.id = pt['id'].to_i
       end
     end
 
@@ -85,7 +89,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
 
@@ -109,11 +113,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
@@ -140,6 +144,10 @@ class Node < GeoRecord
   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
@@ -186,11 +194,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