From e1566637231c9605ab7f85feae06bf82225174df Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Fri, 7 Nov 2008 11:20:25 +0000 Subject: [PATCH] Booleans should be true/false for compatibility with other db adapters --- test/fixtures/changesets.yml | 8 +++---- test/fixtures/current_nodes.yml | 30 ++++++++++++------------ test/fixtures/current_relations.yml | 6 ++--- test/fixtures/current_ways.yml | 8 +++---- test/fixtures/gpx_files.yml | 6 ++--- test/fixtures/nodes.yml | 36 ++++++++++++++--------------- test/fixtures/relations.yml | 6 ++--- test/fixtures/users.yml | 12 +++++----- test/fixtures/ways.yml | 14 +++++------ 9 files changed, 63 insertions(+), 63 deletions(-) diff --git a/test/fixtures/changesets.yml b/test/fixtures/changesets.yml index 7d97f2abf..03fc36ddf 100644 --- a/test/fixtures/changesets.yml +++ b/test/fixtures/changesets.yml @@ -3,22 +3,22 @@ normal_user_first_change: id: 1 user_id: 1 created_at: "2007-01-01 00:00:00" - open: 1 + open: true second_user_first_change: id: 2 user_id: 2 created_at: "2008-05-01 01:23:45" - open: 1 + open: true normal_user_closed_change: id: 3 user_id: 1 created_at: "2007-01-01 00:00:00" - open: 0 + open: false normal_user_version_change: id: 4 user_id: 1 created_at: "2008-01-01 00:00:00" - open: 1 + open: true diff --git a/test/fixtures/current_nodes.yml b/test/fixtures/current_nodes.yml index 7e4f33a07..2d4b35fd6 100644 --- a/test/fixtures/current_nodes.yml +++ b/test/fixtures/current_nodes.yml @@ -6,7 +6,7 @@ visible_node: latitude: <%= 1*SCALE %> longitude: <%= 1*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(1,1) %> timestamp: 2007-01-01 00:00:00 @@ -16,7 +16,7 @@ invisible_node: latitude: <%= 2*SCALE %> longitude: <%= 2*SCALE %> changeset_id: 1 - visible: 0 + visible: false version: 1 tile: <%= QuadTile.tile_for_point(2,2) %> timestamp: 2007-01-01 00:00:00 @@ -26,7 +26,7 @@ used_node_1: latitude: <%= 3*SCALE %> longitude: <%= 3*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(3,3) %> timestamp: 2007-01-01 00:00:00 @@ -36,7 +36,7 @@ used_node_2: latitude: <%= 4*SCALE %> longitude: <%= 4*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(4,4) %> timestamp: 2007-01-01 00:00:00 @@ -46,7 +46,7 @@ node_used_by_relationship: latitude: <%= 5*SCALE %> longitude: <%= 5*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(5,5) %> timestamp: 2007-01-01 00:00:00 @@ -56,7 +56,7 @@ node_too_far_north: latitude: <%= 90.01*SCALE %> longitude: <%= 6*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(90.01,6) %> timestamp: 2007-01-01 00:00:00 @@ -66,7 +66,7 @@ node_north_limit: latitude: <%= 90*SCALE %> longitude: <%= 11*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(90,11) %> timestamp: 2008-07-08 14:50:00 @@ -76,7 +76,7 @@ node_too_far_south: latitude: <%= -90.01*SCALE %> longitude: <%= 7*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(-90.01,7) %> timestamp: 2007-01-01 00:00:00 @@ -86,7 +86,7 @@ node_south_limit: latitude: <%= -90*SCALE %> longitude: <%= 12*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(-90,12) %> timestamp: 2008-07-08 15:02:18 @@ -96,7 +96,7 @@ node_too_far_west: latitude: <%= 8*SCALE %> longitude: <%= -180.01*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(8,-180.01) %> timestamp: 2007-01-01 00:00:00 @@ -106,7 +106,7 @@ node_west_limit: latitude: <%= 13*SCALE %> longitude: <%= -180*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(13,-180) %> timestamp: 2008-07-08 15:17:37 @@ -116,7 +116,7 @@ node_too_far_east: latitude: <%= 9*SCALE %> longitude: <%= 180.01*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(9,180.01) %> timestamp: 2007-01-01 00:00:00 @@ -126,7 +126,7 @@ node_east_limit: latitude: <%= 14*SCALE %> longitude: <%= 180*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(14,180) %> timestamp: 2008-07-08 15:46:16 @@ -136,7 +136,7 @@ node_totally_wrong: latitude: <%= 200*SCALE %> longitude: <%= 200*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(200,200) %> timestamp: 2007-01-01 00:00:00 @@ -146,7 +146,7 @@ node_with_versions: latitude: <%= 1*SCALE %> longitude: <%= 1*SCALE %> changeset_id: 4 - visible: 1 + visible: true version: 4 tile: <%= QuadTile.tile_for_point(1,1) %> timestamp: 2008-01-01 00:04:00 diff --git a/test/fixtures/current_relations.yml b/test/fixtures/current_relations.yml index e4c3b18fa..165f1a21e 100644 --- a/test/fixtures/current_relations.yml +++ b/test/fixtures/current_relations.yml @@ -2,19 +2,19 @@ visible_relation: id: 1 changeset_id: 1 timestamp: 2007-01-01 00:00:00 - visible: 1 + visible: true version: 1 invisible_relation: id: 2 changeset_id: 1 timestamp: 2007-01-01 00:00:00 - visible: 0 + visible: false version: 1 used_relation: id: 3 changeset_id: 1 timestamp: 2007-01-01 00:00:00 - visible: 1 + visible: true version: 1 diff --git a/test/fixtures/current_ways.yml b/test/fixtures/current_ways.yml index cf25b4f46..44a54caac 100644 --- a/test/fixtures/current_ways.yml +++ b/test/fixtures/current_ways.yml @@ -2,26 +2,26 @@ visible_way: id: 1 changeset_id: 1 timestamp: 2007-01-01 00:00:00 - visible: 1 + visible: true version: 1 invisible_way: id: 2 changeset_id: 1 timestamp: 2007-01-01 00:00:00 - visible: 0 + visible: false version: 1 used_way: id: 3 changeset_id: 1 timestamp: 2007-01-01 00:00:00 - visible: 1 + visible: true version: 1 way_with_versions: id: 4 changeset_id: 4 timestamp: 2008-01-01 00:01:00 - visible: 1 + visible: true version: 4 diff --git a/test/fixtures/gpx_files.yml b/test/fixtures/gpx_files.yml index 48c58dca9..3ab74c806 100644 --- a/test/fixtures/gpx_files.yml +++ b/test/fixtures/gpx_files.yml @@ -1,12 +1,12 @@ first_trace_file: id: 1 user_id: 1 - visible: 1 + visible: true name: Fist Trace.gpx size: latitude: 1 longitude: 1 timestamp: "2008-10-29 10:10:10" - public: 1 + public: true description: This is a trace - inserted: 1 + inserted: true diff --git a/test/fixtures/nodes.yml b/test/fixtures/nodes.yml index c58cda962..27f51f6a2 100644 --- a/test/fixtures/nodes.yml +++ b/test/fixtures/nodes.yml @@ -6,7 +6,7 @@ visible_node: latitude: <%= 1*SCALE %> longitude: <%= 1*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(1,1) %> timestamp: 2007-01-01 00:00:00 @@ -16,7 +16,7 @@ invisible_node: latitude: <%= 2*SCALE %> longitude: <%= 2*SCALE %> changeset_id: 1 - visible: 0 + visible: false version: 1 tile: <%= QuadTile.tile_for_point(2,2) %> timestamp: 2007-01-01 00:00:00 @@ -26,7 +26,7 @@ used_node_1: latitude: <%= 3*SCALE %> longitude: <%= 3*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(3,3) %> timestamp: 2007-01-01 00:00:00 @@ -36,7 +36,7 @@ used_node_2: latitude: <%= 4*SCALE %> longitude: <%= 4*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(4,4) %> timestamp: 2007-01-01 00:00:00 @@ -46,7 +46,7 @@ node_used_by_relationship: latitude: <%= 5*SCALE %> longitude: <%= 5*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(5,5) %> timestamp: 2007-01-01 00:00:00 @@ -56,7 +56,7 @@ node_too_far_north: latitude: <%= 90.01*SCALE %> longitude: <%= 6*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(90.01,6) %> timestamp: 2007-01-01 00:00:00 @@ -66,7 +66,7 @@ node_north_limit: latitude: <%= 90*SCALE %> longitude: <%= 11*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(90,11) %> timestamp: 2008-07-08 14:50:00 @@ -76,7 +76,7 @@ node_too_far_south: latitude: <%= -90.01*SCALE %> longitude: <%= 7*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(-90.01,7) %> timestamp: 2007-01-01 00:00:00 @@ -86,7 +86,7 @@ node_south_limit: latitude: <%= -90*SCALE %> longitude: <%= 12*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(-90,12) %> timestamp: 2008-07-08 15:02:18 @@ -96,7 +96,7 @@ node_too_far_west: latitude: <%= 8*SCALE %> longitude: <%= -180.01*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(8,-180.01) %> timestamp: 2007-01-01 00:00:00 @@ -106,7 +106,7 @@ node_west_limit: latitude: <%= 13*SCALE %> longitude: <%= -180*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(13,-180) %> timestamp: 2008-07-08 15:17:37 @@ -116,7 +116,7 @@ node_too_far_east: latitude: <%= 9*SCALE %> longitude: <%= 180.01*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(9,180.01) %> timestamp: 2007-01-01 00:00:00 @@ -126,7 +126,7 @@ node_east_limit: latitude: <%= 14*SCALE %> longitude: <%= 180*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(14,180) %> timestamp: 2008-07-08 15:46:16 @@ -136,7 +136,7 @@ node_totally_wrong: latitude: <%= 200*SCALE %> longitude: <%= 200*SCALE %> changeset_id: 1 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(200,200) %> timestamp: 2007-01-01 00:00:00 @@ -146,7 +146,7 @@ node_with_versions_v1: latitude: <%= 1*SCALE %> longitude: <%= 1*SCALE %> changeset_id: 4 - visible: 1 + visible: true version: 1 tile: <%= QuadTile.tile_for_point(1,1) %> timestamp: 2008-01-01 00:01:00 @@ -156,7 +156,7 @@ node_with_versions_v2: latitude: <%= 2*SCALE %> longitude: <%= 2*SCALE %> changeset_id: 4 - visible: 1 + visible: true version: 2 tile: <%= QuadTile.tile_for_point(1,1) %> timestamp: 2008-01-01 00:02:00 @@ -166,7 +166,7 @@ node_with_versions_v3: latitude: <%= 1*SCALE %> longitude: <%= 1*SCALE %> changeset_id: 4 - visible: 1 + visible: true version: 3 tile: <%= QuadTile.tile_for_point(1,1) %> timestamp: 2008-01-01 00:03:00 @@ -176,7 +176,7 @@ node_with_versions_v4: latitude: <%= 1*SCALE %> longitude: <%= 1*SCALE %> changeset_id: 4 - visible: 1 + visible: true version: 4 tile: <%= QuadTile.tile_for_point(1,1) %> timestamp: 2008-01-01 00:04:00 diff --git a/test/fixtures/relations.yml b/test/fixtures/relations.yml index e4c3b18fa..165f1a21e 100644 --- a/test/fixtures/relations.yml +++ b/test/fixtures/relations.yml @@ -2,19 +2,19 @@ visible_relation: id: 1 changeset_id: 1 timestamp: 2007-01-01 00:00:00 - visible: 1 + visible: true version: 1 invisible_relation: id: 2 changeset_id: 1 timestamp: 2007-01-01 00:00:00 - visible: 0 + visible: false version: 1 used_relation: id: 3 changeset_id: 1 timestamp: 2007-01-01 00:00:00 - visible: 1 + visible: true version: 1 diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 28e1aca3d..b639d2265 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -2,11 +2,11 @@ normal_user: id: 1 email: test@openstreetmap.org - active: 1 + active: true pass_crypt: <%= Digest::MD5.hexdigest('test') %> creation_time: "2007-01-01 00:00:00" display_name: test - data_public: 0 + data_public: false description: test home_lat: 12.1 home_lon: 12.1 @@ -15,11 +15,11 @@ normal_user: second_user: id: 2 email: test@example.com - active: 1 + active: true pass_crypt: <%= Digest::MD5.hexdigest('test') %> creation_time: "2008-05-01 01:23:45" display_name: test2 - data_public: 1 + data_public: true description: some test description home_lat: 12 home_lon: 12 @@ -28,10 +28,10 @@ second_user: inactive_user: id: 3 email: inactive@openstreetmap.org - active: 0 + active: false pass_crypt: <%= Digest::MD5::hexdigest('test2') %> display_name: Inactive User - data_public: 1 + data_public: true description: description home_lat: 123.4 home_lon: 12.34 diff --git a/test/fixtures/ways.yml b/test/fixtures/ways.yml index 4f0af9854..80b1da642 100644 --- a/test/fixtures/ways.yml +++ b/test/fixtures/ways.yml @@ -2,48 +2,48 @@ visible_way: id: 1 changeset_id: 1 timestamp: 2007-01-01 00:00:00 - visible: 1 + visible: true version: 1 invisible_way: id: 2 changeset_id: 1 timestamp: 2007-01-01 00:00:00 - visible: 0 + visible: false version: 1 used_way: id: 3 changeset_id: 1 timestamp: 2007-01-01 00:00:00 - visible: 1 + visible: true version: 1 way_with_versions_v1: id: 4 changeset_id: 4 timestamp: 2008-01-01 00:01:00 - visible: 1 + visible: true version: 1 way_with_versions_v2: id: 4 changeset_id: 4 timestamp: 2008-01-01 00:02:00 - visible: 1 + visible: true version: 2 way_with_versions: id: 4 changeset_id: 4 timestamp: 2008-01-01 00:03:00 - visible: 1 + visible: true version: 3 way_with_versions_v4: id: 4 changeset_id: 4 timestamp: 2008-01-01 00:04:00 - visible: 1 + visible: true version: 4 -- 2.43.2