Merge remote-tracking branch 'upstream/pull/5398'

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

diff --git a/app/models/tracepoint.rb b/app/models/tracepoint.rb
index 90de368b551a27210973059f2893e4b9aaeb7aa3..d36ceb8c3c52606f21e74489ef2eabfeddc97169 100644 (file)
--- a/app/models/tracepoint.rb
+++ b/app/models/tracepoint.rb
@@ -1,25 +1,34 @@
-class Tracepoint < ActiveRecord::Base
-set_table_name 'gps_points'
+# == 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)
+#
 
-#  validates_numericality_of :latitude
-#  validates_numericality_of :longitude
+class Tracepoint < ApplicationRecord
+  include GeoRecord
 
-  belongs_to :user
-  belongs_to :trace, :foreign_key => 'gpx_id'
+  self.table_name = "gps_points"
 
-  def lat=(l)
-    self.latitude = l * 1000000
-  end
+  validates :trackid, :numericality => { :only_integer => true }
+  validates :latitude, :longitude, :numericality => { :only_integer => true }
+  validates :trace, :associated => true
+  validates :timestamp, :presence => true
 
-  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
+  belongs_to :trace, :foreign_key => "gpx_id", :inverse_of => :points
 end