X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bed9cd00ed166ce346da4b8a9b654ddf86e64e70..2b2264ddab13ee8ffa7e90d8b803d1a0296a7cff:/test/fixtures/nodes.yml

diff --git a/test/fixtures/nodes.yml b/test/fixtures/nodes.yml
index 5b690696e..7841c6e0e 100644
--- a/test/fixtures/nodes.yml
+++ b/test/fixtures/nodes.yml
@@ -2,7 +2,7 @@
 <% SCALE = 10000000 unless defined?(SCALE) %>
 
 visible_node:
-  id: 1
+  node_id: 1
   latitude: <%= 1*SCALE %>
   longitude: <%= 1*SCALE %>
   changeset_id: 1
@@ -12,7 +12,7 @@ visible_node:
   timestamp: 2007-01-01 00:00:00
 
 invisible_node:
-  id: 2
+  node_id: 2
   latitude: <%= 2*SCALE %>
   longitude: <%= 2*SCALE %>
   changeset_id: 1
@@ -22,17 +22,17 @@ invisible_node:
   timestamp: 2007-01-01 00:00:00
 
 used_node_1:
-  id: 3
+  node_id: 3
   latitude: <%= 3*SCALE %>
   longitude: <%= 3*SCALE %>
-  changeset_id: 1
+  changeset_id: 2
   visible: true
   version: 1
   tile: <%= QuadTile.tile_for_point(3,3) %>
   timestamp: 2007-01-01 00:00:00
 
 used_node_2:
-  id: 4
+  node_id: 4
   latitude: <%= 4*SCALE %>
   longitude: <%= 4*SCALE %>
   changeset_id: 1
@@ -42,17 +42,17 @@ used_node_2:
   timestamp: 2007-01-01 00:00:00
 
 node_used_by_relationship:
-  id: 5
+  node_id: 5
   latitude: <%= 5*SCALE %>
   longitude: <%= 5*SCALE %>
-  changeset_id: 1
+  changeset_id: 2
   visible: true
   version: 1
   tile: <%= QuadTile.tile_for_point(5,5) %>
   timestamp: 2007-01-01 00:00:00
 
 node_too_far_north:
-  id: 6
+  node_id: 6
   latitude: <%= 90.01*SCALE %>
   longitude: <%= 6*SCALE %>
   changeset_id: 5
@@ -62,7 +62,7 @@ node_too_far_north:
   timestamp: 2007-01-01 00:00:00
   
 node_north_limit:
-  id: 11
+  node_id: 11
   latitude: <%= 90*SCALE %>
   longitude: <%= 11*SCALE %>
   changeset_id: 5
@@ -72,7 +72,7 @@ node_north_limit:
   timestamp: 2008-07-08 14:50:00
   
 node_too_far_south:
-  id: 7
+  node_id: 7
   latitude: <%= -90.01*SCALE %>
   longitude: <%= 7*SCALE %>
   changeset_id: 5
@@ -82,7 +82,7 @@ node_too_far_south:
   timestamp: 2007-01-01 00:00:00
   
 node_south_limit:
-  id: 12
+  node_id: 12
   latitude: <%= -90*SCALE %>
   longitude: <%= 12*SCALE %>
   changeset_id: 5
@@ -92,7 +92,7 @@ node_south_limit:
   timestamp: 2008-07-08 15:02:18
   
 node_too_far_west:
-  id: 8
+  node_id: 8
   latitude: <%= 8*SCALE %>
   longitude: <%= -180.01*SCALE %>
   changeset_id: 5
@@ -102,7 +102,7 @@ node_too_far_west:
   timestamp: 2007-01-01 00:00:00
   
 node_west_limit:
-  id: 13
+  node_id: 13
   latitude: <%= 13*SCALE %>
   longitude: <%= -180*SCALE %>
   changeset_id: 5
@@ -112,7 +112,7 @@ node_west_limit:
   timestamp: 2008-07-08 15:17:37
   
 node_too_far_east:
