merge upstream/master and resolve conflicts from https://github.com/openstreetmap...

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

diff --git a/test/fixtures/relation_members.yml b/test/fixtures/relation_members.yml
index b37e5beae7cb46bd8890de546cc59ee56522c7b4..a5f04f1ef28bada604572422d7047f2c13f6aebc 100644 (file)
--- a/test/fixtures/relation_members.yml
+++ b/test/fixtures/relation_members.yml
@@ -1,38 +1,103 @@
 t1:
 t1:

-  id: 1
+  relation_id: 1
+  sequence_id: 1

   member_role: "some"
   member_type: "Way"
   member_id: 3
   version: 1
   member_role: "some"
   member_type: "Way"
   member_id: 3
   version: 1

+

 t2:
 t2:

-  id: 1
+  relation_id: 1
+  sequence_id: 2

   member_role: "some"
   member_type: "Node"
   member_id: 5
   version: 1
   member_role: "some"
   member_type: "Node"
   member_id: 5
   version: 1

+

 t3:
 t3:

-  id: 1
+  relation_id: 1
+  sequence_id: 3

   member_role: "some"
   member_type: "Relation"
   member_id: 3
   version: 1
   member_role: "some"
   member_type: "Relation"
   member_id: 3
   version: 1

+

 t4:
 t4:

-  id: 3
+  relation_id: 3
+  sequence_id: 1

   member_role: "some"
   member_type: "Node"
   member_id: 5
   version: 1
 
 t5:
   member_role: "some"
   member_type: "Node"
   member_id: 5
   version: 1
 
 t5:

-  id: 2
+  relation_id: 2
+  sequence_id: 1

   member_role: "some"
   member_type: "Node"
   member_id: 5
   version: 1
   
 public_used:
   member_role: "some"
   member_type: "Node"
   member_id: 5
   version: 1
   
 public_used:

-  id: 4
+  relation_id: 6
+  sequence_id: 1

   member_role: "used by other relation"
   member_type: "Relation"
   member_id: 5
   version: 1
   member_role: "used by other relation"
   member_type: "Relation"
   member_id: 5
   version: 1

+
+r8_v1_m1:
+  relation_id: 8
+  sequence_id: 1
+  member_role: "some node"
+  member_type: "Node"
+  member_id: 15
+  version: 1
+
+r8_v2_m1:
+  relation_id: 8
+  sequence_id: 1
+  member_role: "some changed node"
+  member_type: "Node"
+  member_id: 15
+  version: 2
+
+r8_v3_m1:
+  relation_id: 8
+  sequence_id: 1
+  member_role: "some changed node"
+  member_type: "Node"
+  member_id: 15
+  version: 3
+
+r8_v3_m3:
+  relation_id: 8
+  sequence_id: 2
+  member_role: "some relation"
+  member_type: "Relation"
+  member_id: 7
+  version: 3
+
+r8_v4_m1:
+  relation_id: 8
+  sequence_id: 1
+  member_role: "some node"
+  member_type: "Node"
+  member_id: 15
+  version: 4
+
+r8_v4_m2:
+  relation_id: 8
+  sequence_id: 2
+  member_role: "some way"
+  member_type: "Way"
+  member_id: 4
+  version: 4
+
+r8_v4_m3:
+  relation_id: 8
+  sequence_id: 3
+  member_role: "some relation"
+  member_type: "Relation"
+  member_id: 7
+  version: 4