add shared Area and VehicleParkingCount types

theopensystemslab · Sep 29, 2023 · 099836b · 099836b
1 parent 5bfde47
commit 099836b
Show file tree

Hide file tree

Showing 4 changed files with 110 additions and 181 deletions.
diff --git a/schema/schema.json b/schema/schema.json
@@ -872,6 +872,22 @@
       ],
       "description": "Planning application types supported by this schema"
     },
+    "Area": {
+      "$id": "#Area",
+      "additionalProperties": false,
+      "properties": {
+        "hectares": {
+          "type": "number"
+        },
+        "squareMetres": {
+          "type": "number"
+        }
+      },
+      "required": [
+        "squareMetres"
+      ],
+      "type": "object"
+    },
     "BaseApplicant": {
       "$id": "#BaseApplicant",
       "additionalProperties": false,
@@ -972,16 +988,7 @@
           "additionalProperties": false,
           "properties": {
             "area": {
-              "additionalProperties": false,
-              "properties": {
-                "squareMetres": {
-                  "type": "number"
-                }
-              },
-              "required": [
-                "squareMetres"
-              ],
-              "type": "object"
+              "$ref": "#/definitions/Area"
             }
           },
           "required": [
@@ -993,16 +1000,7 @@
           "additionalProperties": false,
           "properties": {
             "area": {
-              "additionalProperties": false,
-              "properties": {
-                "squareMetres": {
-                  "type": "number"
-                }
-              },
-              "required": [
-                "squareMetres"
-              ],
-              "type": "object"
+              "$ref": "#/definitions/Area"
             },
             "count": {
               "additionalProperties": false,
@@ -1703,16 +1701,7 @@
           "additionalProperties": false,
           "properties": {
             "area": {
-              "additionalProperties": false,
-              "properties": {
-                "squareMetres": {
-                  "type": "number"
-                }
-              },
-              "required": [
-                "squareMetres"
-              ],
-              "type": "object"
+              "$ref": "#/definitions/Area"
             }
           },
           "required": [
@@ -1724,16 +1713,7 @@
           "additionalProperties": false,
           "properties": {
             "area": {
-              "additionalProperties": false,
-              "properties": {
-                "squareMetres": {
-                  "type": "number"
-                }
-              },
-              "required": [
-                "squareMetres"
-              ],
-              "type": "object"
+              "$ref": "#/definitions/Area"
             },
             "count": {
               "additionalProperties": false,
@@ -1967,6 +1947,31 @@
                         "count"
                       ],
                       "type": "object"
+                    },
+                    "residents": {
+                      "additionalProperties": false,
+                      "properties": {
+                        "count": {
+                          "additionalProperties": false,
+                          "properties": {
+                            "existing": {
+                              "type": "number"
+                            },
+                            "proposed": {
+                              "type": "number"
+                            }
+                          },
+                          "required": [
+                            "existing",
+                            "proposed"
+                          ],
+                          "type": "object"
+                        }
+                      },
+                      "required": [
+                        "count"
+                      ],
+                      "type": "object"
                     }
                   },
                   "type": "object"
@@ -2048,6 +2053,31 @@
                         "count"
                       ],
                       "type": "object"
+                    },
+                    "residents": {
+                      "additionalProperties": false,
+                      "properties": {
+                        "count": {
+                          "additionalProperties": false,
+                          "properties": {
+                            "existing": {
+                              "type": "number"
+                            },
+                            "proposed": {
+                              "type": "number"
+                            }
+                          },
+                          "required": [
+                            "existing",
+                            "proposed"
+                          ],
+                          "type": "object"
+                        }
+                      },
+                      "required": [
+                        "count"
+                      ],
+                      "type": "object"
                     }
                   },
                   "type": "object"
@@ -2228,20 +2258,7 @@
           "additionalProperties": false,
           "properties": {
             "area": {
-              "additionalProperties": false,
-              "properties": {
-                "hectares": {
-                  "type": "number"
-                },
-                "squareMetres": {
-                  "type": "number"
-                }
-              },
-              "required": [
-                "squareMetres",
-                "hectares"
-              ],
-              "type": "object"
+              "$ref": "#/definitions/Area"
             },
             "site": {
               "type": "object"
@@ -12717,20 +12734,7 @@
           "additionalProperties": false,
           "properties": {
             "area": {
-              "additionalProperties": false,
-              "properties": {
-                "hectares": {
-                  "type": "number"
-                },
-                "squareMetres": {
-                  "type": "number"
-                }
-              },
-              "required": [
-                "squareMetres",
-                "hectares"
-              ],
-              "type": "object"
+              "$ref": "#/definitions/Area"
             },
             "site": {
               "type": "object"
@@ -13565,20 +13569,7 @@
           "additionalProperties": false,
           "properties": {
             "area": {
-              "additionalProperties": false,
-              "properties": {
-                "hectares": {
-                  "type": "number"
-                },
-                "squareMetres": {
-                  "type": "number"
-                }
-              },
-              "required": [
-                "squareMetres",
-                "hectares"
-              ],
-              "type": "object"
+              "$ref": "#/definitions/Area"
             },
             "site": {
               "type": "object"

diff --git a/types/schema/data/Property.ts b/types/schema/data/Property.ts
@@ -1,4 +1,5 @@
 import {PropertyTypes} from '../../enums/PropertyTypes';
+import {Area} from '../../utils';
 
 /**
  * @id #Property
@@ -17,10 +18,7 @@ export interface UKProperty {
   type: PropertyType;
   boundary?: {
     site: Record<string, any>; // @todo use GeoJSON from utils here, but ajv tests failing
-    area: {
-      squareMetres: number;
-      hectares: number;
-    };
+    area: Area;
   };
   constraints?: {
     planning: PlanningConstraint[];