-  id: 9
+  node_id: 9
   latitude: <%= 9*SCALE %>
   longitude: <%= 180.01*SCALE %>
   changeset_id: 5
@@ -122,7 +122,7 @@ node_too_far_east:
   timestamp: 2007-01-01 00:00:00
   
 node_east_limit:
-  id: 14
+  node_id: 14
   latitude: <%= 14*SCALE %>
   longitude: <%= 180*SCALE %>
   changeset_id: 5
@@ -132,7 +132,7 @@ node_east_limit:
   timestamp: 2008-07-08 15:46:16
 
 node_totally_wrong:
-  id: 10
+  node_id: 10
   latitude: <%= 200*SCALE %>
   longitude: <%= 200*SCALE %>
   changeset_id: 5
@@ -142,7 +142,7 @@ node_totally_wrong:
   timestamp: 2007-01-01 00:00:00
   
 node_with_versions_v1:
-  id: 15
+  node_id: 15
   latitude: <%= 1*SCALE %>
   longitude: <%= 1*SCALE %>
   changeset_id: 4
@@ -152,7 +152,7 @@ node_with_versions_v1:
   timestamp: 2008-01-01 00:01:00
 
 node_with_versions_v2:
-  id: 15
+  node_id: 15
   latitude: <%= 2*SCALE %>
   longitude: <%= 2*SCALE %>
   changeset_id: 4
@@ -162,7 +162,7 @@ node_with_versions_v2:
   timestamp: 2008-01-01 00:02:00
 
 node_with_versions_v3:
-  id: 15
+  node_id: 15
   latitude: <%= 1*SCALE %>
   longitude: <%= 1*SCALE %>
   changeset_id: 4
@@ -172,7 +172,7 @@ node_with_versions_v3:
   timestamp: 2008-01-01 00:03:00
 
 node_with_versions_v4:
-  id: 15
+  node_id: 15
   latitude: <%= 1*SCALE %>
   longitude: <%= 1*SCALE %>
   changeset_id: 4
@@ -180,3 +180,55 @@ node_with_versions_v4:
   version: 4
   tile: <%= QuadTile.tile_for_point(1,1) %>
   timestamp: 2008-01-01 00:04:00
+  
+public_visible_node:
+  node_id: 16
+  latitude: <%= 1*SCALE %>
+  longitude: <%= 1*SCALE %>
+  changeset_id: 2
+  visible: true
+  version: 1
+  tile: <%= QuadTile.tile_for_point(1,1) %>
+  timestamp: 2007-01-01 00:00:00
+
+redacted_node_redacted_version:
+  node_id: 17
+  latitude: <%= 1*SCALE %>
+  longitude: <%= 1*SCALE %>
+  changeset_id: 2
+  visible: true
+  version: 1
+  tile: <%= QuadTile.tile_for_point(1,1) %>
+  timestamp: 2007-01-01 00:00:00
+  redaction_id: 1
+
+redacted_node_current_version:
+  node_id: 17
+  latitude: <%= 1*SCALE %>
+  longitude: <%= 1*SCALE %>
+  changeset_id: 2
+  visible: false
+  version: 2
+  tile: <%= QuadTile.tile_for_point(1,1) %>
+  timestamp: 2007-01-01 00:00:00
+
+node_with_name_redacted_version:
+  node_id: 18
+  latitude: <%= 1*SCALE %>
+  longitude: <%= 1*SCALE %>
+  changeset_id: 2
+  visible: true
+  version: 1
+  tile: <%= QuadTile.tile_for_point(1,1) %>
+  timestamp: 2007-01-01 00:00:00
+  redaction_id: 1
+
+node_with_name_current_version:
+  node_id: 18
+  latitude: <%= 1*SCALE %>
+  longitude: <%= 1*SCALE %>
+  changeset_id: 2
+  visible: true
+  version: 2
+  tile: <%= QuadTile.tile_for_point(1,1) %>
+  timestamp: 2007-01-01 00:00:00