X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/042388418411da6facdfe6ae590df6c17f85e88c..97cb1fd7fa2916974538fde2a6ea311a3f793989:/app/models/tracepoint.rb?ds=sidebyside

diff --git a/app/models/tracepoint.rb b/app/models/tracepoint.rb
index a8212d482..8648e555d 100644
--- a/app/models/tracepoint.rb
+++ b/app/models/tracepoint.rb
@@ -1,33 +1,13 @@
-class Tracepoint < ActiveRecord::Base
+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'
- 
-  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
     el1 = XML::Node.new 'trkpt'