X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/183ffc78648938ca079f7ea5f899d3e71e829333..28839fd1504004bd10f30eeba3d7212c77adfbb4:/lib/osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 223e351f4..128e65aac 100644
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -17,6 +17,9 @@ module OSM
 
   # Raised when an API object is not found.
   class APINotFoundError < APIError
+    def render_opts
+      { :nothing => true, :status => :not_found }
+    end
   end
 
   # Raised when a precondition to an API action fails sanity check.
@@ -95,15 +98,16 @@ module OSM
 
   # Raised when the provided version is not equal to the latest in the db.
   class APIVersionMismatchError < APIError
-    def initialize(provided, latest)
-      @provided, @latest = provided, latest
+    def initialize(id, type, provided, latest)
+      @id, @type, @provided, @latest = id, type, provided, latest
     end
 
-    attr_reader :provided, :latest
+    attr_reader :provided, :latest, :id, :type
 
     def render_opts
       { :text => "Version mismatch: Provided " + provided.to_s +
-      ", server had: " + latest.to_s, :status => :conflict }
+        ", server had: " + latest.to_s + " of " + type + " " + id.to_s, 
+        :status => :conflict }
     end
   end