X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2803612d9db2f89c4eaa57bbf4606b56967caa62..d77e5f9d4d18f2eac88d0db69a1f460323618119:/app/models/node.rb?ds=sidebyside diff --git a/app/models/node.rb b/app/models/node.rb index 91f348f19..230c83882 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -1,92 +1,112 @@ class Node < ActiveRecord::Base 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 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.latitude < -90 or self.latitude > 90 + return false if self.longitude < -180 or self.longitude > 180 + return true + end - node.latitude = pt['lat'].to_f - node.longitude = pt['lon'].to_f + 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.latitude = pt['lat'].to_f + node.longitude = pt['lon'].to_f + + return nil unless node.in_world? + + unless create + if pt['id'] != '0' + node.id = pt['id'].to_i + end + end - if node.latitude > 90 or node.latitude < -90 or node.longitude > 180 or node.longitude < -180 - return nil - end + node.visible = pt['visible'] and pt['visible'] == 'true' - unless create - if pt['id'] != '0' - node.id = pt['id'].to_i + if create + node.timestamp = Time.now + else + if pt['timestamp'] + node.timestamp = Time.parse(pt['timestamp']) + end end - end - node.visible = pt['visible'] and pt['visible'] == 'true' + tags = [] - if create - node.timestamp = Time.now - else - if pt['timestamp'] - node.timestamp = Time.parse(pt['timestamp']) + pt.find('tag').each do |tag| + tags << [tag['k'],tag['v']] end - end - tags = [] + tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';') + tags = '' if tags.nil? - pt.find('tag').each do |tag| - tags << [tag['k'],tag['v']] + node.tags = tags end - - tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';') - tags = '' if tags.nil? - - node.tags = tags - + rescue + node = nil end + return node end def save_with_history begin Node.transaction do - self.save + self.timestamp = Time.now + self.save! old_node = OldNode.from_node(self) - old_node.save + old_node.save! end + return true - rescue Exception => ex + rescue return nil end end def to_xml - doc = XML::Document.new - doc.encoding = 'UTF-8' - root = XML::Node.new 'osm' - root['version'] = API_VERSION - root['generator'] = 'OpenStreetMap server' - doc.root = root - root << to_xml_node() + doc = OSM::API.new.get_xml_doc + doc.root << to_xml_node() return doc end - def to_xml_node + 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 + + 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? + Node.split_tags(el1, self.tags) el1['visible'] = self.visible.to_s el1['timestamp'] = self.timestamp.xmlschema @@ -101,7 +121,7 @@ class Node < ActiveRecord::Base key = parts[0].strip unless parts[0].nil? val = parts[1].strip unless parts[1].nil? if key != '' && val != '' - el2 = Node.new('tag') + el2 = XML::Node.new('tag') el2['k'] = key.to_s el2['v'] = val.to_s el << el2