Merge remote-tracking branch 'upstream/pull/1800'

[rails.git] / lib / quad_tile.rb

diff --git a/lib/quad_tile.rb b/lib/quad_tile.rb
index 1f7e6e501148a241be67d290a0d1d52bf28f3d2c..931ec04a3c60eae984b0b398be3c6b7eeaa8c17d 100644 (file)
--- a/lib/quad_tile.rb
+++ b/lib/quad_tile.rb
@@ -1,19 +1,19 @@
 module QuadTile
   begin
     require "quad_tile/quad_tile_so"
 module QuadTile
   begin
     require "quad_tile/quad_tile_so"

-  rescue MissingSourceFile
+  rescue LoadError

     def self.tile_for_point(lat, lon)
     def self.tile_for_point(lat, lon)

-      x = ((lon + 180) * 65535 / 360).round
-      y = ((lat + 90) * 65535 / 180).round
+      x = ((lon.to_f + 180) * 65535 / 360).round
+      y = ((lat.to_f + 90) * 65535 / 180).round

 
 

-      return tile_for_xy(x, y)
+      tile_for_xy(x, y)

     end
 
     end
 

-    def self.tiles_for_area(minlat, minlon, maxlat, maxlon)
-      minx = ((minlon + 180) * 65535 / 360).round
-      maxx = ((maxlon + 180) * 65535 / 360).round
-      miny = ((minlat + 90) * 65535 / 180).round
-      maxy = ((maxlat + 90) * 65535 / 180).round
+    def self.tiles_for_area(bbox)
+      minx = ((bbox.min_lon + 180) * 65535 / 360).round
+      maxx = ((bbox.max_lon + 180) * 65535 / 360).round
+      miny = ((bbox.min_lat + 90) * 65535 / 180).round
+      maxy = ((bbox.max_lat + 90) * 65535 / 180).round

       tiles = []
 
       minx.upto(maxx) do |x|
       tiles = []
 
       minx.upto(maxx) do |x|


@@ -22,7 +22,7 @@ module QuadTile
         end
       end
 
         end
       end
 

-      return tiles
+      tiles

     end
 
     def self.tile_for_xy(x, y)
     end
 
     def self.tile_for_xy(x, y)


@@ -30,18 +30,18 @@ module QuadTile
 
       16.times do
         t = t << 1
 
       16.times do
         t = t << 1

-        t = t | 1 unless (x & 0x8000).zero?
+        t |= 1 unless (x & 0x8000).zero?

         x <<= 1
         t = t << 1
         x <<= 1
         t = t << 1

-        t = t | 1 unless (y & 0x8000).zero?
+        t |= 1 unless (y & 0x8000).zero?

         y <<= 1
       end
 
         y <<= 1
       end
 

-      return t
+      t

     end
 
     end
 

-    def self.iterate_tiles_for_area(minlat, minlon, maxlat, maxlon)
-      tiles = tiles_for_area(minlat, minlon, maxlat, maxlon)
+    def self.iterate_tiles_for_area(bbox)
+      tiles = tiles_for_area(bbox)

       first = last = nil
 
       tiles.sort.each do |tile|
       first = last = nil
 
       tiles.sort.each do |tile|


@@ -60,11 +60,11 @@ module QuadTile
     end
   end
 
     end
   end
 

-  def self.sql_for_area(minlat, minlon, maxlat, maxlon, prefix)
-    sql = Array.new
-    single = Array.new
+  def self.sql_for_area(bbox, prefix)
+    sql = []
+    single = []

 
 

-    iterate_tiles_for_area(minlat, minlon, maxlat, maxlon) do |first,last|
+    iterate_tiles_for_area(bbox) do |first, last|

       if first == last
         single.push(first)
       else
       if first == last
         single.push(first)
       else


@@ -72,9 +72,9 @@ module QuadTile
       end
     end
 
       end
     end
 

-    sql.push("#{prefix}tile IN (#{single.join(',')})") if single.size > 0
+    sql.push("#{prefix}tile IN (#{single.join(',')})") unless single.empty?

 
 

-    return "( " + sql.join(" OR ") + " )"
+    "( " + sql.join(" OR ") + " )"

   end
 
   private_class_method :tile_for_xy, :iterate_tiles_for_area
   end
 
   private_class_method :tile_for_xy, :iterate_tiles_for_area