fix missing or incorrect enum values

theopensystemslab · Oct 20, 2023 · 7ac10b6 · 7ac10b6
1 parent a057db8
commit 7ac10b6
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 43 deletions.
diff --git a/examples/data/ldcE.ts b/examples/data/ldcE.ts
@@ -1567,7 +1567,7 @@ export const validLDCE: Schema = {
       type: [
         {
           value: 'proposal.drawing.elevation',
-          description: 'Elevation plan - proposed',
+          description: 'Elevations - proposed',
         },
       ],
     },

diff --git a/examples/data/ldcP.ts b/examples/data/ldcP.ts
@@ -1082,7 +1082,7 @@ export const validLDCP: Schema = {
       type: [
         {
           value: 'property.drawing.elevation',
-          description: 'Elevation plan - existing',
+          description: 'Elevations - existing',
         },
       ],
     },
@@ -1100,7 +1100,7 @@ export const validLDCP: Schema = {
       type: [
         {
           value: 'proposal.drawing.elevation',
-          description: 'Elevation plan - proposed',
+          description: 'Elevations - proposed',
         },
       ],
     },

diff --git a/examples/data/planningPermission.ts b/examples/data/planningPermission.ts
@@ -1673,11 +1673,11 @@ export const validPlanningPermission: Schema = {
       type: [
         {
           value: 'property.drawing.elevation',
-          description: 'Elevation plan - existing',
+          description: 'Elevations - existing',
         },
         {
           value: 'proposal.drawing.elevation',
-          description: 'Elevation plan - proposed',
+          description: 'Elevations - proposed',
         },
       ],
     },

diff --git a/examples/validLawfulDevelopmentCertificateExisting.json b/examples/validLawfulDevelopmentCertificateExisting.json
@@ -1762,7 +1762,7 @@
       "type": [
         {
           "value": "proposal.drawing.elevation",
-          "description": "Elevation plan - proposed"
+          "description": "Elevations - proposed"
         }
       ]
     },

diff --git a/examples/validLawfulDevelopmentCertificateProposed.json b/examples/validLawfulDevelopmentCertificateProposed.json
@@ -1144,7 +1144,7 @@
       "type": [
         {
           "value": "property.drawing.elevation",
-          "description": "Elevation plan - existing"
+          "description": "Elevations - existing"
         }
       ]
     },
@@ -1162,7 +1162,7 @@
       "type": [
         {
           "value": "proposal.drawing.elevation",
-          "description": "Elevation plan - proposed"
+          "description": "Elevations - proposed"
         }
       ]
     },

diff --git a/examples/validPlanningPermission.json b/examples/validPlanningPermission.json
@@ -1694,11 +1694,11 @@
       "type": [
         {
           "value": "property.drawing.elevation",
-          "description": "Elevation plan - existing"
+          "description": "Elevations - existing"
         },
         {
           "value": "proposal.drawing.elevation",
-          "description": "Elevation plan - proposed"
+          "description": "Elevations - proposed"
         }
       ]
     },

diff --git a/schema/schema.json b/schema/schema.json
@@ -66,7 +66,8 @@
             "owner.sole",
             "owner.co",
             "tenant",
-            "occupier"
+            "occupier",
+            "other"
           ],
           "type": "string"
         },
@@ -912,7 +913,8 @@
             "owner.sole",
             "owner.co",
             "tenant",
-            "occupier"
+            "occupier",
+            "other"
           ],
           "type": "string"
         },
@@ -1076,7 +1078,7 @@
           "additionalProperties": false,
           "properties": {
             "description": {
-              "const": "Elevation plan - existing",
+              "const": "Elevations - existing",
               "type": "string"
             },
             "value": {
@@ -1130,7 +1132,7 @@
           "additionalProperties": false,
           "properties": {
             "description": {
-              "const": "Section - existing",
+              "const": "Sections - existing",
               "type": "string"
             },
             "value": {
@@ -1202,11 +1204,11 @@
           "additionalProperties": false,
           "properties": {
             "description": {
-              "const": "Location plan",
+              "const": "Elevations - proposed",
               "type": "string"
             },
             "value": {
-              "const": "property.site.locationPlan",
+              "const": "proposal.drawing.elevation",
               "type": "string"
             }
           },
@@ -1220,11 +1222,11 @@
           "additionalProperties": false,
           "properties": {
             "description": {
-              "const": "Elevation plan - proposed",
+              "const": "Floor plan - proposed",
               "type": "string"
             },
             "value": {
-              "const": "proposal.drawing.elevation",
+              "const": "proposal.drawing.floorPlan",
               "type": "string"
             }
           },
@@ -1238,11 +1240,11 @@
           "additionalProperties": false,
           "properties": {
             "description": {
-              "const": "Floor plan - proposed",
+              "const": "Location plan",
               "type": "string"
             },
             "value": {
-              "const": "proposal.drawing.floorPlan",
+              "const": "proposal.drawing.locationPlan",
               "type": "string"
             }
           },
@@ -1292,7 +1294,7 @@
           "additionalProperties": false,
           "properties": {
             "description": {
-              "const": "Section - proposed",
+              "const": "Sections - proposed",
               "type": "string"
             },
             "value": {
@@ -1702,6 +1704,24 @@
           ],
           "type": "object"
         },
+        {
+          "additionalProperties": false,
+          "properties": {
+            "description": {
+              "const": "Photographs - evidence",
+              "type": "string"
+            },
+            "value": {
+              "const": "proposal.photograph.evidence",
+              "type": "string"
+            }
+          },
+          "required": [
+            "value",
+            "description"
+          ],
+          "type": "object"
+        },
         {
           "additionalProperties": false,
           "properties": {
@@ -2411,10 +2431,6 @@
               "$ref": "#/definitions/GeoJSON"
             }
           },
-          "required": [
-            "site",
-            "area"
-          ],
           "type": "object"
         },
         "constraints": {
@@ -16749,10 +16765,6 @@
               "$ref": "#/definitions/GeoJSON"
             }
           },
-          "required": [
-            "site",
-            "area"
-          ],
           "type": "object"
         },
         "date": {
@@ -17572,10 +17584,6 @@
               "$ref": "#/definitions/GeoJSON"
             }
           },
