undo composite keys change on old_ndoe

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

diff --git a/app/models/tracepoint.rb b/app/models/tracepoint.rb
index 70d0f99e8b6c0300e7a92c2486a6f6405afe46e6..8648e555d2ec4c62fd9332fc6fd3bfbb6e9530e2 100644 (file)
--- a/app/models/tracepoint.rb
+++ b/app/models/tracepoint.rb
@@ -1,33 +1,18 @@
-class Tracepoint < ActiveRecord::Base
-set_table_name 'gps_points'
+class Tracepoint < 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'
 
   belongs_to :trace, :foreign_key => 'gpx_id'
 

-  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
     el1 = XML::Node.new 'trkpt'
     el1['lat'] = self.lat.to_s
     el1['lon'] = self.lon.to_s
     return el1
   end
   def to_xml_node
     el1 = XML::Node.new 'trkpt'
     el1['lat'] = self.lat.to_s
     el1['lon'] = self.lon.to_s
     return el1
   end

-

 end
 end