reverting the javascript change in changeset 10926, that needs to be specific to...

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index a64aa8c4870afc4ee2331ef49769682f318467d3..e0e83845ea4b33ece2dda45f0c0ff3368d73feee 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -33,6 +33,20 @@ module OSM
     end
   end
 
+  # Raised when the user logged in isn't the same as the changeset
+  class APIUserChangesetMismatchError < APIError
+    def render_opts
+      { :text => "The user doesn't own that changeset", :status => :conflict }
+    end
+  end
+
+  # Raised when the changeset provided is already closed
+  class APIChangesetAlreadyClosedError < APIError
+    def render_opts
+      { :text => "The supplied changeset has already been closed", :status => :conflict }
+    end
+  end
+
   # Raised when the provided version is not equal to the latest in the db.
   class APIVersionMismatchError < APIError
     def initialize(provided, latest)
@@ -43,7 +57,7 @@ module OSM
 
     def render_opts
       { :text => "Version mismatch: Provided " + provided.to_s +
-       ", server had: " + latest.to_s, :status => :bad_request }
+      ", server had: " + latest.to_s, :status => :conflict }
     end
   end