From 0d6d6901b0ff8383a493ad62058efa99108203b2 Mon Sep 17 00:00:00 2001 From: Jessica McInchak Date: Tue, 2 Jul 2024 22:24:12 +0200 Subject: [PATCH] full res unit types, refactor enum definitions --- schema/schema.json | 2614 ++++++++++++--------------- types/enums/BuildingRegulations.ts | 11 +- types/enums/HousingProviders.ts | 3 +- types/enums/OpenSpaces.ts | 1 - types/enums/PlanningConstraints.ts | 2 +- types/enums/ResidentialUnitTypes.ts | 6 +- types/enums/UseClasses.ts | 2 +- types/schema/Metadata.ts | 6 +- types/schema/data/Application.ts | 2 +- types/schema/data/Property.ts | 12 +- types/schema/data/Proposal.ts | 24 +- types/schema/data/shared.ts | 4 +- 12 files changed, 1236 insertions(+), 1451 deletions(-) diff --git a/schema/schema.json b/schema/schema.json index a0dcc892..14eadb39 100644 --- a/schema/schema.json +++ b/schema/schema.json @@ -2250,13 +2250,13 @@ "type": "number" }, "development": { - "type": "string" + "$ref": "#/definitions/DevelopmentType" }, "identicalUnits": { "type": "number" }, "type": { - "type": "string" + "$ref": "#/definitions/UKResidentialUnitType" } }, "required": [ @@ -2416,6 +2416,84 @@ ], "type": "object" }, + "BuildingRegulation": { + "$id": "#BuildingRegulation", + "anyOf": [ + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Part M4(2) of the Building Regulations 2010", + "type": "string" + }, + "value": { + "const": "m42", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Part M4(3)(2a) of the Building Regulations 2010", + "type": "string" + }, + "value": { + "const": "m432a", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Part M4(3)(2b) of the Building Regulations 2010", + "type": "string" + }, + "value": { + "const": "m432b", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "None of these", + "type": "string" + }, + "value": { + "const": "none", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + } + ], + "description": "Building regulations" + }, "CalculateMetadata": { "$id": "#CalculateMetadata", "additionalProperties": false, @@ -2501,10 +2579,192 @@ ], "type": "object" }, + "DevelopmentType": { + "$id": "#DevelopmentType", + "anyOf": [ + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Change of use", + "type": "string" + }, + "value": { + "const": "changeOfUse", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Change of use of an existing single home", + "type": "string" + }, + "value": { + "const": "changeOfUseFrom", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Change of use to a home", + "type": "string" + }, + "value": { + "const": "changeOfUseTo", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Conversion", + "type": "string" + }, + "value": { + "const": "conversion", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Extension", + "type": "string" + }, + "value": { + "const": "extension", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "New build", + "type": "string" + }, + "value": { + "const": "newBuild", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Not known", + "type": "string" + }, + "value": { + "const": "notKnown", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + } + ], + "description": "Development types" + }, "Email": { "format": "email", "type": "string" }, + "Entity": { + "additionalProperties": false, + "properties": { + "description": { + "type": "string" + }, + "name": { + "type": "string" + }, + "source": { + "anyOf": [ + { + "additionalProperties": false, + "properties": { + "text": { + "const": "Planning Data", + "type": "string" + }, + "url": { + "$ref": "#/definitions/URL" + } + }, + "required": [ + "text", + "url" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "text": { + "const": "Ordnance Survey MasterMap Highways", + "type": "string" + } + }, + "required": [ + "text" + ], + "type": "object" + } + ] + } + }, + "required": [ + "name", + "source" + ], + "type": "object" + }, "Feature": { "additionalProperties": false, "description": "A feature object which contains a geometry and associated properties. https://tools.ietf.org/html/rfc7946#section-3.2", @@ -4466,8 +4726,656 @@ "locationPlan": { "$ref": "#/definitions/GeoBoundary" } - }, - "type": "object" + }, + "type": "object" + }, + "GLAHousingProvider": { + "$id": "#GLAHousingProvider", + "anyOf": [ + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Other affordable housing provider", + "type": "string" + }, + "value": { + "const": "affordableHousing", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Council delivered build to rent", + "type": "string" + }, + "value": { + "const": "councilBuildToRent", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Council delivery company", + "type": "string" + }, + "value": { + "const": "councilDelivery", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Housing association", + "type": "string" + }, + "value": { + "const": "HA", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Local Authority", + "type": "string" + }, + "value": { + "const": "LA", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Private", + "type": "string" + }, + "value": { + "const": "private", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Private rented sector", + "type": "string" + }, + "value": { + "const": "privateRented", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Other public authority", + "type": "string" + }, + "value": { + "const": "publicAuthority", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Self-build", + "type": "string" + }, + "value": { + "const": "selfBuild", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + } + ], + "description": "Housing provider categories tracked by the Greater London Authority (GLA)" + }, + "GLAResidentialUnitType": { + "$id": "#GLAResidentialUnitType", + "anyOf": [ + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Cluster flat", + "type": "string" + }, + "value": { + "const": "cluster", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Co-living unit", + "type": "string" + }, + "value": { + "const": "coLiving", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Detached home", + "type": "string" + }, + "value": { + "const": "detached", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Flat/apartment or maisonette", + "type": "string" + }, + "value": { + "const": "flat", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "House in multiple occupation (HMO)", + "type": "string" + }, + "value": { + "const": "HMO", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Hostel room", + "type": "string" + }, + "value": { + "const": "hostel", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Live/work unit", + "type": "string" + }, + "value": { + "const": "LW", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Other", + "type": "string" + }, + "value": { + "const": "other", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Semi-detached home", + "type": "string" + }, + "value": { + "const": "semiDetached", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Student accomodation", + "type": "string" + }, + "value": { + "const": "student", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Studio or bedsit", + "type": "string" + }, + "value": { + "const": "studio", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Terraced home", + "type": "string" + }, + "value": { + "const": "terraced", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + } + ], + "description": "Residential unit types tracked by the Greater London Authority (GLA)" + }, + "GLATenureType": { + "$id": "#GLATenureType", + "anyOf": [ + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Affordable rent (not at LAR benchmark rents)", + "type": "string" + }, + "value": { + "const": "AR", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Discount market rate", + "type": "string" + }, + "value": { + "const": "DMR", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Discount market rate (charged at London Living Rents)", + "type": "string" + }, + "value": { + "const": "DMRLLR", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Discount market sale", + "type": "string" + }, + "value": { + "const": "DMS", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "London Affordable Rent", + "type": "string" + }, + "value": { + "const": "LAR", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "London Living Rent", + "type": "string" + }, + "value": { + "const": "LRR", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "London Shared Ownership", + "type": "string" + }, + "value": { + "const": "LSO", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Market for rent", + "type": "string" + }, + "value": { + "const": "marketForRent", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Market for sale", + "type": "string" + }, + "value": { + "const": "marketForSale", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Other", + "type": "string" + }, + "value": { + "const": "other", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Self-build and custom build", + "type": "string" + }, + "value": { + "const": "selfCustomBuild", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Starter homes", + "type": "string" + }, + "value": { + "const": "SH", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Shared equity", + "type": "string" + }, + "value": { + "const": "sharedEquity", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Social rent", + "type": "string" + }, + "value": { + "const": "SR", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + } + ], + "description": "Tenure types tracked by the Greater London Authority (GLA)" }, "GeoBoundary": { "additionalProperties": false, @@ -5050,10 +5958,10 @@ "type": "number" }, "tenure": { - "type": "string" + "$ref": "#/definitions/UKTenureType" }, "type": { - "type": "string" + "$ref": "#/definitions/UKResidentialUnitType" } }, "required": [ @@ -5710,10 +6618,13 @@ "type": "number" }, "compliance": { - "type": "string" + "items": { + "$ref": "#/definitions/BuildingRegulation" + }, + "type": "array" }, "development": { - "type": "string" + "$ref": "#/definitions/DevelopmentType" }, "garden": { "type": "boolean" @@ -5728,16 +6639,16 @@ "type": "boolean" }, "provider": { - "type": "string" + "$ref": "#/definitions/GLAHousingProvider" }, "sheltered": { "type": "boolean" }, "tenure": { - "type": "string" + "$ref": "#/definitions/GLATenureType" }, "type": { - "type": "string" + "$ref": "#/definitions/GLAResidentialUnitType" } }, "required": [ @@ -5769,10 +6680,13 @@ "type": "number" }, "compliance": { - "type": "string" + "items": { + "$ref": "#/definitions/BuildingRegulation" + }, + "type": "array" }, "development": { - "type": "string" + "$ref": "#/definitions/DevelopmentType" }, "garden": { "type": "boolean" @@ -5787,16 +6701,16 @@ "type": "boolean" }, "provider": { - "type": "string" + "$ref": "#/definitions/GLAHousingProvider" }, "sheltered": { "type": "boolean" }, "tenure": { - "type": "string" + "$ref": "#/definitions/GLATenureType" }, "type": { - "type": "string" + "$ref": "#/definitions/GLAResidentialUnitType" } }, "required": [ @@ -5828,7 +6742,10 @@ "type": "number" }, "compliance": { - "type": "string" + "items": { + "$ref": "#/definitions/BuildingRegulation" + }, + "type": "array" }, "habitableRooms": { "type": "number" @@ -5840,16 +6757,16 @@ "type": "boolean" }, "provider": { - "type": "string" + "$ref": "#/definitions/GLAHousingProvider" }, "sheltered": { "type": "boolean" }, "tenure": { - "type": "string" + "$ref": "#/definitions/GLATenureType" }, "type": { - "type": "string" + "$ref": "#/definitions/GLAResidentialUnitType" } }, "required": [ @@ -5879,10 +6796,10 @@ "type": "number" }, "tenure": { - "type": "string" + "$ref": "#/definitions/GLATenureType" }, "type": { - "type": "string" + "$ref": "#/definitions/GLAResidentialUnitType" } }, "required": [ @@ -7009,54 +7926,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -7751,54 +8621,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -7837,54 +8660,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -7923,54 +8699,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -8009,54 +8738,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -8095,54 +8777,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -8181,54 +8816,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -8267,54 +8855,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -8353,54 +8894,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -8439,54 +8933,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -8525,54 +8972,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -8611,54 +9011,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -8697,54 +9050,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -8783,54 +9089,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -8869,54 +9128,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -8955,54 +9167,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -9041,54 +9206,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -9127,54 +9245,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -9213,54 +9284,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -9299,54 +9323,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -9385,54 +9362,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -9471,54 +9401,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -9557,54 +9440,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -9643,54 +9479,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -9729,54 +9518,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -9815,54 +9557,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -9901,54 +9596,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -9987,54 +9635,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -10073,54 +9674,7 @@ "anyOf": [ { "items": { - "additionalProperties": false, - "properties": { - "description": { - "type": "string" - }, - "name": { - "type": "string" - }, - "source": { - "anyOf": [ - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Planning Data", - "type": "string" - }, - "url": { - "$ref": "#/definitions/URL" - } - }, - "required": [ - "text", - "url" - ], - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "text": { - "const": "Ordnance Survey MasterMap Highways", - "type": "string" - } - }, - "required": [ - "text" - ], - "type": "object" - } - ] - } - }, - "required": [ - "name", - "source" - ], - "type": "object" + "$ref": "#/definitions/Entity" }, "type": "array" }, @@ -24959,10 +24513,10 @@ "type": "number" }, "tenure": { - "type": "string" + "$ref": "#/definitions/UKTenureType" }, "type": { - "type": "string" + "$ref": "#/definitions/UKResidentialUnitType" } }, "required": [ @@ -25031,6 +24585,234 @@ ], "type": "string" }, + "UKResidentialUnitType": { + "$id": "#UKResidentialUnitType", + "anyOf": [ + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Cluster flat", + "type": "string" + }, + "value": { + "const": "cluster", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Flat", + "type": "string" + }, + "value": { + "const": "flat", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "House", + "type": "string" + }, + "value": { + "const": "house", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Other", + "type": "string" + }, + "value": { + "const": "other", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Sheltered housing", + "type": "string" + }, + "value": { + "const": "sheltered", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Studio or bedsit", + "type": "string" + }, + "value": { + "const": "studio", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + } + ], + "description": "Residential unit types tracked throughout the UK" + }, + "UKTenureType": { + "$id": "#UKTenureType", + "anyOf": [ + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Affordable home ownership", + "type": "string" + }, + "value": { + "const": "AHO", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Market housing", + "type": "string" + }, + "value": { + "const": "MH", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Other", + "type": "string" + }, + "value": { + "const": "other", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Social, affordable or interim rent", + "type": "string" + }, + "value": { + "const": "SAIR", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Self-build and custom build", + "type": "string" + }, + "value": { + "const": "selfCustomBuild", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "description": { + "const": "Starter homes", + "type": "string" + }, + "value": { + "const": "SH", + "type": "string" + } + }, + "required": [ + "value", + "description" + ], + "type": "object" + } + ], + "description": "Tenure types tracked throughout the UK" + }, "URL": { "format": "uri", "pattern": "^https?://", diff --git a/types/enums/BuildingRegulations.ts b/types/enums/BuildingRegulations.ts index ea849ee1..6d35bdc2 100644 --- a/types/enums/BuildingRegulations.ts +++ b/types/enums/BuildingRegulations.ts @@ -2,10 +2,10 @@ * Values of `data.proposal.units.residential` */ export const BuildingRegulations = { - m42: "Part M4(2) of the Building Regulations 2010", - m432a: "Part M4(3)(2a) of the Building Regulations 2010", - m432b: "Part M4(3)(2b) of the Building Regulations 2010", - none: "None of these", + m42: 'Part M4(2) of the Building Regulations 2010', + m432a: 'Part M4(3)(2a) of the Building Regulations 2010', + m432b: 'Part M4(3)(2b) of the Building Regulations 2010', + none: 'None of these', }; type BuildingRegulationKeys = keyof typeof BuildingRegulations; @@ -23,4 +23,5 @@ type BuildingRegulationMap = { * @id #BuildingRegulation * @description Building regulations */ -export type BuildingRegulation = BuildingRegulationMap[keyof BuildingRegulationMap]; +export type BuildingRegulation = + BuildingRegulationMap[keyof BuildingRegulationMap]; diff --git a/types/enums/HousingProviders.ts b/types/enums/HousingProviders.ts index 0fa74ff4..30a28dc0 100644 --- a/types/enums/HousingProviders.ts +++ b/types/enums/HousingProviders.ts @@ -25,4 +25,5 @@ type GLAHousingProviderMap = { * @id #GLAHousingProvider * @description Housing provider categories tracked by the Greater London Authority (GLA) */ -export type GLAHousingProvider = GLAHousingProviderMap[keyof GLAHousingProviderMap]; +export type GLAHousingProvider = + GLAHousingProviderMap[keyof GLAHousingProviderMap]; diff --git a/types/enums/OpenSpaces.ts b/types/enums/OpenSpaces.ts index 4a17d541..d4c467eb 100644 --- a/types/enums/OpenSpaces.ts +++ b/types/enums/OpenSpaces.ts @@ -56,4 +56,3 @@ type OpenSpaceDesignationMap = { */ export type OpenSpaceDesignation = OpenSpaceDesignationMap[keyof OpenSpaceDesignationMap]; - \ No newline at end of file diff --git a/types/enums/PlanningConstraints.ts b/types/enums/PlanningConstraints.ts index 8a71b6d4..a08af89d 100644 --- a/types/enums/PlanningConstraints.ts +++ b/types/enums/PlanningConstraints.ts @@ -1,4 +1,4 @@ -import { Entity } from "../schema/data/shared"; +import {Entity} from '../schema/data/shared'; /** * Values for `data.property.planning.designations` diff --git a/types/enums/ResidentialUnitTypes.ts b/types/enums/ResidentialUnitTypes.ts index c98026e8..c8fb3e41 100644 --- a/types/enums/ResidentialUnitTypes.ts +++ b/types/enums/ResidentialUnitTypes.ts @@ -42,7 +42,8 @@ type UKResidentialUnitTypeMap = { * @id #UKResidentialUnitType * @description Residential unit types tracked throughout the UK */ -export type UKResidentialUnitType = UKResidentialUnitTypeMap[keyof UKResidentialUnitTypeMap]; +export type UKResidentialUnitType = + UKResidentialUnitTypeMap[keyof UKResidentialUnitTypeMap]; type GLAResidentialUnitTypeKeys = keyof typeof GLAResidentialUnitTypes; @@ -59,4 +60,5 @@ type GLAResidentialUnitTypeMap = { * @id #GLAResidentialUnitType * @description Residential unit types tracked by the Greater London Authority (GLA) */ -export type GLAResidentialUnitType = GLAResidentialUnitTypeMap[keyof GLAResidentialUnitTypeMap]; \ No newline at end of file +export type GLAResidentialUnitType = + GLAResidentialUnitTypeMap[keyof GLAResidentialUnitTypeMap]; diff --git a/types/enums/UseClasses.ts b/types/enums/UseClasses.ts index 8c016946..4f1ee737 100644 --- a/types/enums/UseClasses.ts +++ b/types/enums/UseClasses.ts @@ -28,4 +28,4 @@ type GLAUseClassMap = { * @id #GLAUseClass * @description Use classes tracked by the Greater London Authority (GLA) */ -export type GLAUseClass = GLAUseClassMap[keyof GLAUseClassMap]; \ No newline at end of file +export type GLAUseClass = GLAUseClassMap[keyof GLAUseClassMap]; diff --git a/types/schema/Metadata.ts b/types/schema/Metadata.ts index 83307e49..151aef1a 100644 --- a/types/schema/Metadata.ts +++ b/types/schema/Metadata.ts @@ -1,6 +1,6 @@ -import { FileType } from '../enums/FileTypes'; -import { DateTime, URL, UUID } from './../utils'; -import { QuestionMetaData } from './Responses'; +import {FileType} from '../enums/FileTypes'; +import {DateTime, URL, UUID} from './../utils'; +import {QuestionMetaData} from './Responses'; /** * @id #DigitalPlanningMetadata diff --git a/types/schema/data/Application.ts b/types/schema/data/Application.ts index 063fd533..1264341c 100644 --- a/types/schema/data/Application.ts +++ b/types/schema/data/Application.ts @@ -1,4 +1,4 @@ -import { ApplicationType } from '../../enums/ApplicationTypes'; +import {ApplicationType} from '../../enums/ApplicationTypes'; import {Date} from '../../utils'; /** diff --git a/types/schema/data/Property.ts b/types/schema/data/Property.ts index 19ff3f0d..d8948651 100644 --- a/types/schema/data/Property.ts +++ b/types/schema/data/Property.ts @@ -1,9 +1,9 @@ -import { PlanningDesignation } from '../../enums/PlanningConstraints'; -import { PropertyType } from '../../enums/PropertyTypes'; -import { UKResidentialUnitType } from "../../enums/ResidentialUnitTypes"; -import { UKTenureType } from "../../enums/TenureTypes"; -import { Date, URL } from '../../utils'; -import { Entity, GeoBoundary, Materials } from './shared'; +import {PlanningDesignation} from '../../enums/PlanningConstraints'; +import {PropertyType} from '../../enums/PropertyTypes'; +import {UKResidentialUnitType} from '../../enums/ResidentialUnitTypes'; +import {UKTenureType} from '../../enums/TenureTypes'; +import {Date, URL} from '../../utils'; +import {Entity, GeoBoundary, Materials} from './shared'; /** * @id #Property diff --git a/types/schema/data/Proposal.ts b/types/schema/data/Proposal.ts index 186786f5..c459046e 100644 --- a/types/schema/data/Proposal.ts +++ b/types/schema/data/Proposal.ts @@ -1,16 +1,16 @@ -import { BuildingRegulation } from '../../enums/BuildingRegulations'; -import { DevelopmentType } from '../../enums/DevelopmentTypes'; -import { GLAHousingProvider } from "../../enums/HousingProviders"; +import {BuildingRegulation} from '../../enums/BuildingRegulations'; +import {DevelopmentType} from '../../enums/DevelopmentTypes'; +import {GLAHousingProvider} from '../../enums/HousingProviders'; +import {OpenSpaceDesignation, OpenSpaceType} from '../../enums/OpenSpaces'; +import {ProjectType} from '../../enums/ProjectTypes'; +import {ProtectedSpaceDesignation} from '../../enums/ProtectedSpaces'; import { - OpenSpaceDesignation, - OpenSpaceType -} from '../../enums/OpenSpaces'; -import { ProjectType } from '../../enums/ProjectTypes'; -import { ProtectedSpaceDesignation } from '../../enums/ProtectedSpaces'; -import { GLAResidentialUnitType, UKResidentialUnitType } from '../../enums/ResidentialUnitTypes'; -import { GLATenureType } from '../../enums/TenureTypes'; -import { Area, Date } from '../../utils'; -import { GeoBoundary, Materials } from './shared'; + GLAResidentialUnitType, + UKResidentialUnitType, +} from '../../enums/ResidentialUnitTypes'; +import {GLATenureType} from '../../enums/TenureTypes'; +import {Area, Date} from '../../utils'; +import {GeoBoundary, Materials} from './shared'; /** * @id #Proposal diff --git a/types/schema/data/shared.ts b/types/schema/data/shared.ts index 58706ffc..b857c335 100644 --- a/types/schema/data/shared.ts +++ b/types/schema/data/shared.ts @@ -1,5 +1,5 @@ import {GeoJSON} from 'geojson'; -import {Area} from '../../utils'; +import {Area, URL} from '../../utils'; export type Materials = { boundary?: string; @@ -30,4 +30,4 @@ type PlanningDataSource = { type OSRoadsSource = { text: 'Ordnance Survey MasterMap Highways'; -}; \ No newline at end of file +};