Fix some rubocop Naming/PredicateName warnings

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index a6d74067772c0d415aa98508002d5efc28c3c87d..ee0b8d9030ee719c769cdb0039edef17d8631e01 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")


@@ -244,6 +237,24 @@ module OSM
     end
   end
 
     end
   end
 

+  # Raised when a relation has more than the configured number of relation members.
+  # This prevents relations from being too complex and difficult to work with
+  class APITooManyRelationMembersError < APIError
+    def initialize(id, provided, max)
+      super "You tried to add #{provided} members to relation #{id}, however only #{max} are allowed"
+
+      @id = id
+      @provided = provided
+      @max = max
+    end
+
+    attr_reader :id, :provided, :max
+
+    def status
+      :bad_request
+    end
+  end
+

   ##
   # raised when user input couldn't be parsed
   class APIBadUserInput < APIError
   ##
   # raised when user input couldn't be parsed
   class APIBadUserInput < APIError


@@ -378,12 +389,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


@@ -476,7 +492,7 @@ module OSM
 
   # Construct a random token of a given length
   def self.make_token(length = 30)
 
   # Construct a random token of a given length
   def self.make_token(length = 30)

-    chars = "abcdefghijklmnopqrtuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+    chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"

     token = ""
 
     length.times do
     token = ""
 
     length.times do