Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update missing or incorrect enum values #58

Merged
merged 2 commits into from
Oct 20, 2023
Merged

fix: update missing or incorrect enum values #58

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ac10b6
fix missing or incorrect enum values
jessicamcinchak Oct 20, 2023
9495ec5
revert site and area change
jessicamcinchak Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/data/ldcE.ts
View file
Open in desktop
Original file line number Diff 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
4 changes: 2 additions & 2 deletions examples/data/ldcP.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,7 +1082,7 @@ export const validLDCP: Schema = {
type: [
{
value: 'property.drawing.elevation',
description: 'Elevation plan - existing',
description: 'Elevations - existing',
},
],
},
Expand All @@ -1100,7 +1100,7 @@ export const validLDCP: Schema = {
type: [
{
value: 'proposal.drawing.elevation',
description: 'Elevation plan - proposed',
description: 'Elevations - proposed',
},
],
},
Expand Down
4 changes: 2 additions & 2 deletions examples/data/planningPermission.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
],
},
Expand Down
2 changes: 1 addition & 1 deletion examples/validLawfulDevelopmentCertificateExisting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1762,7 +1762,7 @@
"type": [
{
"value": "proposal.drawing.elevation",
"description": "Elevation plan - proposed"
"description": "Elevations - proposed"
}
]
},
Expand Down
4 changes: 2 additions & 2 deletions examples/validLawfulDevelopmentCertificateProposed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,7 +1144,7 @@
"type": [
{
"value": "property.drawing.elevation",
"description": "Elevation plan - existing"
"description": "Elevations - existing"
}
]
},
Expand All @@ -1162,7 +1162,7 @@
"type": [
{
"value": "proposal.drawing.elevation",
"description": "Elevation plan - proposed"
"description": "Elevations - proposed"
}
]
},
Expand Down
4 changes: 2 additions & 2 deletions examples/validPlanningPermission.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
},
Expand Down
54 changes: 31 additions & 23 deletions schema/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@
"owner.sole",
"owner.co",
"tenant",
"occupier"
"occupier",
"other"
],
"type": "string"
},
Expand Down Expand Up @@ -912,7 +913,8 @@
"owner.sole",
"owner.co",
"tenant",
"occupier"
"occupier",
"other"
],
"type": "string"
},
Expand Down Expand Up @@ -1076,7 +1078,7 @@
"additionalProperties": false,
"properties": {
"description": {
"const": "Elevation plan - existing",
"const": "Elevations - existing",
"type": "string"
},
"value": {
Expand Down Expand Up @@ -1130,7 +1132,7 @@
"additionalProperties": false,
"properties": {
"description": {
"const": "Section - existing",
"const": "Sections - existing",
"type": "string"
},
"value": {
Expand Down Expand Up @@ -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"
}
},
Expand All @@ -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"
}
},
Expand All @@ -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"
}
},
Expand Down Expand Up @@ -1292,7 +1294,7 @@
"additionalProperties": false,
"properties": {
"description": {
"const": "Section - proposed",
"const": "Sections - proposed",
"type": "string"
},
"value": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -2411,10 +2431,6 @@
"$ref": "#/definitions/GeoJSON"
}
},
"required": [
"site",
"area"
],
"type": "object"
},
"constraints": {
Expand Down Expand Up @@ -16749,10 +16765,6 @@
"$ref": "#/definitions/GeoJSON"
}
},
"required": [
"site",
"area"
],
"type": "object"
},
"date": {
Expand Down Expand Up @@ -17572,10 +17584,6 @@
"$ref": "#/definitions/GeoJSON"
}
},
"required": [
"site",
"area"
],
"type": "object"
},
"constraints": {
Expand Down
11 changes: 6 additions & 5 deletions types/enums/FileTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
};
2 changes: 1 addition & 1 deletion types/schema/data/Applicant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions types/schema/data/Property.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ export interface UKProperty {
localAuthorityDistrict: string[];
type: PropertyType;
boundary?: {
site: GeoJSON;
area: Area;
site?: GeoJSON;
area?: Area;
jessicamcinchak marked this conversation as resolved.
Show resolved Hide resolved
};
constraints?: {
planning: PlanningConstraint[];
Expand Down
4 changes: 2 additions & 2 deletions types/schema/data/Proposal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ export interface Proposal {
projectType: ProjectType[];
description: string;
boundary?: {
site: GeoJSON;
area: Area;
site?: GeoJSON;
area?: Area;
};
date?: {
start?: Date;
Expand Down
Loading