From: Richard Fairhurst <richard@systemed.net>
Date: Wed, 22 Apr 2009 17:47:06 +0000 (+0000)
Subject: change relation_member 'type' case, to match change in database
X-Git-Tag: live~7532
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/0a682b9da677b8e57f7960741dbff554e1a71cc1?hp=d7663e7d142093cbcc8340d12bfb74a35ba108c1

change relation_member 'type' case, to match change in database
---

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 1af78796c..7f1bae483 100644
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -492,7 +492,6 @@ class AmfController < ApplicationController
       new_relation.changeset_id = changeset_id
       new_relation.version = version
 
-      # NOTE: id or relid here? id doesn't seem to be set above
       if relid <= 0
         # We're creating the node
         new_relation.create_with_history(user)
@@ -521,7 +520,7 @@ class AmfController < ApplicationController
     return [-1, "The relation has already been deleted."]
   rescue OSM::APIError => ex
     # Some error that we don't specifically catch
-    return [-2, "An unusual error happened (in 'putrelation')."]
+    return [-2, "An unusual error happened (in 'putrelation' #{relid})."]
   end
 
   # Save a way to the database, including all nodes. Any nodes in the previous
@@ -645,7 +644,7 @@ class AmfController < ApplicationController
     return [-1, "The point has already been deleted."]
   rescue OSM::APIError => ex
     # Some error that we don't specifically catch
-    return [-2, "An unusual error happened (in 'putway')."]
+    return [-2, "An unusual error happened (in 'putway' #{originalway})."]
   end
 
   # Save POI to the database.
@@ -708,7 +707,7 @@ class AmfController < ApplicationController
     return [-1, "The point has already been deleted"]
   rescue OSM::APIError => ex
     # Some error that we don't specifically catch
-    return [-2, "An unusual error happened (in 'putpoi')."]
+    return [-2, "An unusual error happened (in 'putpoi' #{id})."]
   end
 
   # Read POI from database
@@ -783,7 +782,7 @@ class AmfController < ApplicationController
     return [-1, "The way has already been deleted."]
   rescue OSM::APIError => ex
     # Some error that we don't specifically catch
-    return [-2, "An unusual error happened (in 'deleteway')."]
+    return [-2, "An unusual error happened (in 'deleteway' #{way_id})."]
   end
 
 
diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf
index 1d248292c..f17016658 100755
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