X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6ccf25b347d90b2ae7b1f2e2b5c8f042e0790a3b..3d6e1c67fb2291c6933f37bac3b9a3f518e8487a:/app/models/node.rb diff --git a/app/models/node.rb b/app/models/node.rb index 6eecc853d..872c5c922 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -1,74 +1,124 @@ -class Node < ActiveRecord::Base +class Node < GeoRecord require 'xml/libxml' + set_table_name 'current_nodes' - - validates_numericality_of :latitude - validates_numericality_of :longitude - # FIXME validate lat and lon within the world + 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 self.from_xml(xml, create=false) - p = XML::Parser.new - p.string = xml - doc = p.parse - - node = Node.new - - doc.find('//osm/node').each do |pt| + 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 - node.latitude = pt['lat'].to_f - node.longitude = pt['lon'].to_f + # 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 - if node.latitude > 90 or node.latitude < -90 or node.longitude > 180 or node.longitude < -180 - return nil + doc.find('//osm/node').each do |pt| + return Node.from_xml_node(pt, create) end + rescue + return nil + end + end - unless create - if pt['id'] != '0' - node.id = pt['id'].to_i - end - end + def self.from_xml_node(pt, create=false) + node = Node.new + + node.lat = pt['lat'].to_f + node.lon = pt['lon'].to_f - node.visible = pt['visible'] and pt['visible'] == 'true' + return nil unless node.in_world? - if create - node.timestamp = Time.now - else - if pt['timestamp'] - node.timestamp = Time.parse(pt['timestamp']) - end + unless create + if pt['id'] != '0' + node.id = pt['id'].to_i end + end - tags = [] + node.visible = pt['visible'] and pt['visible'] == 'true' - pt.find('tag').each do |tag| - tags << [tag['k'],tag['v']] + if create + node.timestamp = Time.now + else + if pt['timestamp'] + node.timestamp = Time.parse(pt['timestamp']) end + end - tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';') - tags = '' if tags.nil? - - node.tags = tags + tags = [] + pt.find('tag').each do |tag| + node.add_tag_key_val(tag['k'],tag['v']) 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 Exception => ex - return nil + def save_with_history! + t = Time.now + Node.transaction do + self.version += 1 + self.timestamp = t + self.save! + + # Create a NodeTag + tags = self.tags + NodeTag.delete_all(['id = ?', self.id]) + tags.each do |k,v| + tag = NodeTag.new + tag.k = k + tag.v = v + tag.id = self.id + tag.save! + end + + # Create an OldNode + old_node = OldNode.from_node(self) + old_node.timestamp = t + old_node.save_with_dependencies! end end @@ -81,38 +131,61 @@ class Node < ActiveRecord::Base 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 - # el['user'] = self.user.display_name if self.user.data_public? 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 - else + 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] + 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 - Node.split_tags(el1, self.tags) el1['visible'] = self.visible.to_s el1['timestamp'] = self.timestamp.xmlschema + el1['version'] = self.version.to_s 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 + 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