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

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

diff --git a/app/models/tracepoint.rb b/app/models/tracepoint.rb
index 398a849d0ef757f840bb3859f4429fae1464e27d..445688c5554389e66aa90b6e77fb8dca6b354c67 100644 (file)
--- a/app/models/tracepoint.rb
+++ b/app/models/tracepoint.rb
@@ -1,13 +1,34 @@
+# == Schema Information
+#
+# Table name: gps_points
+#
+#  altitude  :float
+#  trackid   :integer          not null
+#  latitude  :integer          not null
+#  longitude :integer          not null
+#  gpx_id    :integer          not null
+#  timestamp :datetime
+#  tile      :integer
+#
+# Indexes
+#
+#  points_gpxid_idx  (gpx_id)
+#  points_tile_idx   (tile)
+#
+# Foreign Keys
+#
+#  gps_points_gpx_id_fkey  (gpx_id => gpx_files.id)
+#
+

 class Tracepoint < ActiveRecord::Base
   include GeoRecord
 
   self.table_name = "gps_points"
 
 class Tracepoint < ActiveRecord::Base
   include GeoRecord
 
   self.table_name = "gps_points"
 

-  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
+  validates :trackid, :numericality => { :only_integer => true }
+  validates :latitude, :longitude, :numericality => { :only_integer => true }
+  validates :trace, :associated => true
+  validates :timestamp, :presence => true

 
   belongs_to :trace, :foreign_key => "gpx_id"
 
 
   belongs_to :trace, :foreign_key => "gpx_id"