Creating consistency check for creation of nodes, way and relations. Moving some...

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 5d9c6d7ef31d7c8ecf57d738b92ea82021ff266e..8b3ba784bfb834c7598b932f5e31212f14bd24ad 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -1,24 +1,20 @@
-class OldNode < GeoRecord
-  set_primary_keys :id, :version
+class OldNode < ActiveRecord::Base
+  include GeoRecord
+  include ConsistencyValidations
+

   set_table_name 'nodes'
   
   set_table_name 'nodes'
   

-  validates_presence_of :user_id, :timestamp
+  validates_presence_of :changeset_id, :timestamp

   validates_inclusion_of :visible, :in => [ true, false ]
   validates_numericality_of :latitude, :longitude
   validate :validate_position
 
   validates_inclusion_of :visible, :in => [ true, false ]
   validates_numericality_of :latitude, :longitude
   validate :validate_position
 

-  belongs_to :user
+  belongs_to :changeset

  
   def validate_position
     errors.add_to_base("Node is not in the world") unless in_world?
   end
 
  
   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
-

   def self.from_node(node)
     old_node = OldNode.new
     old_node.latitude = node.latitude
   def self.from_node(node)
     old_node = OldNode.new
     old_node.latitude = node.latitude


@@ -26,7 +22,7 @@ class OldNode < GeoRecord
     old_node.visible = node.visible
     old_node.tags = node.tags
     old_node.timestamp = node.timestamp
     old_node.visible = node.visible
     old_node.tags = node.tags
     old_node.timestamp = node.timestamp

-    old_node.user_id = node.user_id
+    old_node.changeset_id = node.changeset_id

     old_node.id = node.id
     old_node.version = node.version
     return old_node
     old_node.id = node.id
     old_node.version = node.version
     return old_node


@@ -43,7 +39,8 @@ class OldNode < GeoRecord
     el1['id'] = self.id.to_s
     el1['lat'] = self.lat.to_s
     el1['lon'] = self.lon.to_s
     el1['id'] = self.id.to_s
     el1['lat'] = self.lat.to_s
     el1['lon'] = self.lon.to_s

-    el1['user'] = self.user.display_name if self.user.data_public?
+    el1['changeset'] = self.changeset.id.to_s
+    el1['user'] = self.changeset.user.display_name if self.changeset.user.data_public?

 
     self.tags.each do |k,v|
       el2 = XML::Node.new('tag')
 
     self.tags.each do |k,v|
       el2 = XML::Node.new('tag')


@@ -89,6 +86,23 @@ class OldNode < GeoRecord
 
   def tags=(t)
     @tags = t 
 
   def tags=(t)
     @tags = t 

-  end 
+  end

 
 

+  def tags_as_hash 
+    hash = {} 
+    Tags.split(self.tags) do |k,v| 
+      hash[k] = v 
+    end 
+    hash 
+  end 
+ 
+  # Pretend we're not in any ways 
+  def ways 
+    return [] 
+  end 
+ 
+  # Pretend we're not in any relations 
+  def containing_relation_members 
+    return [] 
+  end 

 end
 end