rails_port_0.5: Merge rails_port.

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

diff --git a/app/models/tracepoint.rb b/app/models/tracepoint.rb
index a8212d48221bde8b90f3dcf76626729b4a818703..1d9f1bd6bf5e57e24188a0ea83b1e724dc834c2a 100644 (file)
--- a/app/models/tracepoint.rb
+++ b/app/models/tracepoint.rb
@@ -1,32 +1,40 @@
 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 * 10000000).round

   end
 
   end
 

-  def lng=(l)
-    self.longitude = l * 1000000
+  def lon=(l)
+    self.longitude = (l * 10000000).round

   end
 
   def lat
   end
 
   def lat

-    return self.latitude.to_f / 1000000
+    return self.latitude.to_f / 10000000

   end
 
   def lon
   end
 
   def lon

-    return self.longitude.to_f / 1000000
+    return self.longitude.to_f / 10000000

   end
 
   def to_xml_node
   end
 
   def to_xml_node