Update Geospatial field summary display

Author: davidjamesstone

src/server/plugins/engine/components/GeospatialField.test.ts

@@ -151,7 +151,7 @@ describe('GeospatialField', () => {
         const answer1 = getAnswer(field, state1)
         const answer2 = getAnswer(field, state2)
 
-        expect(answer1).toBe('My farm house:<br>SJ 61896 71377<br>')
+        expect(answer1).toBe('Added 1 feature')
         expect(answer2).toBe('')
       })
 
@@ -162,9 +162,7 @@ describe('GeospatialField', () => {
         const answer1 = getAnswer(field, state1)
         const answer2 = getAnswer(field, state2)
 
-        expect(answer1).toBe(
-          `My farm house:<br>SJ 61896 71377<br>Main gas line:<br>SJ 62022 71500 to SJ 61904 71391<br>My Pony Paddock:<br>SJ 61829 71378<br>My farm house #2:<br>SJ 61894 71483<br>`
-        )
+        expect(answer1).toBe('Added 4 features')
         expect(answer2).toBe('')
       })
 

src/server/plugins/engine/components/GeospatialField.ts

@@ -7,7 +7,6 @@ import {
   isGeospatialState
 } from '~/src/server/plugins/engine/components/FormComponent.js'
 import { geospatialSchema } from '~/src/server/plugins/engine/components/helpers/geospatial.js'
-import { getGridRef } from '~/src/server/plugins/engine/components/helpers/gridref.js'
 import { messageTemplate } from '~/src/server/plugins/engine/pageControllers/validationOptions.js'
 import {
   type ErrorMessageTemplateList,
@@ -57,11 +56,9 @@ export class GeospatialField extends FormComponent {
       return ''
     }
 
-    return features
-      .map((feature) => {
-        return `${feature.properties.description}:\n${getGridRef(feature)}\n`
-      })
-      .join('\n')
+    const unit = features.length === 1 ? 'feature' : 'features'
+
+    return `Added ${features.length} ${unit}`
   }
 
   getDisplayStringFromState(state: FormSubmissionState) {
@@ -72,8 +69,8 @@ export class GeospatialField extends FormComponent {
 
   getContextValueFromFormValue(
     features: GeospatialState | undefined
-  ): string[] | null {
-    return features?.map(({ id }) => id) ?? null
+  ): string | null {
+    return features ? JSON.stringify(features) : null
   }
 
   getContextValueFromState(state: FormSubmissionState) {

src/server/plugins/engine/components/helpers/components.test.ts

@@ -240,9 +240,7 @@ describe('Location field formatting', () => {
       }
 
       const answer = getAnswer(field, state, { format: 'email' })
-      expect(answer).toBe(
-        'My farm house:\nSJ 61896 71377\n\nMain gas line:\nSJ 62022 71500 to SJ 61904 71391\n\nMy Pony Paddock:\nSJ 61829 71378\n\nMy farm house #2:\nSJ 61894 71483\n\n'
-      )
+      expect(answer).toBe('Added 4 features\n')
     })
 
     it('formats for data output', () => {
@@ -251,7 +249,7 @@ describe('Location field formatting', () => {
       }
 
       const answer = getAnswer(field, state, { format: 'data' })
-      expect(answer).toBe('a,b,c,d')
+      expect(answer).toBe(JSON.stringify(validState))
     })
 
     it('formats for summary display', () => {
@@ -260,9 +258,7 @@ describe('Location field formatting', () => {
       }
 
       const answer = getAnswer(field, state, { format: 'summary' })
-      expect(answer).toBe(
-        'My farm house:<br>SJ 61896 71377<br>Main gas line:<br>SJ 62022 71500 to SJ 61904 71391<br>My Pony Paddock:<br>SJ 61829 71378<br>My farm house #2:<br>SJ 61894 71483<br>'
-      )
+      expect(answer).toBe('Added 4 features')
     })
   })
 

src/server/plugins/engine/components/helpers/components.ts

@@ -240,8 +240,7 @@ export function getAnswer(
     field instanceof Components.MultilineTextField ||
     field instanceof Components.UkAddressField ||
     field instanceof Components.EastingNorthingField ||
-    field instanceof Components.LatLongField ||
-    field instanceof Components.GeospatialField
+    field instanceof Components.LatLongField
   ) {
     return markdown
       .parse(getAnswerMarkdown(field, state), { async: false })

src/server/plugins/engine/types.ts

@@ -567,6 +567,7 @@ export type RichFormValue =
   | UkAddressState
   | EastingNorthingState
   | LatLongState
+  | GeospatialState
 
 export interface FormAdapterSubmissionMessageData {
   main: Record<string, RichFormValue | null>