fix build on wily; fix some moderation branch language constants

[rails.git] / test / controllers / amf_controller_test.rb

diff --git a/test/controllers/amf_controller_test.rb b/test/controllers/amf_controller_test.rb
index 073b8223545d51b5581030825ac5090978fe1fa8..09b88e98f7ab378e7b3d63b10a4632da22bd2678 100644 (file)
--- a/test/controllers/amf_controller_test.rb
+++ b/test/controllers/amf_controller_test.rb
@@ -1,5 +1,5 @@
-require 'test_helper'
-require 'stringio'
+require "test_helper"
+require "stringio"

 include Potlatch
 
 class AmfControllerTest < ActionController::TestCase
 include Potlatch
 
 class AmfControllerTest < ActionController::TestCase


@@ -18,13 +18,40 @@ class AmfControllerTest < ActionController::TestCase
     )
   end
 
     )
   end
 

+  def test_getpresets
+    [:public_user, :german_user].each do |id|
+      user = users(id)
+
+      amf_content "getpresets", "/1", ["#{user.email}:test", ""]
+      post :amf_read
+      assert_response :success
+      amf_parse_response
+      presets = amf_result("/1")
+
+      assert_equal 15, presets.length
+      assert_equal POTLATCH_PRESETS[0], presets[0]
+      assert_equal POTLATCH_PRESETS[1], presets[1]
+      assert_equal POTLATCH_PRESETS[2], presets[2]
+      assert_equal POTLATCH_PRESETS[3], presets[3]
+      assert_equal POTLATCH_PRESETS[4], presets[4]
+      assert_equal POTLATCH_PRESETS[5], presets[5]
+      assert_equal POTLATCH_PRESETS[6], presets[6]
+      assert_equal POTLATCH_PRESETS[7], presets[7]
+      assert_equal POTLATCH_PRESETS[8], presets[8]
+      assert_equal POTLATCH_PRESETS[9], presets[9]
+      assert_equal POTLATCH_PRESETS[10], presets[10]
+      assert_equal POTLATCH_PRESETS[12], presets[12]
+      assert_equal user.languages.first, presets[13]["__potlatch_locale"]
+    end
+  end
+

   def test_getway
     # check a visible way
     id = current_ways(:visible_way).id
     amf_content "getway", "/1", [id]
     post :amf_read
     assert_response :success
   def test_getway
     # check a visible way
     id = current_ways(:visible_way).id
     amf_content "getway", "/1", [id]
     post :amf_read
     assert_response :success

-    amf_parse_response                                         
+    amf_parse_response

     way = amf_result("/1")
     assert_equal 0, way[0]
     assert_equal "", way[1]
     way = amf_result("/1")
     assert_equal 0, way[0]
     assert_equal "", way[1]


@@ -46,7 +73,7 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal -4, way[0], -4
     assert_equal "way", way[1]
     assert_equal id, way[2]
     assert_equal -4, way[0], -4
     assert_equal "way", way[1]
     assert_equal id, way[2]

-    assert way[3].nil? and way[4].nil? and way[5].nil? and way[6].nil?
+    assert(way[3].nil?) && way[4].nil? && way[5].nil? && way[6].nil?

   end
 
   def test_getway_with_versions
   end
 
   def test_getway_with_versions


@@ -55,7 +82,7 @@ class AmfControllerTest < ActionController::TestCase
     amf_content "getway", "/1", [id]
     post :amf_read
     assert_response :success
     amf_content "getway", "/1", [id]
     post :amf_read
     assert_response :success

-    amf_parse_response                                         
+    amf_parse_response

     way = amf_result("/1")
     assert_equal 0, way[0]
     assert_equal "", way[1]
     way = amf_result("/1")
     assert_equal 0, way[0]
     assert_equal "", way[1]


@@ -72,7 +99,7 @@ class AmfControllerTest < ActionController::TestCase
     amf_content "getway", "/1", [id]
     post :amf_read
     assert_response :success
     amf_content "getway", "/1", [id]
     post :amf_read
     assert_response :success

-    amf_parse_response                                         
+    amf_parse_response

     way = amf_result("/1")
     assert_equal 0, way[0]
     assert_equal "", way[1]
     way = amf_result("/1")
     assert_equal 0, way[0]
     assert_equal "", way[1]


@@ -90,7 +117,7 @@ class AmfControllerTest < ActionController::TestCase
     amf_content "getway", "/1", [id]
     post :amf_read
     assert_response :success
     amf_content "getway", "/1", [id]
     post :amf_read
     assert_response :success

-    amf_parse_response                                         
+    amf_parse_response

     way = amf_result("/1")
     assert_equal 0, way[0]
     assert_equal "", way[1]
     way = amf_result("/1")
     assert_equal 0, way[0]
     assert_equal "", way[1]


@@ -98,7 +125,7 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal 3, way[3].length
     assert_equal 4, way[3][0][2]
     assert_equal 15, way[3][1][2]
     assert_equal 3, way[3].length
     assert_equal 4, way[3][0][2]
     assert_equal 15, way[3][1][2]

-    assert_equal 6, way[3][2][2]
+    assert_equal 11, way[3][2][2]

     assert_equal 2, way[5]
     assert_equal 2, way[6]
   end
     assert_equal 2, way[5]
     assert_equal 2, way[6]
   end


@@ -113,67 +140,67 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal -4, way[0]
     assert_equal "way", way[1]
     assert_equal 0, way[2]
     assert_equal -4, way[0]
     assert_equal "way", way[1]
     assert_equal 0, way[2]

-    assert way[3].nil? and way[4].nil? and way[5].nil? and way[6].nil?
+    assert(way[3].nil?) && way[4].nil? && way[5].nil? && way[6].nil?

   end
 
   def test_whichways
     node = current_nodes(:used_node_1)
   end
 
   def test_whichways
     node = current_nodes(:used_node_1)

-    minlon = node.lon-0.1
-    minlat = node.lat-0.1
-    maxlon = node.lon+0.1
-    maxlat = node.lat+0.1
+    minlon = node.lon - 0.1
+    minlat = node.lat - 0.1
+    maxlon = node.lon + 0.1
+    maxlat = node.lat + 0.1

     amf_content "whichways", "/1", [minlon, minlat, maxlon, maxlat]
     post :amf_read
     assert_response :success
     amf_content "whichways", "/1", [minlon, minlat, maxlon, maxlat]
     post :amf_read
     assert_response :success

-    amf_parse_response 
+    amf_parse_response

 
     # check contents of message
     map = amf_result "/1"
 
     # check contents of message
     map = amf_result "/1"

-    assert_equal 0, map[0], 'map error code should be 0'
-    assert_equal "", map[1], 'map error text should be empty'
+    assert_equal 0, map[0], "map error code should be 0"
+    assert_equal "", map[1], "map error text should be empty"

 
     # check the formatting of the message
 
     # check the formatting of the message

-    assert_equal 5, map.length, 'map should have length 5'
+    assert_equal 5, map.length, "map should have length 5"

     assert_equal Array, map[2].class, 'map "ways" element should be an array'
     assert_equal Array, map[3].class, 'map "nodes" element should be an array'
     assert_equal Array, map[4].class, 'map "relations" element should be an array'
     map[2].each do |w|
     assert_equal Array, map[2].class, 'map "ways" element should be an array'
     assert_equal Array, map[3].class, 'map "nodes" element should be an array'
     assert_equal Array, map[4].class, 'map "relations" element should be an array'
     map[2].each do |w|

-      assert_equal 2, w.length, 'way should be (id, version) pair'
-      assert w[0] == w[0].floor, 'way ID should be an integer'
-      assert w[1] == w[1].floor, 'way version should be an integer'
+      assert_equal 2, w.length, "way should be (id, version) pair"
+      assert w[0] == w[0].floor, "way ID should be an integer"
+      assert w[1] == w[1].floor, "way version should be an integer"

     end
 
     map[3].each do |n|
     end
 
     map[3].each do |n|

