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

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index a0fcef8b9f2cf86a238844b0b5170f8dd0552fde..46f37036f92d796243960cf1c7c8b63fdd91244e 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -364,6 +364,17 @@ module OSM
     end
   end
 
     end
   end
 

+  # Raised when a size limit is exceeded
+  class APISizeLimitExceeded < APIError
+    def initialize
+      super("Size limit exceeded")
+    end
+
+    def status
+      :payload_too_large
+    end
+  end
+

   # Helper methods for going to/from mercator and lat/lng.
   class Mercator
     include Math
   # Helper methods for going to/from mercator and lat/lng.
   class Mercator
     include Math


@@ -524,7 +535,8 @@ module OSM
 
   # Return the HTTP client to use
   def self.http_client
 
   # Return the HTTP client to use
   def self.http_client

-    @http_client ||= Faraday.new(:request => { :timeout => 15 })
+    @http_client ||= Faraday.new(:request => { :timeout => 15 },
+                                 :headers => { :user_agent => Settings.server_url })

   end
 
   # Return the MaxMindDB database handle
   end
 
   # Return the MaxMindDB database handle