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

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index a6d74067772c0d415aa98508002d5efc28c3c87d..b6dd64b9986131b04fb6ddf6a1e9043f073a9240 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -5,13 +5,6 @@ module OSM
   require "rexml/text"
   require "xml/libxml"
 
   require "rexml/text"
   require "xml/libxml"
 

-  if defined?(SystemTimer)
-    Timer = SystemTimer
-  else
-    require "timeout"
-    Timer = Timeout
-  end
-

   # The base class for API Errors.
   class APIError < RuntimeError
     def initialize(message = "Generic API Error")
   # The base class for API Errors.
   class APIError < RuntimeError
     def initialize(message = "Generic API Error")


@@ -378,12 +371,17 @@ module OSM
     end
 
     # and these two will give you the right points on your image. all the constants can be reduced to speed things up. FIXME
     end
 
     # and these two will give you the right points on your image. all the constants can be reduced to speed things up. FIXME

+    # If the bbox has no extent, return the centre of the image to avoid dividing by zero.

 
     def y(lat)
 
     def y(lat)

+      return @height / 2 if (@by - @ty).zero?
+

       @height - ((ysheet(lat) - @ty) / (@by - @ty) * @height)
     end
 
     def x(lon)
       @height - ((ysheet(lat) - @ty) / (@by - @ty) * @height)
     end
 
     def x(lon)

+      return @width / 2 if (@bx - @tx).zero?
+

       ((xsheet(lon) - @tx) / (@bx - @tx) * @width)
     end
   end
       ((xsheet(lon) - @tx) / (@bx - @tx) * @width)
     end
   end