Fixing a bug in my foreign keys. I can now upload and download nodes and ways using...

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

diff --git a/app/models/node.rb b/app/models/node.rb
index 6770231790735b0ffc4e3f1957e5d4598de8e3df..2f3001a49a8c627c571f45bd2ed2c68711026a8f 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -5,12 +5,12 @@ class Node < ActiveRecord::Base
 
   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
 


@@ -77,6 +77,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?
 


@@ -151,7 +152,8 @@ class Node < ActiveRecord::Base
       raise OSM::APIVersionMismatchError.new(new_node.version, version)
     end
 
       raise OSM::APIVersionMismatchError.new(new_node.version, version)
     end
 

-    self.user_id = user.id
+    # FIXME logic need looked at
+    self.changeset_id = user.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


@@ -173,15 +175,15 @@ class Node < ActiveRecord::Base
 
     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')


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

-
-

 end
 end