Add a maptile_for_point() function for MySQL to work out which slippy

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index d7a52c33617aaaedeaa4a0b1387555a8a701ac1c..c63738fc48e3b8e4a89c8fbf5c425a6905d67b32 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -7,14 +7,42 @@ class OldNode < ActiveRecord::Base
   validate :validate_position
 
   belongs_to :user
   validate :validate_position
 
   belongs_to :user

+ 
+  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 * 10000000).round
+  end
+
+  def lon=(l)
+    self.longitude = (l * 10000000).round
+  end
+
+  def lat
+    return self.latitude.to_f / 10000000
+  end
+
+  def lon
+    return self.longitude.to_f / 10000000
+  end

 
   def validate_position
     errors.add_to_base("Node is not in the world") unless in_world?
   end
 
   def in_world?
 
   def validate_position
     errors.add_to_base("Node is not in the world") unless in_world?
   end
 
   def in_world?

-    return false if self.latitude < -90 or self.latitude > 90
-    return false if self.longitude < -180 or self.longitude > 180
+    return false if self.lat < -90 or self.lat > 90
+    return false if self.lon < -180 or self.lon > 180

     return true
   end
 
     return true
   end
 


@@ -33,8 +61,8 @@ class OldNode < ActiveRecord::Base
   def to_xml_node
     el1 = XML::Node.new 'node'
     el1['id'] = self.id.to_s
   def to_xml_node
     el1 = XML::Node.new 'node'
     el1['id'] = self.id.to_s

-    el1['lat'] = self.latitude.to_s
-    el1['lon'] = self.longitude.to_s
+    el1['lat'] = self.lat.to_s
+    el1['lon'] = self.lon.to_s

     el1['user'] = self.user.display_name if self.user.data_public?
     Node.split_tags(el1, self.tags)
     el1['visible'] = self.visible.to_s
     el1['user'] = self.user.display_name if self.user.data_public?
     Node.split_tags(el1, self.tags)
     el1['visible'] = self.visible.to_s