Now all the unit tests work

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

diff --git a/app/models/geo_record.rb b/app/models/geo_record.rb
index e675b11e0d354b8d3d43e3bce9717c51302bfb16..28ee037dd0841173aa977ffa141a25335ace8fb6 100644 (file)
--- a/app/models/geo_record.rb
+++ b/app/models/geo_record.rb
@@ -1,6 +1,18 @@
 class GeoRecord < ActiveRecord::Base
   before_save :update_tile
 
+  # This is a scaling factor for going between the lat and lon via the API
+  # and the longitude and latitude that is stored in the database
+  SCALE = 10000000
+
+  # Is this node within -90 <= latitude <= 90 and -180 <= longitude <= 180
+  # * returns true/false
+  def in_world?
+    return false if self.lat < -90 or self.lat > 90
+    return false if self.lon < -180 or self.lon > 180
+    return true
+  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)
@@ -12,30 +24,30 @@ class GeoRecord < ActiveRecord::Base
   end
 
   def lat=(l)
-    self.latitude = (l * 10000000).round
+    self.latitude = (l * SCALE).round
   end
 
   def lon=(l)
-    self.longitude = (l * 10000000).round
+    self.longitude = (l * SCALE).round
   end
 
   # Return WGS84 latitude
   def lat
-    return self.latitude.to_f / 10000000
+    return self.latitude.to_f / SCALE
   end
 
   # Return WGS84 longitude
   def lon
-    return self.longitude.to_f / 10000000
+    return self.longitude.to_f / SCALE
   end
 
-  # fuck knows
+  # Potlatch projections
   def lon_potlatch(baselong,masterscale)
-    (self.lon-baselong)*masterscale+350
+    (self.lon-baselong)*masterscale
   end
 
   def lat_potlatch(basey,masterscale)
-    -(lat2y(self.lat)-basey)*masterscale+250
+    -(lat2y(self.lat)-basey)*masterscale
   end
   
   private