X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9afb35449b066fdef6b4af3b63e30e7f4eb4c5cf..22f7c1f721e5a77786f9f61fa219f262784757ac:/app/models/tracepoint.rb?ds=sidebyside

diff --git a/app/models/tracepoint.rb b/app/models/tracepoint.rb
index e0fcfbd97..9485b8a14 100644
--- a/app/models/tracepoint.rb
+++ b/app/models/tracepoint.rb
@@ -1,46 +1,20 @@
 class Tracepoint < ActiveRecord::Base
-  set_table_name 'gps_points'
+  include GeoRecord
 
-  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
+  self.table_name = "gps_points"
 
-  belongs_to :trace, :foreign_key => 'gpx_id'
- 
-  before_save :update_tile
+  validates :trackid, :numericality => { :only_integer => true }
+  validates :latitude, :longitude, :numericality => { :only_integer => true }
+  validates :trace, :associated => true
+  validates :timestamp, :presence => true
 
-  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 lng=(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
+  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