added migration to add a primary key on nodes id and version - should be run after...

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

diff --git a/app/models/node.rb b/app/models/node.rb
index 8b09ffef77d8cd3f4131da9faab05be65c1ac750..08a675b430960d81dc0276584fa75eea0c18de99 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,5 +1,6 @@
-class Node < ActiveRecord::Base
+class Node < GeoRecord

   require 'xml/libxml'
   require 'xml/libxml'

+

   set_table_name 'current_nodes'
   
   validates_presence_of :user_id, :timestamp
   set_table_name 'current_nodes'
   
   validates_presence_of :user_id, :timestamp


@@ -8,15 +9,16 @@ class Node < ActiveRecord::Base
   validate :validate_position
 
   has_many :old_nodes, :foreign_key => :id
   validate :validate_position
 
   has_many :old_nodes, :foreign_key => :id

+  has_many :way_nodes

   belongs_to :user
   belongs_to :user

-
+ 

   def validate_position
     errors.add_to_base("Node is not in the world") unless in_world?
   end
 
   def in_world?
   def validate_position
     errors.add_to_base("Node is not in the world") unless in_world?
   end
 
   def in_world?

-    return false if self.latitude < -90 or self.latitude > 90
-    return false if self.longitude < -180 or self.longitude > 180
+    return false if self.lat < -90 or self.lat > 90
+    return false if self.lon < -180 or self.lon > 180

     return true
   end
 
     return true
   end
 


@@ -29,8 +31,8 @@ class Node < ActiveRecord::Base
       node = Node.new
 
       doc.find('//osm/node').each do |pt|
       node = Node.new
 
       doc.find('//osm/node').each do |pt|

-        node.latitude = pt['lat'].to_f
-        node.longitude = pt['lon'].to_f
+        node.lat = pt['lat'].to_f
+        node.lon = pt['lon'].to_f

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


@@ -56,10 +58,7 @@ class Node < ActiveRecord::Base
           tags << [tag['k'],tag['v']]
         end
 
           tags << [tag['k'],tag['v']]
         end
 

-        tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';')
-        tags = '' if tags.nil?
-
-        node.tags = tags
+        node.tags = Tags.join(tags)

       end
     rescue
       node = nil
       end
     rescue
       node = nil


@@ -68,18 +67,12 @@ class Node < ActiveRecord::Base
     return node
   end
 
     return node
   end
 

-  def save_with_history
-    begin
-      Node.transaction do
-        self.timestamp = Time.now
-        self.save!
-        old_node = OldNode.from_node(self)
-        old_node.save!
-      end
-
-      return true
-    rescue
-      return nil
+  def save_with_history!
+    Node.transaction do
+      self.timestamp = Time.now
+      self.save!
+      old_node = OldNode.from_node(self)
+      old_node.save!

     end
   end
 
     end
   end
 


@@ -92,12 +85,12 @@ class Node < ActiveRecord::Base
   def to_xml_node(user_display_name_cache = nil)
     el1 = XML::Node.new 'node'
     el1['id'] = self.id.to_s
   def to_xml_node(user_display_name_cache = nil)
     el1 = XML::Node.new 'node'
     el1['id'] = self.id.to_s

-    el1['lat'] = self.latitude.to_s
-    el1['lon'] = self.longitude.to_s
+    el1['lat'] = self.lat.to_s
+    el1['lon'] = self.lon.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[self.user_id]
+    if user_display_name_cache and user_display_name_cache.key?(self.user_id)

       # use the cache if available
     elsif self.user.data_public?
       user_display_name_cache[self.user_id] = self.user.display_name
       # use the cache if available
     elsif self.user.data_public?
       user_display_name_cache[self.user_id] = self.user.display_name


@@ -107,25 +100,24 @@ class Node < ActiveRecord::Base
 
     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.user_id] unless user_display_name_cache[self.user_id].nil?
 

-    Node.split_tags(el1, self.tags)
+    Tags.split(self.tags) do |k,v|
+      el2 = XML::Node.new('tag')
+      el2['k'] = k.to_s
+      el2['v'] = v.to_s
+      el1 << el2
+    end
+

     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     return el1
   end
 
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     return el1
   end
 

-  def self.split_tags(el, tags)
-    tags.split(';').each do |tag|
-      parts = tag.split('=')
-      key = ''
-      val = ''
-      key = parts[0].strip unless parts[0].nil?
-      val = parts[1].strip unless parts[1].nil?
-      if key != '' && val != ''
-        el2 = XML::Node.new('tag')
-        el2['k'] = key.to_s
-        el2['v'] = val.to_s
-        el << el2
-      end
+  def tags_as_hash
+    hash = {}
+    Tags.split(self.tags) do |k,v|
+      hash[k] = v

     end
     end

+    hash

   end
   end

+

 end
 end