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

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

diff --git a/app/models/tracepoint.rb b/app/models/tracepoint.rb
index 445688c5554389e66aa90b6e77fb8dca6b354c67..d36ceb8c3c52606f21e74489ef2eabfeddc97169 100644 (file)
--- a/app/models/tracepoint.rb
+++ b/app/models/tracepoint.rb
@@ -6,9 +6,9 @@
 #  trackid   :integer          not null
 #  latitude  :integer          not null
 #  longitude :integer          not null
 #  trackid   :integer          not null
 #  latitude  :integer          not null
 #  longitude :integer          not null

-#  gpx_id    :integer          not null
+#  gpx_id    :bigint(8)        not null

 #  timestamp :datetime
 #  timestamp :datetime

-#  tile      :integer
+#  tile      :bigint(8)

 #
 # Indexes
 #
 #
 # Indexes
 #


@@ -20,7 +20,7 @@
 #  gps_points_gpx_id_fkey  (gpx_id => gpx_files.id)
 #
 
 #  gps_points_gpx_id_fkey  (gpx_id => gpx_files.id)
 #
 

-class Tracepoint < ActiveRecord::Base
+class Tracepoint < ApplicationRecord

   include GeoRecord
 
   self.table_name = "gps_points"
   include GeoRecord
 
   self.table_name = "gps_points"


@@ -30,13 +30,5 @@ class Tracepoint < ActiveRecord::Base
   validates :trace, :associated => true
   validates :timestamp, :presence => true
 
   validates :trace, :associated => true
   validates :timestamp, :presence => true
 

-  belongs_to :trace, :foreign_key => "gpx_id"
-
-  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
+  belongs_to :trace, :foreign_key => "gpx_id", :inverse_of => :points

 end
 end