-      assert_equal 5, w.length, 'node should be (id, lat, lon, [tags], version) tuple'
-      assert n[0] == n[0].floor, 'node ID should be an integer'
-      assert n[1] >= minlat - 0.01, 'node lat should be greater than min'
-      assert n[1] <= maxlat - 0.01, 'node lat should be less than max'
-      assert n[2] >= minlon - 0.01, 'node lon should be greater than min'
-      assert n[2] <= maxlon - 0.01, 'node lon should be less than max'
-      assert_equal Array, a[3].class, 'node tags should be array'
-      assert n[4] == n[4].floor, 'node version should be an integer'
+      assert_equal 5, w.length, "node should be (id, lat, lon, [tags], version) tuple"
+      assert n[0] == n[0].floor, "node ID should be an integer"
+      assert n[1] >= minlat - 0.01, "node lat should be greater than min"
+      assert n[1] <= maxlat - 0.01, "node lat should be less than max"
+      assert n[2] >= minlon - 0.01, "node lon should be greater than min"
+      assert n[2] <= maxlon - 0.01, "node lon should be less than max"
+      assert_equal Array, a[3].class, "node tags should be array"
+      assert n[4] == n[4].floor, "node version should be an integer"

     end
 
     map[4].each do |r|
     end
 
     map[4].each do |r|

-      assert_equal 2, r.length, 'relation should be (id, version) pair'
-      assert r[0] == r[0].floor, 'relation ID should be an integer'
-      assert r[1] == r[1].floor, 'relation version should be an integer'
+      assert_equal 2, r.length, "relation should be (id, version) pair"
+      assert r[0] == r[0].floor, "relation ID should be an integer"
+      assert r[1] == r[1].floor, "relation version should be an integer"

     end
 
     # TODO: looks like amf_controller changed since this test was written
     # so someone who knows what they're doing should check this!
     ways = map[2].collect { |x| x[0] }
     assert ways.include?(current_ways(:used_way).id),
     end
 
     # TODO: looks like amf_controller changed since this test was written
     # so someone who knows what they're doing should check this!
     ways = map[2].collect { |x| x[0] }
     assert ways.include?(current_ways(:used_way).id),

-      "map should include used way"
+           "map should include used way"

     assert !ways.include?(current_ways(:invisible_way).id),
     assert !ways.include?(current_ways(:invisible_way).id),

-      'map should not include deleted way'
+           "map should not include deleted way"

   end
 
   ##
   # checks that too-large a bounding box will not be served.
   def test_whichways_toobig
   end
 
   ##
   # checks that too-large a bounding box will not be served.
   def test_whichways_toobig

-    bbox = [-0.1,-0.1,1.1,1.1]
-    check_bboxes_are_bad [bbox] do |map,bbox|
+    bbox = [-0.1, -0.1, 1.1, 1.1]
+    check_bboxes_are_bad [bbox] do |map, _bbox|

       assert_boundary_error map, " The server said: The maximum bbox size is 0.25, and your request was too large. Either request a smaller area, or use planet.osm"
     end
   end
       assert_boundary_error map, " The server said: The maximum bbox size is 0.25, and your request was too large. Either request a smaller area, or use planet.osm"
     end
   end


@@ -184,7 +211,7 @@ class AmfControllerTest < ActionController::TestCase
   #
   # NOTE: the controller expands the bbox by 0.01 in each direction!
   def test_whichways_badlat
   #
   # NOTE: the controller expands the bbox by 0.01 in each direction!
   def test_whichways_badlat

-    bboxes = [[0,0.1,0.1,0], [-0.1,80,0.1,70], [0.24,54.35,0.25,54.33]]
+    bboxes = [[0, 0.1, 0.1, 0], [-0.1, 80, 0.1, 70], [0.24, 54.35, 0.25, 54.33]]

     check_bboxes_are_bad bboxes do |map, bbox|
       assert_boundary_error map, " The server said: The minimum latitude must be less than the maximum latitude, but it wasn't", bbox.inspect
     end
     check_bboxes_are_bad bboxes do |map, bbox|
       assert_boundary_error map, " The server said: The minimum latitude must be less than the maximum latitude, but it wasn't", bbox.inspect
     end


@@ -195,7 +222,7 @@ class AmfControllerTest < ActionController::TestCase
   #
   # NOTE: the controller expands the bbox by 0.01 in each direction!
   def test_whichways_badlon
   #
   # NOTE: the controller expands the bbox by 0.01 in each direction!
   def test_whichways_badlon

-    bboxes = [[80,-0.1,70,0.1], [54.35,0.24,54.33,0.25]]
+    bboxes = [[80, -0.1, 70, 0.1], [54.35, 0.24, 54.33, 0.25]]

     check_bboxes_are_bad bboxes do |map, bbox|
       assert_boundary_error map, " The server said: The minimum longitude must be less than the maximum longitude, but it wasn't", bbox.inspect
     end
     check_bboxes_are_bad bboxes do |map, bbox|
       assert_boundary_error map, " The server said: The minimum longitude must be less than the maximum longitude, but it wasn't", bbox.inspect
     end


@@ -203,10 +230,10 @@ class AmfControllerTest < ActionController::TestCase
 
   def test_whichways_deleted
     node = current_nodes(:used_node_1)
 
   def test_whichways_deleted
     node = current_nodes(:used_node_1)

-    minlon = node.lon-0.1
-    minlat = node.lat-0.1
-    maxlon = node.lon+0.1
-    maxlat = node.lat+0.1
+    minlon = node.lon - 0.1
+    minlat = node.lat - 0.1
+    maxlon = node.lon + 0.1
+    maxlat = node.lat + 0.1

     amf_content "whichways_deleted", "/1", [minlon, minlat, maxlon, maxlat]
     post :amf_read
     assert_response :success
     amf_content "whichways_deleted", "/1", [minlon, minlat, maxlon, maxlat]
     post :amf_read
     assert_response :success


@@ -214,23 +241,23 @@ class AmfControllerTest < ActionController::TestCase
 
     # check contents of message
     map = amf_result "/1"
 
     # check contents of message
     map = amf_result "/1"

-    assert_equal 0, map[0], 'first map element should be 0'
-    assert_equal "", map[1], 'second map element should be an empty string'
-    assert_equal Array, map[2].class, 'third map element should be an array'
+    assert_equal 0, map[0], "first map element should be 0"
+    assert_equal "", map[1], "second map element should be an empty string"
+    assert_equal Array, map[2].class, "third map element should be an array"

     # TODO: looks like amf_controller changed since this test was written
     # so someone who knows what they're doing should check this!
     assert !map[2].include?(current_ways(:used_way).id),
     # TODO: looks like amf_controller changed since this test was written
     # so someone who knows what they're doing should check this!
     assert !map[2].include?(current_ways(:used_way).id),

-      "map should not include used way"
+           "map should not include used way"

     assert map[2].include?(current_ways(:invisible_way).id),
     assert map[2].include?(current_ways(:invisible_way).id),

-      'map should include deleted way'
+           "map should include deleted way"

   end
 
   def test_whichways_deleted_toobig
   end
 
   def test_whichways_deleted_toobig

-    bbox = [-0.1,-0.1,1.1,1.1]
+    bbox = [-0.1, -0.1, 1.1, 1.1]

     amf_content "whichways_deleted", "/1", bbox
     post :amf_read
     assert_response :success
     amf_content "whichways_deleted", "/1", bbox
     post :amf_read
     assert_response :success

-    amf_parse_response 
+    amf_parse_response

 
     map = amf_result "/1"
     assert_deleted_boundary_error map, " The server said: The maximum bbox size is 0.25, and your request was too large. Either request a smaller area, or use planet.osm"
 
     map = amf_result "/1"
     assert_deleted_boundary_error map, " The server said: The maximum bbox size is 0.25, and your request was too large. Either request a smaller area, or use planet.osm"


