Merge branch 'master' into openstreetbugs

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

diff --git a/app/models/tracepoint.rb b/app/models/tracepoint.rb
index a8212d48221bde8b90f3dcf76626729b4a818703..d4ba39de39368419f2a2434c0ba5acfb2d8a6493 100644 (file)
--- a/app/models/tracepoint.rb
+++ b/app/models/tracepoint.rb
@@ -1,38 +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 self.find_by_area(minlat, minlon, maxlat, maxlon, options)
-    self.with_scope(:find => {:conditions => OSM.sql_for_area(minlat, minlon, maxlat, maxlon)}) do
-      return self.find(:all, options)
-    end
-  end
-
-  def lat=(l)
-    self.latitude = l * 1000000
-  end
-
-  def lng=(l)
-    self.longitude = l * 1000000
-  end
-
-  def lat
-    return self.latitude.to_f / 1000000
-  end
-
-  def lon
-    return self.longitude.to_f / 1000000
-  end
 
-  def to_xml_node
+  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