Merge 8377:8381 from trunk.

diff --combined app/models/old_node.rb
index b6391a3d1b06c6921f835b2c0e5e57b5dc172592,891b89731ec2062071b06f5605e7442ec971b3f2..7bafca0531a631767bc673617c005c770d345205
--- 1/app/models/old_node.rb
--- 2/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@@ -1,4 -1,6 +1,6 @@@
- class OldNode < GeoRecord
+ class OldNode < ActiveRecord::Base
+   include GeoRecord
+ 
    set_table_name 'nodes'
    
    validates_presence_of :user_id, :timestamp
@@@ -48,12 -50,4 +50,12 @@@
      el1['timestamp'] = self.timestamp.xmlschema
      return el1
    end
 +  
 +  def tags_as_hash
 +    hash = {}
 +    Tags.split(self.tags) do |k,v|
 +      hash[k] = v
 +    end
 +    hash
 +  end
  end