Merge branch 'master' into notes

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 1a22af93a67b2806dbf4515f126a4e3f11fe6454..393011dac563a4e205b7511c6f4a62e7f2c2f769 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -268,6 +268,36 @@ module OSM
     end
   end
 
+  ##
+  # raised when someone tries to redact a current version of
+  # an element - only historical versions can be redacted.
+  class APICannotRedactError < APIError
+    def status
+      :bad_request
+    end
+
+    def to_s
+      "Cannot redact current version of element, only historical versions may be redacted."
+    end
+  end
+
+  # Raised when the note provided is already closed
+  class APINoteAlreadyClosedError < APIError
+    def initialize(note)
+      @note = note
+    end
+
+    attr_reader :note
+
+    def status
+      :conflict
+    end
+
+    def to_s
+      "The note #{@note.id} was closed at #{@note.closed_at}"
+    end
+  end
+
   # Helper methods for going to/from mercator and lat/lng.
   class Mercator
     include Math
@@ -447,6 +477,9 @@ module OSM
       root = XML::Node.new 'osm'
       root['version'] = API_VERSION.to_s
       root['generator'] = GENERATOR
+      root['copyright'] = COPYRIGHT_OWNER
+      root['attribution'] = ATTRIBUTION_URL
+      root['license'] =  LICENSE_URL
       doc.root = root
       return doc
     end