@@ -257,7 +284,7 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal rel[0], -4
     assert_equal rel[1], "relation"
     assert_equal rel[2], id
     assert_equal rel[0], -4
     assert_equal rel[1], "relation"
     assert_equal rel[2], id

-    assert rel[3].nil? and rel[4].nil?
+    assert(rel[3].nil?) && rel[4].nil?

   end
 
   def test_getrelation_nonexistent
   end
 
   def test_getrelation_nonexistent


@@ -270,7 +297,7 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal rel[0], -4
     assert_equal rel[1], "relation"
     assert_equal rel[2], id
     assert_equal rel[0], -4
     assert_equal rel[1], "relation"
     assert_equal rel[2], id

-    assert rel[3].nil? and rel[4].nil?
+    assert(rel[3].nil?) && rel[4].nil?

   end
 
   def test_getway_old
   end
 
   def test_getway_old


@@ -279,12 +306,11 @@ class AmfControllerTest < ActionController::TestCase
     # NOTE: looks from the API changes that this now expects a timestamp
     # instead of a version number...
     # try to get version 1
     # NOTE: looks from the API changes that this now expects a timestamp
     # instead of a version number...
     # try to get version 1

-    v1 = ways(:way_with_versions_v1)
-    { latest.id => '', 
-      v1.way_id => v1.timestamp.strftime("%d %b %Y, %H:%M:%S")
-    }.each do |id, t|
+    v1 = ways(:way_with_versions_v2)
+    { latest.id => "",
+      v1.way_id => v1.timestamp.strftime("%d %b %Y, %H:%M:%S") }.each do |id, t|

       amf_content "getway_old", "/1", [id, t]
       amf_content "getway_old", "/1", [id, t]

-      post :amf_read      
+      post :amf_read

       assert_response :success
       amf_parse_response
       returned_way = amf_result("/1")
       assert_response :success
       amf_parse_response
       returned_way = amf_result("/1")


@@ -294,7 +320,7 @@ class AmfControllerTest < ActionController::TestCase
       assert_equal latest.version, returned_way[5]
     end
   end
       assert_equal latest.version, returned_way[5]
     end
   end

-  
+

   ##
   # test that the server doesn't fall over when rubbish is passed
   # into the method args.
   ##
   # test that the server doesn't fall over when rubbish is passed
   # into the method args.


@@ -302,10 +328,9 @@ class AmfControllerTest < ActionController::TestCase
     way_id = current_ways(:way_with_versions).id
     { "foo"  => "bar",
       way_id => "not a date",
     way_id = current_ways(:way_with_versions).id
     { "foo"  => "bar",
       way_id => "not a date",

-      way_id => "2009-03-25 00:00:00", # <- wrong format
-      way_id => "0 Jan 2009 00:00:00", # <- invalid date
-      -1     => "1 Jan 2009 00:00:00"  # <- invalid ID
-    }.each do |id, t|
+      way_id => "2009-03-25 00:00:00",                   # <- wrong format
+      way_id => "0 Jan 2009 00:00:00",                   # <- invalid date
+      -1     => "1 Jan 2009 00:00:00" }.each do |id, t|  # <- invalid

       amf_content "getway_old", "/1", [id, t]
       post :amf_read
       assert_response :success
       amf_content "getway_old", "/1", [id, t]
       post :amf_read
       assert_response :success


@@ -319,14 +344,29 @@ class AmfControllerTest < ActionController::TestCase
   end
 
   def test_getway_old_nonexistent
   end
 
   def test_getway_old_nonexistent

-    # try to get the last version+10 (shoudn't exist)
+    # try to get the last version-10 (shoudn't exist)

     v1 = ways(:way_with_versions_v1)
     # try to get last visible version of non-existent way
     # try to get specific version of non-existent way
     v1 = ways(:way_with_versions_v1)
     # try to get last visible version of non-existent way
     # try to get specific version of non-existent way

-    [[0, ''], 
-     [0, '1 Jan 1970, 00:00:00'], 
-     [v1.way_id, (v1.timestamp - 10).strftime("%d %b %Y, %H:%M:%S")]
-    ].each do |id, t|
+    [[0, ""],
+     [0, "1 Jan 1970, 00:00:00"],
+     [v1.way_id, (v1.timestamp - 10).strftime("%d %b %Y, %H:%M:%S")]].each do |id, t|
+      amf_content "getway_old", "/1", [id, t]
+      post :amf_read
+      assert_response :success
+      amf_parse_response
+      returned_way = amf_result("/1")
+      assert_equal -1, returned_way[0]
+      assert returned_way[3].nil?
+      assert returned_way[4].nil?
+      assert returned_way[5].nil?
+    end
+  end
+
+  def test_getway_old_invisible
+    v1 = ways(:invisible_way)
+    # try to get deleted version
+    [[v1.way_id, (v1.timestamp + 10).strftime("%d %b %Y, %H:%M:%S")]].each do |id, t|

       amf_content "getway_old", "/1", [id, t]
       post :amf_read
       assert_response :success
       amf_content "getway_old", "/1", [id, t]
       post :amf_read
       assert_response :success


@@ -350,8 +390,8 @@ class AmfControllerTest < ActionController::TestCase
     history = amf_result("/1")
 
     # ['way',wayid,history]
     history = amf_result("/1")
 
     # ['way',wayid,history]

-    assert_equal 'way', history[0]
-    assert_equal latest.id, history[1] 
+    assert_equal "way", history[0]
+    assert_equal latest.id, history[1]

     # We use dates rather than version numbers here, because you might
     # have moved a node within a way (i.e. way version not incremented).
     # The timestamp is +1 because we say "give me the revision of 15:33:02",
     # We use dates rather than version numbers here, because you might
     # have moved a node within a way (i.e. way version not incremented).
     # The timestamp is +1 because we say "give me the revision of 15:33:02",


@@ -368,7 +408,7 @@ class AmfControllerTest < ActionController::TestCase
     history = amf_result("/1")
 
     # ['way',wayid,history]
     history = amf_result("/1")
 
     # ['way',wayid,history]

-    assert_equal history[0], 'way'
+    assert_equal history[0], "way"

     assert_equal history[1], 0
     assert history[2].empty?
   end
     assert_equal history[1], 0
     assert history[2].empty?
   end


@@ -384,16 +424,16 @@ class AmfControllerTest < ActionController::TestCase
     # ['node',nodeid,history]
     # note that (as per getway_history) we actually round up
     # to the next second
     # ['node',nodeid,history]
     # note that (as per getway_history) we actually round up
     # to the next second

-    assert_equal history[0], 'node', 
-      'first element should be "node"'
+    assert_equal history[0], "node",
+                 'first element should be "node"'

     assert_equal history[1], latest.id,
     assert_equal history[1], latest.id,

-      'second element should be the input node ID'
-    assert_equal history[2].first[0], 
-      (latest.timestamp + 1).strftime("%d %b %Y, %H:%M:%S"),
-      'first element in third element (array) should be the latest version'
-    assert_equal history[2].last[0], 
-      (nodes(:node_with_versions_v1).timestamp + 1).strftime("%d %b %Y, %H:%M:%S"),
-      'last element in third element (array) should be the initial version'
+                 "second element should be the input node ID"
+    assert_equal history[2].first[0],
+                 (latest.timestamp + 1).strftime("%d %b %Y, %H:%M:%S"),
+                 "first element in third element (array) should be the latest version"
+    assert_equal history[2].last[0],
+                 (nodes(:node_with_versions_v1).timestamp + 1).strftime("%d %b %Y, %H:%M:%S"),
+                 "last element in third element (array) should be the initial version"

   end
 
   def test_getnode_history_nonexistent
   end
 
   def test_getnode_history_nonexistent


