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

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

diff --git a/app/models/tracepoint.rb b/app/models/tracepoint.rb
index c4ad8e1232790f35ab6bec2801224ef0f21403e1..d36ceb8c3c52606f21e74489ef2eabfeddc97169 100644 (file)
--- a/app/models/tracepoint.rb
+++ b/app/models/tracepoint.rb
@@ -1,21 +1,34 @@
-class Tracepoint < ActiveRecord::Base
+# == 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)
+#
+
+class Tracepoint < ApplicationRecord
   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
-
-  belongs_to :trace, :foreign_key => 'gpx_id'
+  validates :trackid, :numericality => { :only_integer => true }
+  validates :latitude, :longitude, :numericality => { :only_integer => true }
+  validates :trace, :associated => true
+  validates :timestamp, :presence => true
 
-  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
+  belongs_to :trace, :foreign_key => "gpx_id", :inverse_of => :points
 end