Fix: local chapter filtering is duplicating the logic elsewhere in the file.

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 51e98f4aea86add9b98eb464afcc2e79646c9cf9..005d3ebb848fcd5c109fac687872b2a6d704ba76 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -371,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
+    # If the bbox has no extent, return the centre of the image to avoid dividing by zero.
 
     def y(lat)
+      return @height / 2 if (@by - @ty).zero?
+
       @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
@@ -469,7 +474,7 @@ module OSM
 
   # Construct a random token of a given length
   def self.make_token(length = 30)
-    chars = "abcdefghijklmnopqrtuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+    chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
     token = ""
 
     length.times do