Potlatch 1.0

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 2745762064c5f342d67d8a13d6146df3a65786c1..885d1e35821961d998e85bf78e75eff081a9ff57 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -133,13 +133,12 @@ module OSM
     attr_reader :provided, :latest, :id, :type
 
     def render_opts
-      { :text => "Version mismatch: Provided " + provided.to_s +
-        ", server had: " + latest.to_s + " of " + type + " " + id.to_s, 
+      { :text => "Version mismatch: Provided #{provided}, server had: #{latest} of #{type} #{id}",
         :status => :conflict, :content_type => "text/plain" }
     end
     
     def to_s
-       "Version mismatch: Provided " + provided.to_s + ", server had: " + latest.to_s + " of " + type + " " + id.to_s
+       "Version mismatch: Provided #{provided}, server had: #{latest} of #{type} #{id}"
     end
   end
 
@@ -197,6 +196,18 @@ module OSM
     end
   end
 
+  ##
+  # raised when an API call takes too long
+  class APITimeoutError < APIError
+    def render_opts
+      { :text => "Request timed out", :status => :request_timeout }
+    end
+
+    def to_s
+      "Request timed out"
+    end
+  end
+
   # Helper methods for going to/from mercator and lat/lng.
   class Mercator
     include Math