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 9485b8a14086b7d291c42eb24ff85a2fa4ee689c..d36ceb8c3c52606f21e74489ef2eabfeddc97169 100644 (file)
--- a/app/models/tracepoint.rb
+++ b/app/models/tracepoint.rb
@@ -1,4 +1,26 @@
-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"
   include GeoRecord
 
   self.table_name = "gps_points"


@@ -8,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