Don't pass ActiveRecord objects to find and exists?

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

diff --git a/app/models/tracepoint.rb b/app/models/tracepoint.rb
index 1d9f1bd6bf5e57e24188a0ea83b1e724dc834c2a..c4ad8e1232790f35ab6bec2801224ef0f21403e1 100644 (file)
--- a/app/models/tracepoint.rb
+++ b/app/models/tracepoint.rb
@@ -1,5 +1,7 @@
 class Tracepoint < ActiveRecord::Base
-  set_table_name 'gps_points'
+  include GeoRecord
+
+  self.table_name = "gps_points"
 
   validates_numericality_of :trackid, :only_integer => true
   validates_numericality_of :latitude, :only_integer => true
@@ -8,39 +10,12 @@ class Tracepoint < ActiveRecord::Base
   validates_presence_of :timestamp
 
   belongs_to :trace, :foreign_key => 'gpx_id'
- 
-  before_save :update_tile
-
-  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 update_tile
-    self.tile = QuadTile.tile_for_point(lat, lon)
-  end
-
-  def lat=(l)
-    self.latitude = (l * 10000000).round
-  end
-
-  def lon=(l)
-    self.longitude = (l * 10000000).round
-  end
-
-  def lat
-    return self.latitude.to_f / 10000000
-  end
-
-  def lon
-    return self.longitude.to_f / 10000000
-  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