Convert @user to current_user in helpers

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

diff --git a/app/models/tracepoint.rb b/app/models/tracepoint.rb
index d4ba39de39368419f2a2434c0ba5acfb2d8a6493..9485b8a14086b7d291c42eb24ff85a2fa4ee689c 100644 (file)
--- a/app/models/tracepoint.rb
+++ b/app/models/tracepoint.rb
@@ -1,21 +1,20 @@
 class Tracepoint < ActiveRecord::Base
   include GeoRecord
 
-  set_table_name 'gps_points'
+  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"
 
   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
+    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
 end