Merge remote-tracking branch 'upstream/master' into vagrant

[rails.git] / test / fixtures / current_nodes.yml

diff --git a/test/fixtures/current_nodes.yml b/test/fixtures/current_nodes.yml
index 6f21fd47f30a1267004e5e2116652cd1fe4f9ae2..af6ea01d51384fa643b4fe2a3aa7d1eba5fc5c4a 100644 (file)
--- a/test/fixtures/current_nodes.yml
+++ b/test/fixtures/current_nodes.yml
@@ -25,7 +25,7 @@ used_node_1:
   id: 3
   latitude: <%= 3*SCALE %>
   longitude: <%= 3*SCALE %>
   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) %>
   visible: true
   version: 1
   tile: <%= QuadTile.tile_for_point(3,3) %>


@@ -45,7 +45,7 @@ node_used_by_relationship:
   id: 5
   latitude: <%= 5*SCALE %>
   longitude: <%= 5*SCALE %>
   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) %>
   visible: true
   version: 1
   tile: <%= QuadTile.tile_for_point(5,5) %>


@@ -150,3 +150,33 @@ node_with_versions:
   version: 4
   tile: <%= QuadTile.tile_for_point(1,1) %>
   timestamp: 2008-01-01 00:04:00
   version: 4
   tile: <%= QuadTile.tile_for_point(1,1) %>
   timestamp: 2008-01-01 00:04:00

+  
+public_visible_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:
+  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:
+  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