Move some javascript functions out of global scope

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

diff --git a/app/models/tracepoint.rb b/app/models/tracepoint.rb
index 70d0f99e8b6c0300e7a92c2486a6f6405afe46e6..398a849d0ef757f840bb3859f4429fae1464e27d 100644 (file)
--- a/app/models/tracepoint.rb
+++ b/app/models/tracepoint.rb
@@ -1,33 +1,21 @@
 class Tracepoint < ActiveRecord::Base
-set_table_name 'gps_points'
+  include GeoRecord
 
-#  validates_numericality_of :latitude
-#  validates_numericality_of :longitude
+  self.table_name = "gps_points"
 
-  belongs_to :user
-  belongs_to :trace, :foreign_key => 'gpx_id'
+  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
 
-  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
+  belongs_to :trace, :foreign_key => "gpx_id"
 
-  def to_xml_node
-    el1 = XML::Node.new 'trkpt'
-    el1['lat'] = self.lat.to_s
-    el1['lon'] = self.lon.to_s
-    return el1
+  def to_xml_node(print_timestamp = false)
+    el1 = XML::Node.new "trkpt"
+    el1["lat"] = lat.to_s
+    el1["lon"] = lon.to_s
+    el1 << (XML::Node.new("time") << timestamp.xmlschema) if print_timestamp
+    el1
   end
-
 end