Fixed node functional tests. A couple of changes to the old_node model and node contr...

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 3ddf10f989c0572a48b3480059b419417d7e5756..82fc835b4ad8c17e684ae6565604f5bd16976245 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -46,6 +46,13 @@ module OSM
       { :text => "The supplied changeset has already been closed", :status => :conflict }
     end
   end
+  
+  # Raised when a change is expecting a changeset, but the changeset doesn't exist
+  class APIChangesetMissingError < APIError
+    def render_opts
+      { :text => "You need to supply a changeset to be able to make a change", :status => :conflict }
+    end
+  end
 
   # Raised when the provided version is not equal to the latest in the db.
   class APIVersionMismatchError < APIError
@@ -57,7 +64,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