-          "required": [
-            "site",
-            "area"
-          ],
           "type": "object"
         },
         "constraints": {

diff --git a/types/enums/FileTypes.ts b/types/enums/FileTypes.ts
@@ -2,19 +2,19 @@
  * Values of `file.type`
  */
 export const FileTypes = {
-  'property.drawing.elevation': 'Elevation plan - existing',
+  'property.drawing.elevation': 'Elevations - existing',
   'property.drawing.floorPlan': 'Floor plan - existing',
   'property.drawing.roofPlan': 'Roof plan - existing',
-  'property.drawing.section': 'Section - existing',
+  'property.drawing.section': 'Sections - existing',
   'property.drawing.sitePlan': 'Site plan - existing',
   'property.drawing.usePlan': 'Use plan - existing',
   'property.photograph': 'Photographs',
-  'property.site.locationPlan': 'Location plan',
-  'proposal.drawing.elevation': 'Elevation plan - proposed',
+  'proposal.drawing.elevation': 'Elevations - proposed',
   'proposal.drawing.floorPlan': 'Floor plan - proposed',
+  'proposal.drawing.locationPlan': 'Location plan',
   'proposal.drawing.other': 'Other - drawing',
   'proposal.drawing.roofPlan': 'Roof plan - proposed',
-  'proposal.drawing.section': 'Section - proposed',
+  'proposal.drawing.section': 'Sections - proposed',
   'proposal.drawing.sitePlan': 'Site plan - proposed',
   'proposal.drawing.unitPlan': 'Unit plan - proposed',
   'proposal.drawing.usePlan': 'Use plan - proposed',
@@ -38,5 +38,6 @@ export const FileTypes = {
   'proposal.document.transport': 'Transport assessment',
   'proposal.document.utility.bill': 'Utility bill',
   'proposal.photograph': 'Photographs',
+  'proposal.photograph.evidence': 'Photographs - evidence',
   'proposal.visualisation': 'Visualisations',
 };
diff --git a/types/schema/data/Applicant.ts b/types/schema/data/Applicant.ts
@@ -13,7 +13,7 @@ export type Applicant = BaseApplicant | Agent;
  */
 export interface BaseApplicant {
   type: 'individual' | 'company' | 'charity' | 'public' | 'parishCouncil';
-  interest?: 'owner.sole' | 'owner.co' | 'tenant' | 'occupier';
+  interest?: 'owner.sole' | 'owner.co' | 'tenant' | 'occupier' | 'other';
   ownership?: {
     certificate: 'a' | 'b' | 'c' | 'd';
     noticeGiven?: boolean;

diff --git a/types/schema/data/Property.ts b/types/schema/data/Property.ts
@@ -18,8 +18,8 @@ export interface UKProperty {
   localAuthorityDistrict: string[];
   type: PropertyType;
   boundary?: {
-    site: GeoJSON;
-    area: Area;
+    site?: GeoJSON;
+    area?: Area;
   };
   constraints?: {
     planning: PlanningConstraint[];

diff --git a/types/schema/data/Proposal.ts b/types/schema/data/Proposal.ts
@@ -10,8 +10,8 @@ export interface Proposal {
   projectType: ProjectType[];
   description: string;
   boundary?: {
-    site: GeoJSON;
-    area: Area;
+    site?: GeoJSON;
+    area?: Area;
   };
   date?: {
     start?: Date;
-Original file line number
+Diff line change
@@ Expand Up / @@ -1567,7 +1567,7 @@ export const validLDCE: Schema = { @@
           type: [
             {
               value: 'proposal.drawing.elevation',
-              description: 'Elevation plan - proposed',
+              description: 'Elevations - proposed',
             },
           ],
         },
@@ Expand Down @@