X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/14b8e7619f284aa2e95ffdea605783384d202822..6595f97c53b0ba4bda7b31c91df03a105ef72c01:/app/models/tracepoint.rb

diff --git a/app/models/tracepoint.rb b/app/models/tracepoint.rb
index 70d0f99e8..1d9f1bd6b 100644
--- a/app/models/tracepoint.rb
+++ b/app/models/tracepoint.rb
@@ -1,26 +1,40 @@
 class Tracepoint < ActiveRecord::Base
-set_table_name 'gps_points'
+  set_table_name 'gps_points'
 
-#  validates_numericality_of :latitude
-#  validates_numericality_of :longitude
+  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 :user
   belongs_to :trace, :foreign_key => 'gpx_id'
+ 
+  before_save :update_tile
+
+  def self.find_by_area(minlat, minlon, maxlat, maxlon, options)
+    self.with_scope(:find => {:conditions => OSM.sql_for_area(minlat, minlon, maxlat, maxlon)}) do
+      return self.find(:all, options)
+    end
+  end
+
+  def update_tile
+    self.tile = QuadTile.tile_for_point(lat, lon)
+  end
 
   def lat=(l)
-    self.latitude = l * 1000000
+    self.latitude = (l * 10000000).round
   end
 
-  def lng=(l)
-    self.longitude = l * 1000000
+  def lon=(l)
+    self.longitude = (l * 10000000).round
   end
 
   def lat
-    return self.latitude.to_f / 1000000
+    return self.latitude.to_f / 10000000
   end
 
   def lon
-    return self.longitude.to_f / 1000000
+    return self.longitude.to_f / 10000000
   end
 
   def to_xml_node
@@ -29,5 +43,4 @@ set_table_name 'gps_points'
     el1['lon'] = self.lon.to_s
     return el1
   end
-
 end