Merge branch 'master' into notes

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

diff --git a/test/fixtures/way_nodes.yml b/test/fixtures/way_nodes.yml
index 0b43f6a9c1f586ce70c7c64f4276cb3a2e5a452b..262f29b3179cf3594ab2500808d67c6e6f08c77c 100644 (file)
--- a/test/fixtures/way_nodes.yml
+++ b/test/fixtures/way_nodes.yml
@@ -1,65 +1,135 @@
 t1a:
 t1a:

-  id: 1
+  way_id: 1

   node_id: 3
   sequence_id: 1
   version: 1
   
 t2:
   node_id: 3
   sequence_id: 1
   version: 1
   
 t2:

-  id: 2
+  way_id: 2

   node_id: 3
   sequence_id: 1
   version: 1
 
 t3:
   node_id: 3
   sequence_id: 1
   version: 1
 
 t3:

-  id: 3
+  way_id: 3

   node_id: 3
   sequence_id: 1
   version: 1
 
 w4_v1_n1:
   node_id: 3
   sequence_id: 1
   version: 1
 
 w4_v1_n1:

-  id: 4
+  way_id: 4

   node_id: 3
   sequence_id: 1
   version: 1
 
 w4_v1_n2:
   node_id: 3
   sequence_id: 1
   version: 1
 
 w4_v1_n2:

-  id: 4
+  way_id: 4

   node_id: 4
   sequence_id: 2
   version: 1
 
 w4_v2_n1:
   node_id: 4
   sequence_id: 2
   version: 1
 
 w4_v2_n1:

-  id: 4
+  way_id: 4

   node_id: 15
   sequence_id: 1
   version: 2
 
 w4_v2_n2:
   node_id: 15
   sequence_id: 1
   version: 2
 
 w4_v2_n2:

-  id: 4
+  way_id: 4

   node_id: 3
   sequence_id: 2
   version: 2
 
 w4_v2_n3:
   node_id: 3
   sequence_id: 2
   version: 2
 
 w4_v2_n3:

-  id: 4
+  way_id: 4

   node_id: 4
   sequence_id: 3
   version: 2
 
 w4_v3_n1:
   node_id: 4
   sequence_id: 3
   version: 2
 
 w4_v3_n1:

-  id: 4
+  way_id: 4

   node_id: 15
   sequence_id: 1
   version: 3
 
 w4_v3_n2:
   node_id: 15
   sequence_id: 1
   version: 3
 
 w4_v3_n2:

-  id: 4
+  way_id: 4

   node_id: 3
   sequence_id: 2
   version: 3
 
 w4_v4_n1:
   node_id: 3
   sequence_id: 2
   version: 3
 
 w4_v4_n1:

-  id: 4
+  way_id: 4

   node_id: 15
   sequence_id: 1
   version: 4
   node_id: 15
   sequence_id: 1
   version: 4

+
+w5_n1:
+  way_id: 5
+  node_id: 4
+  sequence_id: 1
+  version: 1
+
+w5_n2:
+  way_id: 5
+  node_id: 4
+  sequence_id: 2
+  version: 1
+
+w6_v1_n1:
+  way_id: 6
+  node_id: 3
+  sequence_id: 1
+  version: 1
+
+w6_v1_n2:
+  way_id: 6
+  node_id: 2
+  sequence_id: 2
+  version: 1
+
+w6_v2_n1:
+  way_id: 6
+  node_id: 3
+  sequence_id: 1
+  version: 2
+
+w6_v2_n2:
+  way_id: 6
+  node_id: 2
+  sequence_id: 2
+  version: 2
+
+w6_v3_n1:
+  way_id: 6
+  node_id: 3
+  sequence_id: 1
+  version: 3
+
+w6_v3_n2:
+  way_id: 6
+  node_id: 2
+  sequence_id: 2
+  version: 3
+
+w6_v4_n1:
+  way_id: 6
+  node_id: 3
+  sequence_id: 1
+  version: 4
+
+w6_v4_n2:
+  way_id: 6
+  node_id: 2
+  sequence_id: 2
+  version: 4
+
+w6_v4_n3:
+  way_id: 6
+  node_id: 4
+  sequence_id: 3
+  version: 4
+
+
+
+