api06: s/delete_with_relations_and_history/delete_with_history/g

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

diff --git a/app/models/geo_record.rb b/app/models/geo_record.rb
index e675b11e0d354b8d3d43e3bce9717c51302bfb16..ddd029aec0f3db85b1b447928994eab5ac2824cc 100644 (file)
--- a/app/models/geo_record.rb
+++ b/app/models/geo_record.rb
@@ -1,6 +1,14 @@
 class GeoRecord < ActiveRecord::Base
   before_save :update_tile
 
+  # 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)
@@ -29,13 +37,13 @@ class GeoRecord < ActiveRecord::Base
     return self.longitude.to_f / 10000000
   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