@@ -404,13 +444,197 @@ class AmfControllerTest < ActionController::TestCase
     history = amf_result("/1")
 
     # ['node',nodeid,history]
     history = amf_result("/1")
 
     # ['node',nodeid,history]

-    assert_equal history[0], 'node'
+    assert_equal history[0], "node"

     assert_equal history[1], 0
     assert history[2].empty?
   end
 
     assert_equal history[1], 0
     assert history[2].empty?
   end
 

+  def test_findgpx_bad_user
+    amf_content "findgpx", "/1", [1, "test@example.com:wrong"]
+    post :amf_read
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 2, result.length
+    assert_equal -1, result[0]
+    assert_match /must be logged in/, result[1]
+
+    amf_content "findgpx", "/1", [1, "blocked@openstreetmap.org:test"]
+    post :amf_read
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 2, result.length
+    assert_equal -1, result[0]
+    assert_match /access to the API has been blocked/, result[1]
+  end
+
+  def test_findgpx_by_id
+    trace = gpx_files(:anon_trace_file)
+
+    amf_content "findgpx", "/1", [trace.id, "test@example.com:test"]
+    post :amf_read
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 3, result.length
+    assert_equal 0, result[0]
+    assert_equal "", result[1]
+    traces = result[2]
+    assert_equal 1, traces.length
+    assert_equal 3, traces[0].length
+    assert_equal trace.id, traces[0][0]
+    assert_equal trace.name, traces[0][1]
+    assert_equal trace.description, traces[0][2]
+  end
+
+  def test_findgpx_by_name
+    amf_content "findgpx", "/1", ["Trace", "test@example.com:test"]
+    post :amf_read
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    # find by name fails as it uses mysql text search syntax...
+    assert_equal 2, result.length
+    assert_equal -2, result[0]
+  end
+
+  def test_findrelations_by_id
+    relation = current_relations(:relation_with_versions)
+
+    amf_content "findrelations", "/1", [relation.id]
+    post :amf_read
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 1, result.length
+    assert_equal 4, result[0].length
+    assert_equal relation.id, result[0][0]
+    assert_equal relation.tags, result[0][1]
+    assert_equal relation.members, result[0][2]
+    assert_equal relation.version, result[0][3]
+
+    amf_content "findrelations", "/1", [999999]
+    post :amf_read
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 0, result.length
+  end
+
+  def test_findrelations_by_tags
+    visible_relation = current_relations(:visible_relation)
+    used_relation = current_relations(:used_relation)
+
+    amf_content "findrelations", "/1", ["yes"]
+    post :amf_read
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1").sort
+
+    assert_equal 2, result.length
+    assert_equal 4, result[0].length
+    assert_equal visible_relation.id, result[0][0]
+    assert_equal visible_relation.tags, result[0][1]
+    assert_equal visible_relation.members, result[0][2]
+    assert_equal visible_relation.version, result[0][3]
+    assert_equal 4, result[1].length
+    assert_equal used_relation.id, result[1][0]
+    assert_equal used_relation.tags, result[1][1]
+    assert_equal used_relation.members, result[1][2]
+    assert_equal used_relation.version, result[1][3]
+
+    amf_content "findrelations", "/1", ["no"]
+    post :amf_read
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1").sort
+
+    assert_equal 0, result.length
+  end
+
+  def test_getpoi_without_timestamp
+    node = current_nodes(:node_with_versions)
+
+    amf_content "getpoi", "/1", [node.id, ""]
+    post :amf_read
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 7, result.length
+    assert_equal 0, result[0]
+    assert_equal "", result[1]
+    assert_equal node.id, result[2]
+    assert_equal node.lon, result[3]
+    assert_equal node.lat, result[4]
+    assert_equal node.tags, result[5]
+    assert_equal node.version, result[6]
+
+    amf_content "getpoi", "/1", [999999, ""]
+    post :amf_read
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 3, result.length
+    assert_equal -4, result[0]
+    assert_equal "node", result[1]
+    assert_equal 999999, result[2]
+  end
+
+  def test_getpoi_with_timestamp
+    node = nodes(:node_with_versions_v2)
+    current_node = current_nodes(:node_with_versions)
+
+    amf_content "getpoi", "/1", [node.node_id, node.timestamp.xmlschema]
+    post :amf_read
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 7, result.length
+    assert_equal 0, result[0]
+    assert_equal "", result[1]
+    assert_equal node.node_id, result[2]
+    assert_equal node.lon, result[3]
+    assert_equal node.lat, result[4]
+    assert_equal node.tags, result[5]
+    assert_equal current_node.version, result[6]
+
+    amf_content "getpoi", "/1", [node.node_id, "2000-01-01T00:00:00Z"]
+    post :amf_read
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 3, result.length
+    assert_equal -4, result[0]
+    assert_equal "node", result[1]
+    assert_equal node.node_id, result[2]
+
+    amf_content "getpoi", "/1", [999999, Time.now.xmlschema]
+    post :amf_read
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 3, result.length
+    assert_equal -4, result[0]
+    assert_equal "node", result[1]
+    assert_equal 999999, result[2]
+  end
+

   # ************************************************************
   # AMF Write tests
   # ************************************************************
   # AMF Write tests

+
+  # check that we can update a poi

   def test_putpoi_update_valid
     nd = current_nodes(:visible_node)
     cs_id = changesets(:public_user_first_change).id
   def test_putpoi_update_valid
     nd = current_nodes(:visible_node)
     cs_id = changesets(:public_user_first_change).id


@@ -419,54 +643,56 @@ class AmfControllerTest < ActionController::TestCase
     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     assert_response :success
     amf_parse_response
     result = amf_result("/1")

-    
+
+    assert_equal 5, result.size

     assert_equal 0, result[0]
     assert_equal "", result[1]
     assert_equal nd.id, result[2]
     assert_equal nd.id, result[3]
     assert_equal 0, result[0]
     assert_equal "", result[1]
     assert_equal nd.id, result[2]
     assert_equal nd.id, result[3]

-    assert_equal nd.version+1, result[4]
-    
+    assert_equal nd.version + 1, result[4]
+

     # Now try to update again, with a different lat/lon, using the updated version number
     # Now try to update again, with a different lat/lon, using the updated version number

-    lat = nd.lat+0.1
-    lon = nd.lon-0.1
-    amf_content "putpoi", "/2", ["test@example.com:test", cs_id, nd.version+1, nd.id, lon, lat, nd.tags, nd.visible]
+    lat = nd.lat + 0.1
+    lon = nd.lon - 0.1
+    amf_content "putpoi", "/2", ["test@example.com:test", cs_id, nd.version + 1, nd.id, lon, lat, nd.tags, nd.visible]

     post :amf_write
     assert_response :success
     amf_parse_response
     result = amf_result("/2")
     post :amf_write
     assert_response :success
     amf_parse_response
     result = amf_result("/2")

-    
+
+    assert_equal 5, result.size

     assert_equal 0, result[0]
     assert_equal "", result[1]
     assert_equal nd.id, result[2]
     assert_equal nd.id, result[3]
     assert_equal 0, result[0]
     assert_equal "", result[1]
     assert_equal nd.id, result[2]
     assert_equal nd.id, result[3]

-    assert_equal nd.version+2, result[4]
+    assert_equal nd.version + 2, result[4]

   end
   end

-  
+

   # Check that we can create a no valid poi
   # Using similar method for the node controller test
   def test_putpoi_create_valid
     # This node has no tags
   # Check that we can create a no valid poi
   # Using similar method for the node controller test
   def test_putpoi_create_valid
     # This node has no tags

-    nd = Node.new
+

     # create a node with random lat/lon
     # create a node with random lat/lon

