Altered a functional test on way_tags.

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 3ddf10f989c0572a48b3480059b419417d7e5756..ae8b81f5b13f1433f8fa3162cdeded0592c27f64 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,22 @@ 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
+
+  # raised when a two tags have a duplicate key string in an element.
+  # this is now forbidden by the API.
+  class APIDuplicateTagsError < APIError
+    def initialize(type, id, tag_key)
+      @type, @id, @tag_key = type, id, tag_key
+    end
+
+    attr_reader :type, :id, :tag_key
+
+    def render_opts
+      { :text => "Element #{@type}/#{@id} has duplicate tags with key #{@tag_key}.",
+        :status => :bad_request }
     end
   end