split_node_tags: Remove the left-over pre-merge files.

diff --git a/app/models/node.rb.pre-merge b/app/models/node.rb.pre-merge
deleted file mode 100644 (file)
index 5a8e03e..0000000
--- a/app/models/node.rb.pre-merge
+++ /dev/null
@@ -1,195 +0,0 @@
-class Node < GeoRecord
-  require 'xml/libxml'
-
-  set_table_name 'current_nodes'
-  
-  validates_presence_of :user_id, :timestamp
-  validates_inclusion_of :visible, :in => [ true, false ]
-  validates_numericality_of :latitude, :longitude
-  validate :validate_position
-
-  has_many :old_nodes, :foreign_key => :id
-  has_many :way_nodes
-  has_many :node_tags, :foreign_key => :id
-  belongs_to :user
- 
-  def validate_position
-    errors.add_to_base("Node is not in the world") unless in_world?
-  end
-
-  def in_world?
-    return false if self.lat < -90 or self.lat > 90
-    return false if self.lon < -180 or self.lon > 180
-    return true
-  end
-
-  #
-  # Search for nodes matching tags within bounding_box
-  #
-  # Also adheres to limitations such as within max_number_of_nodes
-  #
-  def self.search(bounding_box, tags = {})
-    min_lon, min_lat, max_lon, max_lat = *bounding_box
-    # @fixme a bit of a hack to search for only visible nodes
-    # couldn't think of another to add to tags condition
-    #conditions_hash = tags.merge({ 'visible' => 1 })
-  
-    # using named placeholders http://www.robbyonrails.com/articles/2005/10/21/using-named-placeholders-in-ruby
-    #keys = []
-    #values = {}
-
-    #conditions_hash.each do |key,value|
-    #  keys <<  "#{key} = :#{key}"
-    #  values[key.to_sym] = value
-    #end 
-    #conditions = keys.join(' AND ')
- 
-    find_by_area(min_lat, min_lon, max_lat, max_lon,
-                    :conditions => 'visible = 1',
-                    :limit => APP_CONFIG['max_number_of_nodes']+1)  
-  end
-
-  # Read in xml as text and return it's Node object representation
-  def self.from_xml(xml, create=false)
-    begin
-      p = XML::Parser.new
-      p.string = xml
-      doc = p.parse
-  
-      node = Node.new
-
-      doc.find('//osm/node').each do |pt|
-        node.lat = pt['lat'].to_f
-        node.lon = pt['lon'].to_f
-
-        return nil unless node.in_world?
-
-        unless create
-          if pt['id'] != '0'
-            node.id = pt['id'].to_i
-          end
-        end
-
-        node.visible = pt['visible'] and pt['visible'] == 'true'
-
-        if create
-          node.timestamp = Time.now
-        else
-          if pt['timestamp']
-            node.timestamp = Time.parse(pt['timestamp'])
-          end
-        end
-
-        tags = []
-
-        pt.find('tag').each do |tag|
-          node.add_tag_key_val(tag['k'],tag['v'])
-        end
-
-      end
-    rescue
-      node = nil
-    end
-
-    return node
-  end
-
-  def save_with_history!
-    t = Time.now
-
-    Node.transaction do 
-      # apply timestamp to the new node
-      self.timestamp = t
-      self.save!
-    end
-
-    # Create a NodeTag
-    NodeTag.transaction do 
-      tags = self.tags
-
-      NodeTag.delete_all(['id = ?', self.id])
-
-      sequence_id = 1
-      tags.each do |k,v|
-        tag = NodeTag.new
-        tag.k = k 
-        tag.v = v 
-        tag.id = self.id
-        tag.sequence_id = sequence_id
-        tag.save!
-        sequence_id += 1
-      end 
-    end 
-    # Create an OldNode
-    old_node = OldNode.from_node(self)
-    old_node.timestamp = t
-    old_node.save_with_dependencies!
-
-  end
-
-  def to_xml
-    doc = OSM::API.new.get_xml_doc
-    doc.root << to_xml_node()
-    return doc
-  end
-
-  def to_xml_node(user_display_name_cache = nil)
-    el1 = XML::Node.new 'node'
-    el1['id'] = self.id.to_s
-    el1['lat'] = self.lat.to_s
-    el1['lon'] = self.lon.to_s
-
-    user_display_name_cache = {} if user_display_name_cache.nil?
-
-    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
-    else
-      user_display_name_cache[self.user_id] = nil
-    end
-
-    el1['user'] = user_display_name_cache[self.user_id] unless user_display_name_cache[self.user_id].nil?
-
-    self.tags.each 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
-
-  def tags_as_hash
-    hash = {}
-    Tags.split(self.tags) do |k,v|
-      hash[k] = v
-    end
-    hash
-  end
-
-  def tags
-    unless @tags
-      @tags = {}
-      self.node_tags.each do |tag|
-        @tags[tag.k] = tag.v
-      end
-    end
-    @tags
-  end
-
-  def tags=(t)
-    @tags = t 
-  end 
-
-  def add_tag_key_val(k,v)
-    @tags = Hash.new unless @tags
-    @tags[k] = v
-  end
-
-
-
-end

diff --git a/app/models/old_node.rb.pre-merge b/app/models/old_node.rb.pre-merge
deleted file mode 100644 (file)
index 4f10e65..0000000
--- a/app/models/old_node.rb.pre-merge
+++ /dev/null
@@ -1,88 +0,0 @@
-class OldNode < GeoRecord
-  set_table_name 'nodes'
-  
-  validates_presence_of :user_id, :timestamp
-  validates_inclusion_of :visible, :in => [ true, false ]
-  validates_numericality_of :latitude, :longitude
-  validate :validate_position
-
-  belongs_to :user
- 
-  def validate_position
-    errors.add_to_base("Node is not in the world") unless in_world?
-  end
-
-  def in_world?
-    return false if self.lat < -90 or self.lat > 90
-    return false if self.lon < -180 or self.lon > 180
-    return true
-  end
-
-  def self.from_node(node)
-    old_node = OldNode.new
-    old_node.latitude = node.latitude
-    old_node.longitude = node.longitude
-    old_node.visible = node.visible
-    old_node.tags = node.tags
-    old_node.timestamp = node.timestamp
-    old_node.user_id = node.user_id
-    old_node.id = node.id
-    return old_node
-  end
-
-  def to_xml_node
-    el1 = XML::Node.new 'node'
-    el1['id'] = self.id.to_s
-    el1['lat'] = self.lat.to_s
-    el1['lon'] = self.lon.to_s
-    el1['user'] = self.user.display_name if self.user.data_public?
-
-    self.tags.each 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
-
-  def save_with_dependencies!
-    save!
-    #not sure whats going on here
-    clear_aggregation_cache
-    clear_association_cache
-    #ok from here
-    @attributes.update(OldNode.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp]).instance_variable_get('@attributes'))
-   
-    sequence_id = 1
-    self.tags.each do |k,v|
-      tag = OldNodeTag.new
-      tag.k = k
-      tag.v = v
-      tag.id = self.id
-      tag.version = self.version
-      tag.sequence_id = sequence_id
-      tag.save!
-      sequence_id += 1
-    end
-  end
-
-  def tags
-    unless @tags
-        @tags = Hash.new
-        OldNodeTag.find(:all, :conditions => ["id = ? AND version = ?", self.id, self.version]).each do |tag|
-            @tags[tag.k] = tag.v
-        end
-    end
-    @tags = Hash.new unless @tags
-    @tags
-  end
-
-  def tags=(t)
-    @tags = t 
-  end 
-
-end