-    lat = rand(100)-50 + rand
-    lon = rand(100)-50 + rand
+    lat = rand(100) - 50 + rand
+    lon = rand(100) - 50 + rand

     # normal user has a changeset open
     changeset = changesets(:public_user_first_change)
     # normal user has a changeset open
     changeset = changesets(:public_user_first_change)

-    
+

     amf_content "putpoi", "/1", ["test@example.com:test", changeset.id, nil, nil, lon, lat, {}, nil]
     post :amf_write
     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     amf_content "putpoi", "/1", ["test@example.com:test", changeset.id, nil, nil, lon, lat, {}, nil]
     post :amf_write
     assert_response :success
     amf_parse_response
     result = amf_result("/1")

-    
+

     # check the array returned by the amf
     assert_equal 5, result.size
     assert_equal 0, result[0], "expected to get the status ok from the amf"
     assert_equal 0, result[2], "The old id should be 0"
     assert result[3] > 0, "The new id should be greater than 0"
     assert_equal 1, result[4], "The new version should be 1"
     # check the array returned by the amf
     assert_equal 5, result.size
     assert_equal 0, result[0], "expected to get the status ok from the amf"
     assert_equal 0, result[2], "The old id should be 0"
     assert result[3] > 0, "The new id should be greater than 0"
     assert_equal 1, result[4], "The new version should be 1"

-    
-    # Finally check that the node that was saved has saved the data correctly 
+
+    # Finally check that the node that was saved has saved the data correctly

     # in both the current and history tables
     # First check the current table
     current_node = Node.find(result[3].to_i)
     # in both the current and history tables
     # First check the current table
     current_node = Node.find(result[3].to_i)


@@ -482,16 +708,16 @@ class AmfControllerTest < ActionController::TestCase
     assert_in_delta lon, first_historic_node.lon, 0.00001, "The longitude was not retreuved correctly"
     assert_equal 0, first_historic_node.tags.size, "There seems to be a tag that have been attached to this node"
     assert_equal result[4], first_historic_node.version, "The version returned, is different to the one returned by the amf"
     assert_in_delta lon, first_historic_node.lon, 0.00001, "The longitude was not retreuved correctly"
     assert_equal 0, first_historic_node.tags.size, "There seems to be a tag that have been attached to this node"
     assert_equal result[4], first_historic_node.version, "The version returned, is different to the one returned by the amf"

-    
+

     ####
     # This node has some tags
     ####
     # This node has some tags

-    tnd = Node.new
+

     # create a node with random lat/lon
     # create a node with random lat/lon

-    lat = rand(100)-50 + rand
-    lon = rand(100)-50 + rand
+    lat = rand(100) - 50 + rand
+    lon = rand(100) - 50 + rand

     # normal user has a changeset open
     changeset = changesets(:public_user_first_change)
     # normal user has a changeset open
     changeset = changesets(:public_user_first_change)

-    
+

     amf_content "putpoi", "/2", ["test@example.com:test", changeset.id, nil, nil, lon, lat, { "key" => "value", "ping" => "pong" }, nil]
     post :amf_write
     assert_response :success
     amf_content "putpoi", "/2", ["test@example.com:test", changeset.id, nil, nil, lon, lat, { "key" => "value", "ping" => "pong" }, nil]
     post :amf_write
     assert_response :success


@@ -504,8 +730,8 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal 0, result[2], "The old id should be 0"
     assert result[3] > 0, "The new id should be greater than 0"
     assert_equal 1, result[4], "The new version should be 1"
     assert_equal 0, result[2], "The old id should be 0"
     assert result[3] > 0, "The new id should be greater than 0"
     assert_equal 1, result[4], "The new version should be 1"

-    
-    # Finally check that the node that was saved has saved the data correctly 
+
+    # Finally check that the node that was saved has saved the data correctly

     # in both the current and history tables
     # First check the current table
     current_node = Node.find(result[3].to_i)
     # in both the current and history tables
     # First check the current table
     current_node = Node.find(result[3].to_i)


@@ -524,34 +750,34 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal({ "key" => "value", "ping" => "pong" }, first_historic_node.tags, "tags are different")
     assert_equal result[4], first_historic_node.version, "The version returned, is different to the one returned by the amf"
   end
     assert_equal({ "key" => "value", "ping" => "pong" }, first_historic_node.tags, "tags are different")
     assert_equal result[4], first_historic_node.version, "The version returned, is different to the one returned by the amf"
   end

-  
+

   # try creating a POI with rubbish in the tags
   def test_putpoi_create_with_control_chars
     # This node has no tags
   # try creating a POI with rubbish in the tags
   def test_putpoi_create_with_control_chars
     # This node has no tags

-    nd = Node.new
+

     # create a node with random lat/lon
     # create a node with random lat/lon

-    lat = rand(100)-50 + rand
-    lon = rand(100)-50 + rand
+    lat = rand(100) - 50 + rand
+    lon = rand(100) - 50 + rand

     # normal user has a changeset open
     changeset = changesets(:public_user_first_change)
     # normal user has a changeset open
     changeset = changesets(:public_user_first_change)

-    
-    mostly_invalid = (0..31).to_a.map {|i| i.chr}.join
+
+    mostly_invalid = (0..31).to_a.map(&:chr).join

     tags = { "something" => "foo#{mostly_invalid}bar" }
     tags = { "something" => "foo#{mostly_invalid}bar" }

-      
+

     amf_content "putpoi", "/1", ["test@example.com:test", changeset.id, nil, nil, lon, lat, tags, nil]
     post :amf_write
     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     amf_content "putpoi", "/1", ["test@example.com:test", changeset.id, nil, nil, lon, lat, tags, nil]
     post :amf_write
     assert_response :success
     amf_parse_response
     result = amf_result("/1")

-      
+

     # check the array returned by the amf
     assert_equal 5, result.size
     assert_equal 0, result[0], "Expected to get the status ok in the amf"
     assert_equal 0, result[2], "The old id should be 0"
     assert result[3] > 0, "The new id should be greater than 0"
     assert_equal 1, result[4], "The new version should be 1"
     # check the array returned by the amf
     assert_equal 5, result.size
     assert_equal 0, result[0], "Expected to get the status ok in the amf"
     assert_equal 0, result[2], "The old id should be 0"
     assert result[3] > 0, "The new id should be greater than 0"
     assert_equal 1, result[4], "The new version should be 1"

-    
-    # Finally check that the node that was saved has saved the data correctly 
+
+    # Finally check that the node that was saved has saved the data correctly

     # in both the current and history tables
     # First check the current table
     current_node = Node.find(result[3].to_i)
     # in both the current and history tables
     # First check the current table
     current_node = Node.find(result[3].to_i)


@@ -563,16 +789,16 @@ class AmfControllerTest < ActionController::TestCase
   # try creating a POI with rubbish in the tags
   def test_putpoi_create_with_invalid_utf8
     # This node has no tags
   # try creating a POI with rubbish in the tags
   def test_putpoi_create_with_invalid_utf8
     # This node has no tags

-    nd = Node.new
+

     # create a node with random lat/lon
     # create a node with random lat/lon

-    lat = rand(100)-50 + rand
-    lon = rand(100)-50 + rand
+    lat = rand(100) - 50 + rand
+    lon = rand(100) - 50 + rand

     # normal user has a changeset open
     changeset = changesets(:public_user_first_change)
     # normal user has a changeset open
     changeset = changesets(:public_user_first_change)

-    
+

     invalid = "\xc0\xc0"
     tags = { "something" => "foo#{invalid}bar" }
     invalid = "\xc0\xc0"
     tags = { "something" => "foo#{invalid}bar" }

-      
+

     amf_content "putpoi", "/1", ["test@example.com:test", changeset.id, nil, nil, lon, lat, tags, nil]
     post :amf_write
     assert_response :success
     amf_content "putpoi", "/1", ["test@example.com:test", changeset.id, nil, nil, lon, lat, tags, nil]
     post :amf_write
     assert_response :success


