X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2803612d9db2f89c4eaa57bbf4606b56967caa62..2f55a3f0a80974922678d7677902d169b3481693:/app/models/node.rb?ds=sidebyside diff --git a/app/models/node.rb b/app/models/node.rb index 91f348f19..230b0f9a7 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 @@ -9,7 +10,6 @@ class Node < ActiveRecord::Base has_many :old_nodes, :foreign_key => :id belongs_to :user - def self.from_xml(xml, create=false) p = XML::Parser.new p.string = xml @@ -87,6 +87,7 @@ class Node < ActiveRecord::Base el1['id'] = self.id.to_s el1['lat'] = self.latitude.to_s el1['lon'] = self.longitude.to_s + el1['user'] = self.user.display_name if self.user.data_public? Node.split_tags(el1, self.tags) el1['visible'] = self.visible.to_s el1['timestamp'] = self.timestamp.xmlschema @@ -101,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