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

diff --git a/app/models/tracepoint.rb b/app/models/tracepoint.rb
index a8212d482..6473c9430 100644
--- a/app/models/tracepoint.rb
+++ b/app/models/tracepoint.rb
@@ -1,38 +1,42 @@
-class Tracepoint < ActiveRecord::Base
-  set_table_name 'gps_points'
-
-#  validates_numericality_of :latitude
-#  validates_numericality_of :longitude
+# == Schema Information
+#
+# Table name: gps_points
+#
+#  altitude  :float
+#  trackid   :integer          not null
+#  latitude  :integer          not null
+#  longitude :integer          not null
+#  gpx_id    :bigint(8)        not null
+#  timestamp :datetime
+#  tile      :bigint(8)
+#
+# Indexes
+#
+#  points_gpxid_idx  (gpx_id)
+#  points_tile_idx   (tile)
+#
+# Foreign Keys
+#
+#  gps_points_gpx_id_fkey  (gpx_id => gpx_files.id)
+#
 
-  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
+class Tracepoint < ActiveRecord::Base
+  include GeoRecord
 
-  def lng=(l)
-    self.longitude = l * 1000000
-  end
+  self.table_name = "gps_points"
 
-  def lat
-    return self.latitude.to_f / 1000000
-  end
+  validates :trackid, :numericality => { :only_integer => true }
+  validates :latitude, :longitude, :numericality => { :only_integer => true }
+  validates :trace, :associated => true
+  validates :timestamp, :presence => true
 
-  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