Skip to content

Feature/DF-861: Geospatial component #115

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

Merged
davidjamesstone merged 13 commits into from
Mar 26, 2026
Merged

Feature/DF-861: Geospatial component #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
16b1122
Bump dependencies for geospatial types
davidjamesstone Mar 10, 2026
a9aad7c
Add formatter for geospatial field
davidjamesstone Mar 10, 2026
5c3b018
Move geospatial formatter to shared
davidjamesstone Mar 10, 2026
41e8871
Use grid reference from feature properties
davidjamesstone Mar 11, 2026
07218d6
Add geospatial formatter tests
davidjamesstone Mar 20, 2026
6fa89a2
Add "View map" links to submission email
davidjamesstone Mar 20, 2026
7fca841
Merge branch 'main' into feature/DF-861-geospatial-component
davidjamesstone Mar 25, 2026
c447c18
Bump engine version to 4.4.0
davidjamesstone Mar 25, 2026
98bd197
Remove unintentional dependency
davidjamesstone Mar 25, 2026
5be9eb5
Refactor formatGeospatialField into fieldHandlers
davidjamesstone Mar 25, 2026
57b6019
Add geospatial human V1 tests
davidjamesstone Mar 25, 2026
e051cd8
Update test snapshots
davidjamesstone Mar 25, 2026
0c0c676
Update machine tests
davidjamesstone Mar 25, 2026
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
36,632 changes: 24,495 additions & 12,137 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"dependencies": {
"@aws-sdk/client-sqs": "3.982.0",
"@defra/forms-engine-plugin": "4.0.57",
"@defra/forms-engine-plugin": "4.4.0",
"@defra/forms-model": "3.0.638",
"@defra/hapi-tracing": "^1.28.0",
"@elastic/ecs-pino-format": "^1.5.0",
Expand Down Expand Up @@ -77,11 +77,11 @@
"eslint-plugin-jest": "^28.14.0",
"eslint-plugin-jsdoc": "^51.0.1",
"globals": "^17.3.0",
"neostandard": "^0.12.2",
"husky": "^9.1.7",
"jest": "29.7.0",
"lint-staged": "^16.1.2",
"luxon": "^3.6.1",
"neostandard": "^0.12.2",
"nunjucks": "3.2.4",
"oidc-client-ts": "^3.2.1",
"prettier": "^3.5.3",
Expand Down
213 changes: 211 additions & 2 deletions src/service/mappers/formatters/__stubs__/notify.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
buildDefinition,
buildFileUploadComponent,
buildFileUploadPage,
buildGeospatialFieldComponent,
buildList,
buildListItem,
buildMonthYearFieldComponent,
Expand Down Expand Up @@ -182,6 +183,36 @@ export const exampleNotifyFormDefinition = buildDefinition({
],
id: '2ed8aef4-f559-46e6-8beb-767c92e5f36d'
}),
buildQuestionPage({
title: 'Geospatial page',
path: '/geospatial',
components: [
buildGeospatialFieldComponent({
name: 'geOSpa'
})
],
id: '85179507-9057-410c-b5d4-0e148eb976d2'
}),
buildRepeaterPage({
title: 'Sites',
path: '/geospatial-repeater',
components: [
buildGeospatialFieldComponent({
name: 'rXmTGb'
})
],
id: 'e9016eb6-8436-428b-b5ad-cd5fd8e563c3',
repeat: {
options: {
name: 'gAZbPt',
title: 'Sites'
},
schema: {
min: 1,
max: 6
}
}
}),
buildSummaryPage({
id: '449a45f6-4541-4a46-91bd-8b8931b07b50',
title: 'Summary',
Expand Down Expand Up @@ -273,7 +304,62 @@ export const exampleNotifyFormMessage = buildFormAdapterSubmissionMessage({
KGSRJU: { month: 8, year: 2025 },
hVcHQv: ['Gandalf', 'Frodo'],
JHCHVE: 'Someone', // moved from first position to test ordering,
ADDDTS: null
ADDDTS: null,
geOSpa: [
{
id: '4eba054d-43ad-47a7-9992-186f0c804c99',
type: 'Feature',
properties: {
description: 'The quadrangle',
coordinateGridReference: 'TQ 28989 79667',
centroidGridReference: 'TQ 29035 79656'
},
geometry: {
coordinates: [
[
[-0.14302739537203024, 51.50123314524271],
[-0.14246620384719222, 51.50069106195494],
[-0.1416921465718417, 51.50101631270161],
[-0.14226301381148687, 51.50155839212027],
[-0.14302739537203024, 51.50123314524271]
]
],
type: 'Polygon'
}
},
{
type: 'Feature',
properties: {
description: "St James' Park",
coordinateGridReference: 'TQ 29684 79849',
centroidGridReference: 'TQ 29684 79849'
},
geometry: {
type: 'Point',
coordinates: [-0.13295710945470773, 51.50270750157188]
},
id: 'a3d9f35c-a9fb-4e50-80f1-6144ce534e09'
},
{
id: '62ef0bb2-c4ce-4d76-bd26-4f0e7cfe5a41',
type: 'Feature',
properties: {
description: 'Constitution Hill',
coordinateGridReference: 'TQ 28521 79799',
centroidGridReference: 'TQ 29042 79725'
},
geometry: {
coordinates: [
[-0.14971510866865856, 51.50252738875241],
[-0.14045925603909382, 51.50222886009584],
[-0.14007559375386336, 51.50201988887275],
[-0.14007559375386336, 51.501691503585704],
[-0.1408908761094949, 51.50022866765107]
],
type: 'LineString'
}
}
]
},
repeaters: {
repeaterOptionName: [
Expand All @@ -285,6 +371,25 @@ export const exampleNotifyFormMessage = buildFormAdapterSubmissionMessage({
repeaterComponentName: 'Gandalf',
repeaterComponentDate: { day: 1, month: 1, year: 2020 }
}
],
gAZbPt: [
{
rXmTGb: [
{
type: 'Feature',
properties: {
description: 'Point',
coordinateGridReference: 'SD 57403 26671',
centroidGridReference: 'SD 57403 26671'
},
geometry: {
type: 'Point',
coordinates: [-2.6471947, 53.7346808]
},
id: 'f8930383-fb1f-4f92-bdc2-a7e599e7bff2'
}
]
}
]
},
files: {
Expand All @@ -302,7 +407,8 @@ export const exampleNotifyFormMessage = buildFormAdapterSubmissionMessage({
files: {
main: '818d567d-ee05-4a7a-8c49-d5c54fb09b16',
repeaters: {
repeaterOptionName: 'e3005cd2-8b1c-4dc4-b2ac-bd1ff73666a9'
repeaterOptionName: 'e3005cd2-8b1c-4dc4-b2ac-bd1ff73666a9',
gAZbPt: 'd24a5133-a4cc-4a9a-8453-0a51e123dcd4'
}
}
}
Expand Down Expand Up @@ -402,6 +508,7 @@ export const pizzaFormDefinition = buildDefinition({
})
]
})

export const pizzaMessage = buildFormAdapterSubmissionMessage({
messageId: '1668fba2-386c-4e2e-a348-a241e4193d08',
recordCreatedAt: new Date('2025-08-26'),
Expand Down Expand Up @@ -461,3 +568,105 @@ export const pizzaMessage = buildFormAdapterSubmissionMessage({
}
}
})

export const geospatialFormDefinition = buildDefinition({
name: 'Geospatial',
startPage: '/geospatial',
pages: [
buildQuestionPage({
title: 'Geospatial page',
path: '/geospatial',
components: [
buildGeospatialFieldComponent({
name: 'GeospatialField'
})
]
}),
buildSummaryPage()
],
sections: [],
lists: []
})

export const geospatialMessage = buildFormAdapterSubmissionMessage({
messageId: '1668fba2-386c-4e2e-a348-a241e4193d08',
recordCreatedAt: new Date('2025-08-26'),
meta: {
schemaVersion: FormAdapterSubmissionSchemaVersion.V1,
timestamp: new Date('2025-08-28T11:01:59.347Z'),
formName: 'Geospatial',
formId: FORM_ID,
formSlug: 'geospatial',
status: FormStatus.Live,
isPreview: false,
notificationEmail: 'enrique.chase@defra.gov.uk',
referenceNumber: '874-C7C-D60'
},
data: {
main: {
GeospatialField: [
{
id: '4eba054d-43ad-47a7-9992-186f0c804c99',
type: 'Feature',
properties: {
description: 'The quadrangle',
coordinateGridReference: 'TQ 28989 79667',
centroidGridReference: 'TQ 29035 79656'
},
geometry: {
coordinates: [
[
[-0.14302739537203024, 51.50123314524271],
[-0.14246620384719222, 51.50069106195494],
[-0.1416921465718417, 51.50101631270161],
[-0.14226301381148687, 51.50155839212027],
[-0.14302739537203024, 51.50123314524271]
]
],
type: 'Polygon'
}
},
{
type: 'Feature',
properties: {
description: "St James' Park",
coordinateGridReference: 'TQ 29684 79849',
centroidGridReference: 'TQ 29684 79849'
},
geometry: {
type: 'Point',
coordinates: [-0.13295710945470773, 51.50270750157188]
},
id: 'a3d9f35c-a9fb-4e50-80f1-6144ce534e09'
},
{
id: '62ef0bb2-c4ce-4d76-bd26-4f0e7cfe5a41',
type: 'Feature',
properties: {
description: 'Constitution Hill',
coordinateGridReference: 'TQ 28521 79799',
centroidGridReference: 'TQ 29042 79725'
},
geometry: {
coordinates: [
[-0.14971510866865856, 51.50252738875241],
[-0.14045925603909382, 51.50222886009584],
[-0.14007559375386336, 51.50201988887275],
[-0.14007559375386336, 51.501691503585704],
[-0.1408908761094949, 51.50022866765107]
],
type: 'LineString'
}
}
]
},
repeaters: {},
files: {}
},
result: {
files: {
main: '00000000-0000-0000-0000-000000000000',
repeaters: {}
}
}
})
Loading
Loading