Potlatch 0.11b

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index f6646503d0e37e0d68e04efbaf01755be4c6195e..0a62d14c0c77890ea67a634db4d0ceb5e6a82700 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -13,6 +13,10 @@ module OSM
     def render_opts
       { :text => "Generic API Error", :status => :internal_server_error, :content_type => "text/plain" }
     end
+
+    def to_s
+      "Generic API Error"
+    end
   end
 
   # Raised when an API object is not found.
@@ -31,12 +35,22 @@ module OSM
     def render_opts
       { :text => "Precondition failed: #{@message}", :status => :precondition_failed, :content_type => "text/plain" }
     end
+
+    def to_s
+      "Precondition failed: #{@message}"
+    end
   end
 
   # Raised when to delete an already-deleted object.
   class APIAlreadyDeletedError < APIError
+    def initialize(object = "object", object_id = "")
+      @object, @object_id = object, object_id
+    end
+    
+    attr_reader :object, :object_id
+    
     def render_opts
-      { :text => "The object has already been deleted", :status => :gone, :content_type => "text/plain" }
+      { :text => "The #{object} with the id #{object_id} has already been deleted", :status => :gone, :content_type => "text/plain" }
     end
   end
 
@@ -65,6 +79,10 @@ module OSM
     def render_opts
       { :text => "You need to supply a changeset to be able to make a change", :status => :conflict, :content_type => "text/plain" }
     end
+    
+    def to_s
+       "You need to supply a changeset to be able to make a change"
+    end
   end
 
   # Raised when a diff is uploaded containing many changeset IDs which don't match
@@ -119,6 +137,10 @@ module OSM
         ", server had: " + latest.to_s + " of " + type + " " + id.to_s, 
         :status => :conflict, :content_type => "text/plain" }
     end
+    
+    def to_s
+       "Version mismatch: Provided " + provided.to_s + ", server had: " + latest.to_s + " of " + type + " " + id.to_s
+    end
   end
 
   # raised when a two tags have a duplicate key string in an element.
@@ -240,7 +262,7 @@ module OSM
   class GeoRSS
     def initialize(feed_title='OpenStreetMap GPS Traces', feed_description='OpenStreetMap GPS Traces', feed_url='http://www.openstreetmap.org/traces/')
       @doc = XML::Document.new
-      @doc.encoding = 'UTF-8' 
+      @doc.encoding = XML::Encoding::UTF_8
 
       rss = XML::Node.new 'rss'
       @doc.root = rss
@@ -326,7 +348,7 @@ module OSM
   class API
     def get_xml_doc
       doc = XML::Document.new
-      doc.encoding = 'UTF-8' 
+      doc.encoding = XML::Encoding::UTF_8
       root = XML::Node.new 'osm'
       root['version'] = API_VERSION
       root['generator'] = GENERATOR