Include the event type in the JSON output of a note

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 247a699236c46bc76a9dc0e804051a1877709042..64ae1a70c9d8fe2050f2ccb3283bc04414dae030 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -1,21 +1,20 @@
-class OldNode < GeoRecord
-  set_table_name 'nodes'
-  
-  validates_presence_of :user_id, :timestamp
+class OldNode < ActiveRecord::Base
+  include GeoRecord
+  include ConsistencyValidations
+
+  self.table_name = "nodes"
+  self.primary_keys = "node_id", "version"
+
+  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

+  validates_associated :changeset

 
 

-  belongs_to :user
+  belongs_to :changeset

  
   def validate_position
  
   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
+    errors.add(:base, "Node is not in the world") unless in_world?

   end
 
   def self.from_node(node)
   end
 
   def self.from_node(node)


@@ -25,18 +24,28 @@ 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.id = node.id
+    old_node.changeset_id = node.changeset_id
+    old_node.node_id = node.id

     old_node.version = node.version
     return old_node
   end
     old_node.version = node.version
     return old_node
   end

+  
+  def to_xml
+    doc = OSM::API.new.get_xml_doc
+    doc.root << to_xml_node()
+    return doc
+  end

 
   def to_xml_node
     el1 = XML::Node.new 'node'
 
   def to_xml_node
     el1 = XML::Node.new 'node'

-    el1['id'] = self.id.to_s
+    el1['id'] = self.node_id.to_s

     el1['lat'] = self.lat.to_s
     el1['lon'] = self.lon.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
+    if self.changeset.user.data_public?
+      el1['user'] = self.changeset.user.display_name
+      el1['uid'] = self.changeset.user.id.to_s
+    end

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


@@ -57,13 +66,13 @@ class OldNode < GeoRecord
     clear_aggregation_cache
     clear_association_cache
     #ok from here
     clear_aggregation_cache
     clear_association_cache
     #ok from here

-    @attributes.update(OldNode.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp]).instance_variable_get('@attributes'))
+    @attributes.update(OldNode.where(:node_id => self.node_id, :timestamp => self.timestamp, :version => self.version).first.instance_variable_get('@attributes'))

    
     self.tags.each do |k,v|
       tag = OldNodeTag.new
       tag.k = k
       tag.v = v
    
     self.tags.each do |k,v|
       tag = OldNodeTag.new
       tag.k = k
       tag.v = v

-      tag.id = self.id
+      tag.node_id = self.node_id

       tag.version = self.version
       tag.save!
     end
       tag.version = self.version
       tag.save!
     end


@@ -71,10 +80,10 @@ class OldNode < GeoRecord
 
   def tags
     unless @tags
 
   def tags
     unless @tags

-        @tags = Hash.new
-        OldNodeTag.find(:all, :conditions => ["id = ? AND version = ?", self.id, self.version]).each do |tag|
-            @tags[tag.k] = tag.v
-        end
+      @tags = Hash.new
+      OldNodeTag.where(:node_id => self.node_id, :version => self.version).each do |tag|
+        @tags[tag.k] = tag.v
+      end

     end
     @tags = Hash.new unless @tags
     @tags
     end
     @tags = Hash.new unless @tags
     @tags


@@ -82,6 +91,19 @@ class OldNode < GeoRecord
 
   def tags=(t)
     @tags = t 
 
   def tags=(t)
     @tags = t 

-  end 
+  end

 
 

+  def tags_as_hash 
+    return self.tags
+  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