@@ -581,61 +807,539 @@ class AmfControllerTest < ActionController::TestCase
 
     assert_equal 2, result.size
     assert_equal -1, result[0], "Expected to get the status FAIL in the amf"
 
     assert_equal 2, result.size
     assert_equal -1, result[0], "Expected to get the status FAIL in the amf"

-    assert_equal "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1.", result[1] 
+    assert_equal "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1.", result[1]

   end
   end

-      
+
+  # try deleting a node

   def test_putpoi_delete_valid
   def test_putpoi_delete_valid

-    
+    nd = current_nodes(:visible_node)
+    cs_id = changesets(:public_user_first_change).id
+    amf_content "putpoi", "/1", ["test@example.com:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, false]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 5, result.size
+    assert_equal 0, result[0]
+    assert_equal "", result[1]
+    assert_equal nd.id, result[2]
+    assert_equal nd.id, result[3]
+    assert_equal nd.version + 1, result[4]
+
+    current_node = Node.find(result[3].to_i)
+    assert_equal false, current_node.visible

   end
   end

-  
+
+  # try deleting a node that is already deleted

   def test_putpoi_delete_already_deleted
   def test_putpoi_delete_already_deleted

-    
+    nd = current_nodes(:invisible_node)
+    cs_id = changesets(:public_user_first_change).id
+    amf_content "putpoi", "/1", ["test@example.com:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, false]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 3, result.size
+    assert_equal -4, result[0]
+    assert_equal "node", result[1]
+    assert_equal nd.id, result[2]

   end
   end

-  
+
+  # try deleting a node that has never existed

   def test_putpoi_delete_not_found
   def test_putpoi_delete_not_found

-    
+    cs_id = changesets(:public_user_first_change).id
+    amf_content "putpoi", "/1", ["test@example.com:test", cs_id, 1, 999999, 0, 0, {}, false]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 3, result.size
+    assert_equal -4, result[0]
+    assert_equal "node", result[1]
+    assert_equal 999999, result[2]

   end
   end

-  
+
+  # try setting an invalid location on a node

   def test_putpoi_invalid_latlon
   def test_putpoi_invalid_latlon

-    
+    nd = current_nodes(:visible_node)
+    cs_id = changesets(:public_user_first_change).id
+    amf_content "putpoi", "/1", ["test@example.com:test", cs_id, nd.version, nd.id, 200, 100, nd.tags, true]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 2, result.size
+    assert_equal -2, result[0]
+    assert_match /Node is not in the world/, result[1]

   end
 
   end
 

+  # check that we can create a way
+  def test_putway_create_valid
+    cs_id = changesets(:public_user_first_change).id
+
+    amf_content "putway", "/1", ["test@example.com:test", cs_id, 0, -1, [1, 4, 7], { "test" => "new" }, [], {}]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+    new_way_id = result[3].to_i
+
+    assert_equal 8, result.size
+    assert_equal 0, result[0]
+    assert_equal "", result[1]
+    assert_equal -1, result[2]
+    assert_not_equal -1, result[3]
+    assert_equal({}, result[4])
+    assert_equal 1, result[5]
+    assert_equal({}, result[6])
+    assert_equal({}, result[7])
+
+    new_way = Way.find(new_way_id)
+    assert_equal 1, new_way.version
+    assert_equal [1, 4, 7], new_way.nds
+    assert_equal({ "test" => "new" }, new_way.tags)
+
+    amf_content "putway", "/1", ["test@example.com:test", cs_id, 0, -1, [4, 6, 15, 1], { "test" => "newer" }, [], {}]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+    new_way_id = result[3].to_i
+
+    assert_equal 8, result.size
+    assert_equal 0, result[0]
+    assert_equal "", result[1]
+    assert_equal -1, result[2]
+    assert_not_equal -1, result[3]
+    assert_equal({}, result[4])
+    assert_equal 1, result[5]
+    assert_equal({}, result[6])
+    assert_equal({}, result[7])
+
+    new_way = Way.find(new_way_id)
+    assert_equal 1, new_way.version
+    assert_equal [4, 6, 15, 1], new_way.nds
+    assert_equal({ "test" => "newer" }, new_way.tags)
+
+    amf_content "putway", "/1", ["test@example.com:test", cs_id, 0, -1, [4, -1, 6, 15], { "test" => "newest" }, [[4.56, 12.34, -1, 0, { "test" => "new" }], [12.34, 4.56, 6, 1, { "test" => "ok" }]], { 1 => 1 }]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+    new_way_id = result[3].to_i
+    new_node_id = result[4]["-1"].to_i
+
+    assert_equal 8, result.size
+    assert_equal 0, result[0]
+    assert_equal "", result[1]
+    assert_equal -1, result[2]
+    assert_not_equal -1, result[3]
+    assert_equal({ "-1" => new_node_id }, result[4])
+    assert_equal 1, result[5]
+    assert_equal({ new_node_id.to_s => 1, "6" => 2 }, result[6])
+    assert_equal({ "1" => 1 }, result[7])
+
+    new_way = Way.find(new_way_id)
+    assert_equal 1, new_way.version
+    assert_equal [4, new_node_id, 6, 15], new_way.nds
+    assert_equal({ "test" => "newest" }, new_way.tags)
+
+    new_node = Node.find(new_node_id)
+    assert_equal 1, new_node.version
+    assert_equal true, new_node.visible
+    assert_equal 4.56, new_node.lon
+    assert_equal 12.34, new_node.lat
+    assert_equal({ "test" => "new" }, new_node.tags)
+
+    changed_node = Node.find(6)
+    assert_equal 2, changed_node.version
+    assert_equal true, changed_node.visible
+    assert_equal 12.34, changed_node.lon
+    assert_equal 4.56, changed_node.lat
+    assert_equal({ "test" => "ok" }, changed_node.tags)
+
+    # node is not deleted because our other ways are using it
+    deleted_node = Node.find(1)
+    assert_equal 1, deleted_node.version
+    assert_equal true, deleted_node.visible
+  end
+
+  # check that we can update a way
+  def test_putway_update_valid
+    way = current_ways(:way_with_multiple_nodes)
+    cs_id = changesets(:public_user_first_change).id
+
+    assert_not_equal({ "test" => "ok" }, way.tags)
+    amf_content "putway", "/1", ["test@example.com:test", cs_id, way.version, way.id, way.nds, { "test" => "ok" }, [], {}]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 8, result.size
+    assert_equal 0, result[0]
+    assert_equal "", result[1]
+    assert_equal way.id, result[2]
+    assert_equal way.id, result[3]
+    assert_equal({}, result[4])
+    assert_equal way.version + 1, result[5]
+    assert_equal({}, result[6])
+    assert_equal({}, result[7])
+
+    new_way = Way.find(way.id)
+    assert_equal way.version + 1, new_way.version
+    assert_equal way.nds, new_way.nds
+    assert_equal({ "test" => "ok" }, new_way.tags)
+
+    assert_not_equal [4, 6, 15, 1], way.tags
+    amf_content "putway", "/1", ["test@example.com:test", cs_id, way.version + 1, way.id, [4, 6, 15, 1], way.tags, [], {}]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 8, result.size
+    assert_equal 0, result[0]
+    assert_equal "", result[1]
+    assert_equal way.id, result[2]
+    assert_equal way.id, result[3]
+    assert_equal({}, result[4])
+    assert_equal way.version + 2, result[5]
+    assert_equal({}, result[6])
+    assert_equal({}, result[7])
+
+    new_way = Way.find(way.id)
+    assert_equal way.version + 2, new_way.version
+    assert_equal [4, 6, 15, 1], new_way.nds
+    assert_equal way.tags, new_way.tags
+
+    amf_content "putway", "/1", ["test@example.com:test", cs_id, way.version + 2, way.id, [4, -1, 6, 15], way.tags, [[4.56, 12.34, -1, 0, { "test" => "new" }], [12.34, 4.56, 6, 1, { "test" => "ok" }]], { 1 => 1 }]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+    new_node_id = result[4]["-1"].to_i
+
+    assert_equal 8, result.size
+    assert_equal 0, result[0]
+    assert_equal "", result[1]
+    assert_equal way.id, result[2]
+    assert_equal way.id, result[3]
+    assert_equal({ "-1" => new_node_id }, result[4])
+    assert_equal way.version + 3, result[5]
+    assert_equal({ new_node_id.to_s => 1, "6" => 2 }, result[6])
+    assert_equal({ "1" => 1 }, result[7])
+
+    new_way = Way.find(way.id)
+    assert_equal way.version + 3, new_way.version
+    assert_equal [4, new_node_id, 6, 15], new_way.nds
+    assert_equal way.tags, new_way.tags
+
+    new_node = Node.find(new_node_id)
+    assert_equal 1, new_node.version
+    assert_equal true, new_node.visible
+    assert_equal 4.56, new_node.lon
+    assert_equal 12.34, new_node.lat
+    assert_equal({ "test" => "new" }, new_node.tags)
+
+    changed_node = Node.find(6)
+    assert_equal 2, changed_node.version
+    assert_equal true, changed_node.visible
+    assert_equal 12.34, changed_node.lon
+    assert_equal 4.56, changed_node.lat
+    assert_equal({ "test" => "ok" }, changed_node.tags)
+
+    deleted_node = Node.find(1)
+    assert_equal 2, deleted_node.version
+    assert_equal false, deleted_node.visible
+  end
+
+  # check that we can delete a way
+  def test_deleteway_valid
+    way = current_ways(:way_with_multiple_nodes)
+    nodes = way.nodes.each_with_object({}) { |n, ns| ns[n.id] = n.version }
+    cs_id = changesets(:public_user_first_change).id
+
+    amf_content "deleteway", "/1", ["test@example.com:test", cs_id, way.id, way.version, nodes]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 5, result.size
+    assert_equal 0, result[0]
+    assert_equal "", result[1]
+    assert_equal way.id, result[2]
+    assert_equal way.version + 1, result[3]
+    assert_equal({ "11" => 2 }, result[4])
+
+    new_way = Way.find(way.id)
+    assert_equal way.version + 1, new_way.version
+    assert_equal false, new_way.visible
+
+    way.nds.each do |node_id|
+      assert_equal result[4][node_id.to_s].nil?, Node.find(node_id).visible
+    end
+  end
+
+  # check that we can't delete a way that is in use
+  def test_deleteway_inuse
+    way = current_ways(:used_way)
+    nodes = way.nodes.each_with_object({}) { |n, ns| ns[n.id] = n.version }
+    cs_id = changesets(:public_user_first_change).id
+
+    amf_content "deleteway", "/1", ["test@example.com:test", cs_id, way.id, way.version, nodes]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 2, result.size
+    assert_equal -1, result[0]
+    assert_match /Way #{way.id} is still used/, result[1]
+
+    new_way = Way.find(way.id)
+    assert_equal way.version, new_way.version
+    assert_equal true, new_way.visible
+
+    way.nds.each do |node_id|
+      assert_equal true, Node.find(node_id).visible
+    end
+  end
+
+  # check that we can create a relation
+  def test_putrelation_create_valid
+    cs_id = changesets(:public_user_first_change).id
+
+    amf_content "putrelation", "/1", ["test@example.com:test", cs_id, 0, -1, { "test" => "new" }, [["Node", 3, "node"], ["Way", 7, "way"], ["Relation", 1, "relation"]], true]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+    new_relation_id = result[3].to_i
+
+    assert_equal 5, result.size
+    assert_equal 0, result[0]
+    assert_equal "", result[1]
+    assert_equal -1, result[2]
+    assert_not_equal -1, result[3]
+    assert_equal 1, result[4]
+
+    new_relation = Relation.find(new_relation_id)
+    assert_equal 1, new_relation.version
+    assert_equal [["Node", 3, "node"], ["Way", 7, "way"], ["Relation", 1, "relation"]], new_relation.members
+    assert_equal({ "test" => "new" }, new_relation.tags)
+    assert_equal true, new_relation.visible
+  end
+
+  # check that we can update a relation
+  def test_putrelation_update_valid
+    relation = current_relations(:visible_relation)
+    cs_id = changesets(:public_user_first_change).id
+
+    assert_not_equal({ "test" => "ok" }, relation.tags)
+    amf_content "putrelation", "/1", ["test@example.com:test", cs_id, relation.version, relation.id, { "test" => "ok" }, relation.members, true]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 5, result.size
+    assert_equal 0, result[0]
+    assert_equal "", result[1]
+    assert_equal relation.id, result[2]
+    assert_equal relation.id, result[3]
+    assert_equal relation.version + 1, result[4]
+
+    new_relation = Relation.find(relation.id)
+    assert_equal relation.version + 1, new_relation.version
+    assert_equal relation.members, new_relation.members
+    assert_equal({ "test" => "ok" }, new_relation.tags)
+    assert_equal true, new_relation.visible
+  end
+
+  # check that we can delete a relation
+  def test_putrelation_delete_valid
+    relation = current_relations(:visible_relation)
+    cs_id = changesets(:public_user_first_change).id
+
+    amf_content "putrelation", "/1", ["test@example.com:test", cs_id, relation.version, relation.id, relation.tags, relation.members, false]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 5, result.size
+    assert_equal 0, result[0]
+    assert_equal "", result[1]
+    assert_equal relation.id, result[2]
+    assert_equal relation.id, result[3]
+    assert_equal relation.version + 1, result[4]
+
+    new_relation = Relation.find(relation.id)
+    assert_equal relation.version + 1, new_relation.version
+    assert_equal [], new_relation.members
+    assert_equal({}, new_relation.tags)
+    assert_equal false, new_relation.visible
+  end
+
+  # check that we can't delete a relation that is in use
+  def test_putrelation_delete_inuse
+    relation = current_relations(:public_used_relation)
+    cs_id = changesets(:public_user_first_change).id
+
+    amf_content "putrelation", "/1", ["test@example.com:test", cs_id, relation.version, relation.id, relation.tags, relation.members, false]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 2, result.size
+    assert_equal -1, result[0]
+    assert_match /relation #{relation.id} is used in/, result[1]
+
+    new_relation = Relation.find(relation.id)
+    assert_equal relation.version, new_relation.version
+    assert_equal relation.members, new_relation.members
+    assert_equal relation.tags, new_relation.tags
+    assert_equal true, new_relation.visible
+  end
+
+  # check that we can open a changeset
+  def test_startchangeset_valid
+    amf_content "startchangeset", "/1", ["test@example.com:test", { "source" => "new" }, nil, "new", 1]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+    new_cs_id = result[2].to_i
+
+    assert_equal 3, result.size
+    assert_equal 0, result[0]
+    assert_equal "", result[1]
+
+    cs = Changeset.find(new_cs_id)
+    assert_equal true, cs.is_open?
+    assert_equal({ "comment" => "new", "source" => "new" }, cs.tags)
+
+    old_cs_id = new_cs_id
+
+    amf_content "startchangeset", "/1", ["test@example.com:test", { "source" => "newer" }, old_cs_id, "newer", 1]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+    new_cs_id = result[2].to_i
+
+    assert_not_equal old_cs_id, new_cs_id
+
+    assert_equal 3, result.size
+    assert_equal 0, result[0]
+    assert_equal "", result[1]
+
+    cs = Changeset.find(old_cs_id)
+    assert_equal false, cs.is_open?
+    assert_equal({ "comment" => "newer", "source" => "new" }, cs.tags)
+
+    cs = Changeset.find(new_cs_id)
+    assert_equal true, cs.is_open?
+    assert_equal({ "comment" => "newer", "source" => "newer" }, cs.tags)
+
+    old_cs_id = new_cs_id
+
+    amf_content "startchangeset", "/1", ["test@example.com:test", {}, old_cs_id, "", 0]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 3, result.size
+    assert_equal 0, result[0]
+    assert_equal "", result[1]
+    assert_nil result[2]
+
+    cs = Changeset.find(old_cs_id)
+    assert_equal false, cs.is_open?
+    assert_equal({ "comment" => "newer", "source" => "newer" }, cs.tags)
+  end
+
+  # check that we can't close somebody elses changeset
+  def test_startchangeset_invalid_wrong_user
+    amf_content "startchangeset", "/1", ["test@example.com:test", { "source" => "new" }, nil, "new", 1]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+    cs_id = result[2].to_i
+
+    assert_equal 3, result.size
+    assert_equal 0, result[0]
+    assert_equal "", result[1]
+
+    cs = Changeset.find(cs_id)
+    assert_equal true, cs.is_open?
+    assert_equal({ "comment" => "new", "source" => "new" }, cs.tags)
+
+    amf_content "startchangeset", "/1", ["test@openstreetmap.org:test", {}, cs_id, "delete", 0]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 2, result.size
+    assert_equal -2, result[0]
+    assert_equal "The user doesn't own that changeset", result[1]
+
+    cs = Changeset.find(cs_id)
+    assert_equal true, cs.is_open?
+    assert_equal({ "comment" => "new", "source" => "new" }, cs.tags)
+  end
+
+  # check that invalid characters are stripped from changeset tags

   def test_startchangeset_invalid_xmlchar_comment
     invalid = "\035\022"
     comment = "foo#{invalid}bar"
   def test_startchangeset_invalid_xmlchar_comment
     invalid = "\035\022"
     comment = "foo#{invalid}bar"

-      
-    amf_content "startchangeset", "/1", ["test@example.com:test", Hash.new, nil, comment, 1]
+
+    amf_content "startchangeset", "/1", ["test@example.com:test", {}, nil, comment, 1]

     post :amf_write
     assert_response :success
     amf_parse_response
     result = amf_result("/1")
     post :amf_write
     assert_response :success
     amf_parse_response
     result = amf_result("/1")

+    new_cs_id = result[2].to_i

 
 

-    assert_equal 3, result.size, result.inspect
+    assert_equal 3, result.size

     assert_equal 0, result[0]
     assert_equal 0, result[0]

-    new_cs_id = result[2].to_i
+    assert_equal "", result[1]

 
     cs = Changeset.find(new_cs_id)
 
     cs = Changeset.find(new_cs_id)

-    assert_equal "foobar", cs.tags["comment"]
+    assert_equal true, cs.is_open?
+    assert_equal({ "comment" => "foobar" }, cs.tags)

   end
 
   end
 

+  private
+

   # ************************************************************
   # AMF Helper functions
 
   # Get the result record for the specified ID
   # It's an assertion FAIL if the record does not exist
   # ************************************************************
   # AMF Helper functions
 
   # Get the result record for the specified ID
   # It's an assertion FAIL if the record does not exist

-  def amf_result ref
-    assert @amf_result.has_key?("#{ref}/onResult")
+  def amf_result(ref)
+    assert @amf_result.key?("#{ref}/onResult")

     @amf_result["#{ref}/onResult"]
   end
 
   # Encode the AMF message to invoke "target" with parameters as
   # the passed data. The ref is used to retrieve the results.
   def amf_content(target, ref, data)
     @amf_result["#{ref}/onResult"]
   end
 
   # Encode the AMF message to invoke "target" with parameters as
   # the passed data. The ref is used to retrieve the results.
   def amf_content(target, ref, data)

-    a,b=1.divmod(256)
-    c = StringIO.new()
-    c.write 0.chr+0.chr   # version 0
-    c.write 0.chr+0.chr   # n headers
-    c.write a.chr+b.chr   # n bodies
+    a, b = 1.divmod(256)
+    c = StringIO.new
+    c.write 0.chr + 0.chr   # version 0
+    c.write 0.chr + 0.chr   # n headers
+    c.write a.chr + b.chr   # n bodies

     c.write AMF.encodestring(target)
     c.write AMF.encodestring(ref)
     c.write [-1].pack("N")
     c.write AMF.encodestring(target)
     c.write AMF.encodestring(ref)
     c.write [-1].pack("N")


@@ -650,24 +1354,24 @@ class AmfControllerTest < ActionController::TestCase
   def amf_parse_response
     req = StringIO.new(@response.body)
 
   def amf_parse_response
     req = StringIO.new(@response.body)
 

-    req.read(2)   # version
+    req.read(2) # version

 
     # parse through any headers
 
     # parse through any headers

-       headers=AMF.getint(req)                                 # Read number of headers
-       headers.times do                                                # Read each header
-         name=AMF.getstring(req)                               #  |
-         req.getc                                                              #  | skip boolean
-         value=AMF.getvalue(req)                               #  |
-       end
+    headers = AMF.getint(req)        # Read number of headers
+    headers.times do                 # Read each header
+      AMF.getstring(req)             #  |
+      req.getc                       #  | skip boolean
+      AMF.getvalue(req)              #  |
+    end

 
     # parse through responses
     results = {}
 
     # parse through responses
     results = {}

-    bodies=AMF.getint(req)                                     # Read number of bodies
-       bodies.times do                                                 # Read each body
-         message=AMF.getstring(req)                    #  | get message name
-         index=AMF.getstring(req)                              #  | get index in response sequence
-         bytes=AMF.getlong(req)                                #  | get total size in bytes
-         args=AMF.getvalue(req)                                #  | get response (probably an array)
+    bodies = AMF.getint(req)         # Read number of bodies
+    bodies.times do                  # Read each body
+      message = AMF.getstring(req)   #  | get message name
+      AMF.getstring(req)             #  | get index in response sequence
+      AMF.getlong(req)               #  | get total size in bytes
+      args = AMF.getvalue(req)       #  | get response (probably an array)

       results[message] = args
     end
     @amf_result = results
       results[message] = args
     end
     @amf_result = results


@@ -691,17 +1395,17 @@ class AmfControllerTest < ActionController::TestCase
       yield map, bbox
     end
   end
       yield map, bbox
     end
   end

-  
+

   # this should be what AMF controller returns when the bbox of a
   # whichways request is invalid or too large.
   # this should be what AMF controller returns when the bbox of a
   # whichways request is invalid or too large.

-  def assert_boundary_error(map, msg=nil, error_hint=nil)
+  def assert_boundary_error(map, msg = nil, error_hint = nil)

     expected_map = [-2, "Sorry - I can't get the map for that area.#{msg}"]
     assert_equal expected_map, map, "AMF controller should have returned an error. (#{error_hint})"
   end
 
   # this should be what AMF controller returns when the bbox of a
   # whichways_deleted request is invalid or too large.
     expected_map = [-2, "Sorry - I can't get the map for that area.#{msg}"]
     assert_equal expected_map, map, "AMF controller should have returned an error. (#{error_hint})"
   end
 
   # this should be what AMF controller returns when the bbox of a
   # whichways_deleted request is invalid or too large.

-  def assert_deleted_boundary_error(map, msg=nil, error_hint=nil)
+  def assert_deleted_boundary_error(map, msg = nil, error_hint = nil)

     expected_map = [-2, "Sorry - I can't get the map for that area.#{msg}"]
     assert_equal expected_map, map, "AMF controller should have returned an error. (#{error_hint})"
   end
     expected_map = [-2, "Sorry - I can't get the map for that area.#{msg}"]
     assert_equal expected_map, map, "AMF controller should have returned an error. (#{error_hint})"
   end