From 88b06aad3d8a90a046d5cbfe160afa8ea1e2251c Mon Sep 17 00:00:00 2001
From: Andreas Huber <anh@fjd.de>
Date: Wed, 20 May 2020 08:25:52 +0200
Subject: [PATCH] =?UTF-8?q?eID-org-acting-person.json=20aufgel=C3=B6st=20u?=
 =?UTF-8?q?nd=20in=20eID-natural-person.json=20integriert.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/Release Notes/Version_0.5.md        |  3 ++
 models/common/eID-natural-person.json    | 60 +++++++++++++++++++-----
 models/common/eID-org-acting-person.json | 50 --------------------
 3 files changed, 51 insertions(+), 62 deletions(-)
 delete mode 100644 models/common/eID-org-acting-person.json

diff --git a/docs/Release Notes/Version_0.5.md b/docs/Release Notes/Version_0.5.md
index 3cfef478..9a9e3697 100644
--- a/docs/Release Notes/Version_0.5.md	
+++ b/docs/Release Notes/Version_0.5.md	
@@ -39,6 +39,9 @@ Wo möglich wurde `"additionalProperties": false` gesetzt um weitere Properties
 ### Destination
 models/destination-no-id.json
 
+### eID
+- eID-org-acting-person.json aufgelöst und in eID-natural-person.json integriert.
+
 ### Postfachadresse
 models/common/address-national.json
 models/common/address-postbox.json
diff --git a/models/common/eID-natural-person.json b/models/common/eID-natural-person.json
index 429d6ce6..34f94215 100644
--- a/models/common/eID-natural-person.json
+++ b/models/common/eID-natural-person.json
@@ -1,17 +1,53 @@
 {
   "title": "Identity Information with Address",
   "description": "",
-  "allOf": [
-    {
-      "$ref": "./eID-org-acting-person.json"
-    },
-    {
-      "type": "object",
-      "properties": {
-        "placeOfResidence": {
-          "$ref": "./address-national.json"
-        }
-      }
+  "type": "object",
+  "properties": {
+    "placeOfBirth": {
+      "type": "string",
+      "description": "Geburtsort"
+    },
+    "dateOfBirth": {
+      "type": "string",
+      "format": "date",
+      "description": "Geburtsdatum"
+    },
+    "gender": {
+      "type": "string",
+      "enum": [
+        "m",
+        "w",
+        "x",
+        "d"
+      ],
+      "description": "Geschlecht (m=männlich, w=weiblich, x=keine Angabe, d=divers)"
+    },
+    "nationality": {
+      "type": "string",
+      "description": "Nationalität"
+    },
+    "artisticName": {
+      "type": "string",
+      "description": "Künstler- oder Ordensname"
+    },
+    "doctoralDegrees": {
+      "type": "string",
+      "description": "Akademischer Titel, z.B. \"Dr.\" oder \"Prof.\""
+    },
+    "birthName": {
+      "type": "string",
+      "description": "Geburtsname"
+    },
+    "givenName": {
+      "type": "string",
+      "description": "Vorname(n)"
+    },
+    "familyName": {
+      "type": "string",
+      "description": "Familienname"
+    },
+    "placeOfResidence": {
+      "$ref": "./address-national.json"
     }
-  ]
+  }
 }
\ No newline at end of file
diff --git a/models/common/eID-org-acting-person.json b/models/common/eID-org-acting-person.json
deleted file mode 100644
index 1cd49884..00000000
--- a/models/common/eID-org-acting-person.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "type": "object",
-  "title": "Identity Information without Address",
-  "additionalProperties": false,
-  "properties": {
-    "placeOfBirth": {
-      "type": "string",
-      "description": "Geburtsort"
-    },
-    "dateOfBirth": {
-      "type": "string",
-      "format": "date",
-      "description": "Geburtsdatum"
-    },
-    "gender": {
-      "type": "string",
-      "enum": [
-        "m",
-        "w",
-        "x",
-        "d"
-      ],
-      "description": "Geschlecht (m=männlich, w=weiblich, x=keine Angabe, d=divers)"
-    },
-    "nationality": {
-      "type": "string",
-      "description": "Nationalität"
-    },
-    "artisticName": {
-      "type": "string",
-      "description": "Künstler- oder Ordensname"
-    },
-    "doctoralDegrees": {
-      "type": "string",
-      "description": "Akademischer Titel, z.B. \"Dr.\" oder \"Prof.\""
-    },
-    "birthName": {
-      "type": "string",
-      "description": "Geburtsname"
-    },
-    "givenName": {
-      "type": "string",
-      "description": "Vorname(n)"
-    },
-    "familyName": {
-      "type": "string",
-      "description": "Familienname"
-    }
-  }
-}
\ No newline at end of file
-- 
GitLab