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

[rails.git] / lib / quad_tile.rb

diff --git a/lib/quad_tile.rb b/lib/quad_tile.rb
index 8aee1b74a984670d80d58734b77af4ba24c0c397..931ec04a3c60eae984b0b398be3c6b7eeaa8c17d 100644 (file)
--- a/lib/quad_tile.rb
+++ b/lib/quad_tile.rb
@@ -1,7 +1,7 @@
 module QuadTile
   begin
     require "quad_tile/quad_tile_so"
-  rescue MissingSourceFile
+  rescue LoadError
     def self.tile_for_point(lat, lon)
       x = ((lon.to_f + 180) * 65535 / 360).round
       y = ((lat.to_f + 90) * 65535 / 180).round
@@ -72,7 +72,7 @@ module QuadTile
       end
     end
 
-    sql.push("#{prefix}tile IN (#{single.join(',')})") if single.size > 0
+    sql.push("#{prefix}tile IN (#{single.join(',')})") unless single.empty?
 
     "( " + sql.join(" OR ") + " )"
   end