Fill in the tile ID before saving a trace point. Also add appropriate

validation to the tracepoint model.

diff --git a/app/models/tracepoint.rb b/app/models/tracepoint.rb
index a8212d48221bde8b90f3dcf76626729b4a818703..e48a2748d16b86b3965c415f884cb1e7112946b2 100644 (file)
--- a/app/models/tracepoint.rb
+++ b/app/models/tracepoint.rb
@@ -1,24 +1,32 @@
 class Tracepoint < ActiveRecord::Base
   set_table_name 'gps_points'
 
 class Tracepoint < ActiveRecord::Base
   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'
  
   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 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)
   def lat=(l)

-    self.latitude = l * 1000000
+    self.latitude = (l * 1000000).round

   end
 
   def lng=(l)
   end
 
   def lng=(l)

-    self.longitude = l * 1000000
+    self.longitude = (l * 1000000).round

   end
 
   def lat
   end
 
   def lat