Abgleich mit Labor Wohngeld

models/common/address-international.json

@@ -20,10 +20,16 @@
     "lines": {
       "type": "array",
       "maxItems": 5,
-      "minItems": 1,
+      "minItems": 2,
+      "description": "Anschriftzeile",
       "items": {
-        "type": "string"
+        "type": "string",
+        "maxLength": 35
       }
+    },
+    "country": {
+      "type": "string",
+      "description": "Staat"
     }
   }
 }
\ No newline at end of file

models/common/address-national.json

 {
   "title": "National Address",
-  "type": "object",
   "description": "Eine nationale (deutsche) Adresse, bestehend aus Straße, Hausnummer, PLZ und Ort.",
-  "properties": {
-    "street": {
-      "type": "string",
-      "description": "Straße"
-    },
-    "house-number": {
-      "type": "string",
-      "description": "Hausnummer"
-    },
-    "postal-code": {
-      "type": "string",
-      "description": "PLZ"
-    },
-    "city": {
-      "type": "string",
-      "description": "Ort"
-    }
-  },
   "x-examples": {
     "example-1": {
       "street": "Kurzer Weg",
@@ -27,5 +8,68 @@
       "postal-code": "12345",
       "city": "Ankh-Morpork"
     }
-  }
+  },
+  "oneOf": [
+    {
+      "properties": {
+        "street": {
+          "type": "string",
+          "description": "Straße",
+          "maxLength": 55
+        },
+        "house-number": {
+          "type": [
+            "string",
+            "integer"
+          ],
+          "description": "Hausnummer",
+          "maxLength": 9,
+          "minimum": 1
+        },
+        "house-number-suffix": {
+          "type": "string",
+          "description": "Hausnummerzusatz",
+          "maxLength": 2,
+          "pattern": "^[\\p{L}0-9. ]*$"
+        },
+        "postal-code": {
+          "type": "string",
+          "description": "Postleitzahl",
+          "minLength": 5,
+          "maxLength": 5,
+          "pattern": "^([0]{1}[1-9]{1}|[1-9]{1}[0-9]{1})[0-9]{3}$"
+        },
+        "city": {
+          "type": "string",
+          "description": "Ort",
+          "maxLength": 50
+        },
+        "address-supplement": {
+          "type": "string",
+          "description": "Adresszusatz"
+        }
+      }
+    },
+    {
+      "properties": {
+        "post-office-box": {
+          "type": "string",
+          "description": "Postfach"
+        },
+        "postal-code": {
+          "type": "string",
+          "description": "Postleitzahl",
+          "minLength": 5,
+          "maxLength": 5,
+          "pattern": "^([0]{1}[1-9]{1}|[1-9]{1}[0-9]{1})[0-9]{3}$"
+        },
+        "city": {
+          "type": "string",
+          "description": "Ort",
+          "maxLength": 50
+        }
+      }
+    }
+  ],
+  "type": "object"
 }
\ No newline at end of file

models/common/eID-org-acting-person.json

@@ -29,7 +29,7 @@
       "type": "string",
       "description": "Künstler- oder Ordensname"
     },
-    "academic-title": {
+    "doctoral-degrees": {
       "type": "string",
       "description": "Akademischer Titel, z.B. \"Dr.\" oder \"Prof.\""
     },

models/common/phone.json

 {
-  "title": "Phone",
   "type": "object",
+  "title": "Phone",
   "description": "Telefonnumer mit Zusatzinformationen",
+  "additionalProperties": false,
   "properties": {
     "number": {
       "type": "string",
       "title": "Phone Number",
+      "description": "Telefonnummer im internationalen Format, z.B. \"+49 89 32168-42\". Muss mit einem Plus beginnen und darf danach außer Ziffern nur Leerzeichen ( ) und Bindestriche (-) enthalten.",
       "example": "+49 89 32168-42",
-      "pattern": "^\\+[1-9]([ -]?[0-9]){1,14}$",
-      "description": "Telefonnummer im internationalen Format, z.B. \"+49 89 32168-42\". Muss mit einem Plus beginnen und darf danach außer Ziffern nur Leerzeichen ( ) und Bindestriche (-) enthalten."
+      "maxLength": 23
     },
     "mobile": {
       "type": "boolean",
       "description": "Zeigt an, ob es sich um eine Mobilfunknummer handelt."
     },
-    "type": {
+    "description": {
       "type": "string",
-      "enum": [
-        "work",
-        "home",
-        "other"
-      ],
-      "description": "Art der Telefonnummer: work=dienstlich, home=privat oder other=sonstige"
+      "description": "Beschreibung der Art der Telefonnummer"
     }
   },
   "required": [
-    "number",
-    "type"
+    "number"
   ]
 }
\ No newline at end of file

models/common/phonenr.json

-{
-  "type": "string",
-  "title": "Phone Number",
-  "example": "+49 89 32168-42",
-  "pattern": "^\\+[1-9]([ -]?[0-9]){1,14}$",
-  "description": "Telefonnummer im internationalen Format, z.B. \"+49 89 32168-42\". Muss mit einem Plus beginnen und darf danach außer Ziffern nur Leerzeichen ( ) und Bindestriche (-) enthalten."
-}
\ No newline at end of file