Merge branch 'master' into openstreetbugs

[rails.git] / app / models / tracepoint.rb

diff --git a/app/models/tracepoint.rb b/app/models/tracepoint.rb
index 9de8dc548a04ece9a2b5642cbe8feb685fab2bab..d4ba39de39368419f2a2434c0ba5acfb2d8a6493 100644 (file)
--- a/app/models/tracepoint.rb
+++ b/app/models/tracepoint.rb
@@ -1,9 +1,21 @@
 class Tracepoint < ActiveRecord::Base
+  include GeoRecord
+
   set_table_name 'gps_points'
 
-  validates_numericality_of :latitude
-  validates_numericality_of :longitude
+  validates_numericality_of :trackid, :only_integer => true
+  validates_numericality_of :latitude, :only_integer => true
+  validates_numericality_of :longitude, :only_integer => true
+  validates_associated :trace
+  validates_presence_of :timestamp
 
-  belongs_to :user
   belongs_to :trace, :foreign_key => 'gpx_id'
+
+  def to_xml_node(print_timestamp = false)
+    el1 = XML::Node.new 'trkpt'
+    el1['lat'] = self.lat.to_s
+    el1['lon'] = self.lon.to_s
+    el1 << (XML::Node.new("time") << self.timestamp.xmlschema) if print_timestamp
+    return el1
+  end
 end