Localisation updates from https://translatewiki.net.

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index e4835a76b57745a86ce83b1205bf05243af74894..66428c13cdca3ef28935f9fe763d455309f74e92 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -475,12 +475,12 @@ module OSM
         lonradius = PI
       end
 
         lonradius = PI
       end
 

-      minlat = (@lat - latradius) * 180 / PI
-      maxlat = (@lat + latradius) * 180 / PI
-      minlon = (@lon - lonradius) * 180 / PI
-      maxlon = (@lon + lonradius) * 180 / PI
+      minlat = [(@lat - latradius) * 180 / PI, -90].max
+      maxlat = [(@lat + latradius) * 180 / PI, 90].min
+      minlon = [(@lon - lonradius) * 180 / PI, -180].max
+      maxlon = [(@lon + lonradius) * 180 / PI, 180].min

 
 

-      { :minlat => minlat, :maxlat => maxlat, :minlon => minlon, :maxlon => maxlon }
+      BoundingBox.new(minlon, minlat, maxlon, maxlat)

     end
 
     # get the SQL to use to calculate distance
     end
 
     # get the SQL to use to calculate distance