Fixed xml method of old way model.

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

diff --git a/app/models/node.rb b/app/models/node.rb
index c8770922d7b38b1547b6d3f49a05a8f0ab95c546..e7058a5adee06268b22ff9ffd562d25cc9138c56 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -2,15 +2,16 @@ class Node < ActiveRecord::Base
   require 'xml/libxml'
 
   include GeoRecord
   require 'xml/libxml'
 
   include GeoRecord

+  include ConsistencyValidations

 
   set_table_name 'current_nodes'
 
   set_table_name 'current_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

 
   has_many :old_nodes, :foreign_key => :id
 
 
   has_many :old_nodes, :foreign_key => :id
 


@@ -19,6 +20,9 @@ class Node < ActiveRecord::Base
 
   has_many :node_tags, :foreign_key => :id
   
 
   has_many :node_tags, :foreign_key => :id
   

+  has_many :old_way_nodes
+  has_many :ways_via_history, :class_name=> "Way", :through => :old_way_nodes, :source => :way
+

   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
 
   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
 


@@ -74,6 +78,7 @@ class Node < ActiveRecord::Base
     node.version = pt['version']
     node.lat = pt['lat'].to_f
     node.lon = pt['lon'].to_f
     node.version = pt['version']
     node.lat = pt['lat'].to_f
     node.lon = pt['lon'].to_f

+    node.changeset_id = pt['changeset'].to_i

 
     return nil unless node.in_world?
 
 
     return nil unless node.in_world?
 


@@ -127,16 +132,18 @@ class Node < ActiveRecord::Base
     end
   end
 
     end
   end
 

-  def delete_with_history(user)
+  # Should probably be renamed delete_from to come in line with update
+  def delete_with_history(new_node, user)

     if self.visible
     if self.visible

+      check_consistency(self, new_node, user)

       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 ])
       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
+        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])
       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
+        raise OSM::APIPreconditionFailedError.new

       else
       else

-       self.user_id = user.id
-       self.visible = 0
-       save_with_history!
+        self.changeset_id = new_node.changeset_id
+        self.visible = 0
+        save_with_history!

       end
     else
       raise OSM::APIAlreadyDeletedError.new
       end
     else
       raise OSM::APIAlreadyDeletedError.new


@@ -144,11 +151,10 @@ class Node < ActiveRecord::Base
   end
 
   def update_from(new_node, user)
   end
 
   def update_from(new_node, user)

-    if new_node.version != version
-      raise OSM::APIVersionMismatchError.new(new_node.version, version)
-    end
+    check_consistency(self, new_node, user)

 
 

-    self.user_id = user.id
+    # FIXME logic needs to be double checked
+    self.changeset_id = new_node.changeset_id

     self.latitude = new_node.latitude 
     self.longitude = new_node.longitude
     self.tags = new_node.tags
     self.latitude = new_node.latitude 
     self.longitude = new_node.longitude
     self.tags = new_node.tags


@@ -167,18 +173,20 @@ class Node < ActiveRecord::Base
     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['version'] = self.version.to_s
+    el1['changeset'] = self.changeset_id.to_s
+    

     user_display_name_cache = {} if user_display_name_cache.nil?
 
     user_display_name_cache = {} if user_display_name_cache.nil?
 

-    if user_display_name_cache and user_display_name_cache.key?(self.user_id)
+    if user_display_name_cache and user_display_name_cache.key?(self.changeset.user_id)

       # use the cache if available
       # use the cache if available

-    elsif self.user.data_public?
-      user_display_name_cache[self.user_id] = self.user.display_name
+    elsif self.changeset.user.data_public?
+      user_display_name_cache[self.changeset.user_id] = self.changeset.user.display_name

     else
     else

-      user_display_name_cache[self.user_id] = nil
+      user_display_name_cache[self.changeset.user_id] = nil

     end
 
     end
 

-    el1['user'] = user_display_name_cache[self.user_id] unless user_display_name_cache[self.user_id].nil?
+    el1['user'] = user_display_name_cache[self.changeset.user_id] unless user_display_name_cache[self.changeset.user_id].nil?

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


@@ -189,7 +197,6 @@ class Node < ActiveRecord::Base
 
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
 
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema

-    el1['version'] = self.version.to_s

     return el1
   end
 
     return el1
   end
 


@@ -216,6 +223,4 @@ class Node < ActiveRecord::Base
     @tags[k] = v
   end
 
     @tags[k] = v
   end
 

-
-

 end
 end