rails way bits

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

diff --git a/app/models/node.rb b/app/models/node.rb
index 5c436fe46654a1f208561204dab9aae8d4ad9d9f..f184a6ae97d54d4ce00e40a51097345161a1b4ab 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -27,11 +27,13 @@ class Node < ActiveRecord::Base
         return nil
       end
 
         return nil
       end
 

-      if pt['id'] != '0'
-        node.id = pt['id'].to_i
+      unless create
+        if pt['id'] != '0'
+          node.id = pt['id'].to_i
+        end

       end
 
       end
 

-      node.visible = pt['visible'] == '1'
+      node.visible = pt['visible'] and pt['visible'] == 'true'

 
       if create
         node.timestamp = Time.now
 
       if create
         node.timestamp = Time.now


@@ -59,8 +61,8 @@ class Node < ActiveRecord::Base
   def save_with_history
     begin
       Node.transaction do
   def save_with_history
     begin
       Node.transaction do

-        old_node = OldNode.from_node(self)

         self.save
         self.save

+        old_node = OldNode.from_node(self)

         old_node.save
       end
       return true
         old_node.save
       end
       return true


@@ -80,15 +82,14 @@ class Node < ActiveRecord::Base
     el1['id'] = self.id.to_s
     el1['lat'] = self.latitude.to_s
     el1['lon'] = self.longitude.to_s
     el1['id'] = self.id.to_s
     el1['lat'] = self.latitude.to_s
     el1['lon'] = self.longitude.to_s

-    split_tags(el1, self.tags)
+    Node.split_tags(el1, self.tags)

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

-  private
-  def split_tags(el, tags)
+  def self.split_tags(el, tags)

     tags.split(';').each do |tag|
       parts = tag.split('=')
       key = ''
     tags.split(';').each do |tag|
       parts = tag.split('=')
       key = ''