X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/59cc0015f565e89327d83bbb3b0787e7c4270ed9..d07277efba0c0069705bbefa68f2624a9c6c9ff0:/app/models/node.rb diff --git a/app/models/node.rb b/app/models/node.rb index f184a6ae9..dfc603376 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -1,6 +1,7 @@ class Node < ActiveRecord::Base require 'xml/libxml' set_table_name 'current_nodes' + validates_numericality_of :latitude validates_numericality_of :longitude @@ -75,9 +76,14 @@ class Node < ActiveRecord::Base doc = XML::Document.new doc.encoding = 'UTF-8' root = XML::Node.new 'osm' - root['version'] = '0.4' + root['version'] = API_VERSION root['generator'] = 'OpenStreetMap server' doc.root = root + root << to_xml_node() + return doc + end + + def to_xml_node el1 = XML::Node.new 'node' el1['id'] = self.id.to_s el1['lat'] = self.latitude.to_s @@ -85,8 +91,7 @@ class Node < ActiveRecord::Base Node.split_tags(el1, self.tags) el1['visible'] = self.visible.to_s el1['timestamp'] = self.timestamp.xmlschema - root << el1 - return doc + return el1 end def self.split_tags(el, tags) @@ -97,7 +102,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