diff --git a/package.json b/package.json index 1261536b..29848e84 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "author": "Open Systems Lab", "license": "MPL2", "devDependencies": { + "@types/geojson": "^7946.0.12", "@types/node": "18.16.1", "gts": "^5.0.0", "husky": "^8.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b9777a73..c7b40fb9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,6 +19,9 @@ dependencies: version: 10.9.1(@types/node@18.16.1)(typescript@5.1.6) devDependencies: + '@types/geojson': + specifier: ^7946.0.12 + version: 7946.0.12 '@types/node': specifier: 18.16.1 version: 18.16.1 @@ -414,6 +417,10 @@ packages: resolution: {integrity: sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==} dev: true + /@types/geojson@7946.0.12: + resolution: {integrity: sha512-uK2z1ZHJyC0nQRbuovXFt4mzXDwf27vQeUWNhfKGwRcWW429GOhP8HxUHlM6TLH4bzmlv/HlEjpvJh3JfmGsAA==} + dev: true + /@types/json-schema@7.0.12: resolution: {integrity: sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==} diff --git a/types/enums/ProjectTypes.ts b/types/enums/ProjectTypes.ts index e40e79d5..3a939d59 100644 --- a/types/enums/ProjectTypes.ts +++ b/types/enums/ProjectTypes.ts @@ -2,6 +2,7 @@ * Values of `data.proposal.projectType` */ export const ProjectTypes = { + alter: 'Alter a building', 'alter.balcony': 'Add or alter a balcony', 'alter.bayWindow': 'Add or remove a bay window', 'alter.bayWindow.add': 'Add a bay window', @@ -124,7 +125,7 @@ export const ProjectTypes = { 'alter.swimmingPool.indoor': 'Install an indoor swimming pool', 'alter.swimmingPool.outdoor': 'Install an outdoor swimming pool', 'alter.trees': 'Changes to trees or hedges', - changeOfUse: 'Convert a building to a different use', + changeOfUse: 'Change the use of a building', 'changeofUse.annexe': 'Convert part of the property into a granny flat (residential annexe)', 'changeOfUse.caravans': 'Use a caravan or mobile home on the property', @@ -143,6 +144,7 @@ export const ProjectTypes = { 'demolish.outbuildings': 'Demolish an outbuilding (such as a garage or barn)', 'demolish.part': 'Demolish part of a building (such as an extension)', 'demolish.replace': 'Demolish a building and build homes in its place', + extend: 'Extend a building or add an outbuilding', 'extend.basement': 'Add a basement extension', 'extend.basement.extend': 'Enlarge a basement', 'extend.basement.lightwell': 'Add a lightwell', @@ -197,7 +199,7 @@ export const ProjectTypes = { 'internal.staircases': 'Alter internal staircases', 'internal.walls': 'Alter internal walls', 'internal.windows.openings': 'Alter internal window openings', - new: 'Another type of building', + new: 'Add another type of building', 'new.agriculture': 'Agricultural buildings', 'new.agriculture.glassHouse': 'Agricultural buildings - glass house', 'new.agriculture.mining': 'Agricultural buildings - mining', @@ -217,6 +219,7 @@ export const ProjectTypes = { 'new.temporaryStructure': 'Erect a temporary structure for historic visitor attractions and listed buildings', 'new.warehouse': 'Storage or distribution premises', + unit: 'Change of units', 'unit.merge': 'Convert two or more properties into one', 'unit.subdivide': 'Convert a home or part of a home into flats', }; diff --git a/types/schema/data/Property.ts b/types/schema/data/Property.ts index 8460631f..483183fb 100644 --- a/types/schema/data/Property.ts +++ b/types/schema/data/Property.ts @@ -1,6 +1,7 @@ +import {GeoJSON} from 'geojson'; import {PlanningConstraints} from '../../enums/PlanningConstraints'; import {PropertyTypes} from '../../enums/PropertyTypes'; -import {Area, GeoJSON, URL} from '../../utils'; +import {Area, URL} from '../../utils'; /** * @id #Property diff --git a/types/schema/data/Proposal.ts b/types/schema/data/Proposal.ts index b1e6ae82..38a42031 100644 --- a/types/schema/data/Proposal.ts +++ b/types/schema/data/Proposal.ts @@ -1,6 +1,7 @@ +import {GeoJSON} from 'geojson'; import {ProjectTypes} from '../../enums/ProjectTypes'; import {VehicleParking} from '../../enums/VehicleParking'; -import {Area, Date, GeoJSON} from '../../utils'; +import {Area, Date} from '../../utils'; /** * @id #Proposal diff --git a/types/utils.ts b/types/utils.ts index 1f03cd96..07574b8a 100644 --- a/types/utils.ts +++ b/types/utils.ts @@ -26,11 +26,6 @@ export type DateTime = string; */ export type Date = string; -/** - * @id #GeoJSON - */ -export type GeoJSON = Record; - /** * @id #Area */