@defra/interactive-map 0.0.10-alpha → 0.0.12-alpha

package/plugins/search/src/components/Form/Form.test.jsx

@@ -24,11 +24,14 @@ describe('Form', () => {
       isExpanded: false,
       value: '',
       suggestionsVisible: false,
+      areSuggestionsVisible: false,
+      hasFetchedSuggestions: false,
+      suggestions: [],
       selectedIndex: -1,
       hasKeyboardFocusWithin: false,
     },
     pluginConfig: {
-      isExpanded: false,
+      expanded: false,
       width: '400px',
     },
     appState: {
@@ -44,12 +47,21 @@ describe('Form', () => {
       handleInputKeyDown: jest.fn(),
       handleSuggestionClick: jest.fn(),
     },
+    services: {
+      announce: jest.fn(),
+    },
   }
 
   beforeEach(() => {
     jest.clearAllMocks()
   })
 
+  it('renders without error when suggestions is undefined (uses default empty array)', () => {
+    const { suggestions: _omit, ...pluginStateWithoutSuggestions } = baseProps.pluginState
+    render(<Form {...baseProps} pluginState={pluginStateWithoutSuggestions} />)
+    expect(screen.getByRole('search')).toBeInTheDocument()
+  })
+
   it('renders the form element with correct role, ID, and base classes', () => {
     render(<Form {...baseProps} />)
     const form = screen.getByRole('search')
@@ -62,7 +74,7 @@ describe('Form', () => {
     render(
       <Form
         {...baseProps}
-        pluginConfig={{ ...baseProps.pluginConfig, isExpanded: true }}
+        pluginConfig={{ ...baseProps.pluginConfig, expanded: true }}
       />
     )
     const form = screen.getByRole('search')
@@ -155,4 +167,89 @@ describe('Form', () => {
       baseProps.appState
     )
   })
+
+  describe('status element and announce', () => {
+    // Helper: pluginState representing a completed fetch (hasFetchedSuggestions: true)
+    const searchedState = { areSuggestionsVisible: true, hasFetchedSuggestions: true }
+
+    it('hides the status element when suggestions are not visible', () => {
+      const { container } = render(<Form {...baseProps} />)
+      expect(container.querySelector('.im-c-search__status')).toBeNull()
+    })
+
+    it('shows the status element when a search returned no results', () => {
+      render(
+        <Form
+          {...baseProps}
+          pluginState={{ ...baseProps.pluginState, ...searchedState, suggestions: [] }}
+        />
+      )
+      expect(screen.getByText('No results available')).toBeInTheDocument()
+    })
+
+    it('hides the status element when there are results', () => {
+      const { container } = render(
+        <Form
+          {...baseProps}
+          pluginState={{ ...baseProps.pluginState, ...searchedState, suggestions: [{ text: 'London' }] }}
+        />
+      )
+      expect(container.querySelector('.im-c-search__status')).toBeNull()
+    })
+
+    it('hides the status element when the fetch has not yet completed', () => {
+      const { container } = render(
+        <Form
+          {...baseProps}
+          pluginState={{ ...baseProps.pluginState, areSuggestionsVisible: true, hasFetchedSuggestions: false, suggestions: [] }}
+        />
+      )
+      expect(container.querySelector('.im-c-search__status')).toBeNull()
+    })
+
+    it('announces "No results available" when a search returned no results', () => {
+      render(
+        <Form
+          {...baseProps}
+          pluginState={{ ...baseProps.pluginState, ...searchedState, suggestions: [] }}
+        />
+      )
+      expect(baseProps.services.announce).toHaveBeenCalledWith('No results available')
+    })
+
+    it('announces result count when suggestions are visible and populated', () => {
+      render(
+        <Form
+          {...baseProps}
+          pluginState={{ ...baseProps.pluginState, ...searchedState, suggestions: [{ text: 'A' }, { text: 'B' }] }}
+        />
+      )
+      expect(baseProps.services.announce).toHaveBeenCalledWith('2 results available')
+    })
+
+    it('uses singular "result" for a single result', () => {
+      render(
+        <Form
+          {...baseProps}
+          pluginState={{ ...baseProps.pluginState, ...searchedState, suggestions: [{ text: 'A' }] }}
+        />
+      )
+      expect(baseProps.services.announce).toHaveBeenCalledWith('1 result available')
+    })
+
+    it('does not announce when suggestions are not visible', () => {
+      render(<Form {...baseProps} />)
+      expect(baseProps.services.announce).not.toHaveBeenCalled()
+    })
+
+    it('does not announce when the fetch has not yet completed', () => {
+      render(
+        <Form
+          {...baseProps}
+          pluginState={{ ...baseProps.pluginState, areSuggestionsVisible: true, hasFetchedSuggestions: false, suggestions: [] }}
+        />
+      )
+      expect(baseProps.services.announce).not.toHaveBeenCalled()
+    })
+  })
 })

package/plugins/search/src/components/SubmitButton/SubmitButton.jsx

@@ -0,0 +1,28 @@
+// src/plugins/search/SubmitButton.jsx
+export const SubmitButton = ({ defaultExpanded, submitIcon }) => {
+  return (
+    <button
+      aria-label="Search"
+      className="im-c-map-button im-c-search-submit-button"
+      type="submit"
+      style={defaultExpanded ? undefined : { display: 'none' }}
+    >
+      {submitIcon && (
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          width="24"
+          height="24"
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke="currentColor"
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          aria-hidden="true"
+          focusable="false"
+          dangerouslySetInnerHTML={{ __html: submitIcon }}
+          />
+      )}
+    </button>
+  )
+}

package/plugins/search/src/components/SubmitButton/SubmitButton.module.scss

@@ -0,0 +1,8 @@
+.im-c-search-submit-button {
+  &:before {
+    box-shadow: none;
+  }
+  &[data-focus-visible="true"] {
+    z-index: 1;
+  }
+}

package/plugins/search/src/components/SubmitButton/SubmitButton.test.jsx

@@ -0,0 +1,33 @@
+// src/plugins/search/components/SubmitButton/SubmitButton.test.jsx
+
+import { render, screen } from '@testing-library/react'
+import { SubmitButton } from './SubmitButton'
+
+describe('SubmitButton', () => {
+  it('renders a submit button with the correct aria-label', () => {
+    render(<SubmitButton defaultExpanded />)
+    const button = screen.getByRole('button', { name: 'Search' })
+    expect(button).toBeInTheDocument()
+    expect(button).toHaveAttribute('type', 'submit')
+  })
+
+  it('hides the button when defaultExpanded is false', () => {
+    const { container } = render(<SubmitButton defaultExpanded={false} />)
+    expect(container.querySelector('button')).toHaveStyle({ display: 'none' })
+  })
+
+  it('shows the button when defaultExpanded is true', () => {
+    render(<SubmitButton defaultExpanded />)
+    expect(screen.getByRole('button', { name: 'Search' })).not.toHaveStyle({ display: 'none' })
+  })
+
+  it('renders an svg when submitIcon is provided', () => {
+    const { container } = render(<SubmitButton defaultExpanded submitIcon="<path d='M1 1'/>" />)
+    expect(container.querySelector('svg')).toBeTruthy()
+  })
+
+  it('does not render an svg when submitIcon is not provided', () => {
+    const { container } = render(<SubmitButton defaultExpanded />)
+    expect(container.querySelector('svg')).toBeNull()
+  })
+})

package/plugins/search/src/datasets.js

@@ -1,15 +1,19 @@
 // src/plugins/search/datasets.js
 import { parseOsNamesResults } from './utils/parseOsNamesResults.js'
 
-export function createDatasets({ customDatasets = [], osNamesURL, crs }) {
-  
-  const defaultDatasets = [{
-    name: 'osNames',
-    urlTemplate: osNamesURL,
-    parseResults: (json, query) => parseOsNamesResults(json, query, crs),
-    includeRegex: /^[a-zA-Z0-9\s,-]+$/,
-    excludeRegex: /^(?:[a-z]{2}\s*(?:\d{3}\s*\d{3}|\d{4}\s*\d{4}|\d{5}\s*\d{5})|\d+\s*,?\s*\d+)$/i // NOSONAR - complexity unavoidable for gridref/coordinate matching
-  }]
-
-  return [...defaultDatasets, ...customDatasets]
+export function createDatasets({ customDatasets = [], osNamesURL, crs, regions = ['england', 'scotland', 'wales'] }) {
+
+    if (!osNamesURL) {
+      return customDatasets
+    }
+
+    const defaultDatasets = [{
+      name: 'osNames',
+      urlTemplate: osNamesURL,
+      parseResults: (json, query) => parseOsNamesResults(json, query, regions, crs),
+      includeRegex: /[a-zA-Z0-9]/,
+      excludeRegex: /^(?:[a-z]{2}\s*(?:\d{3}\s*\d{3}|\d{4}\s*\d{4}|\d{5}\s*\d{5})|\d+\s*,?\s*\d+)$/i // NOSONAR - complexity unavoidable for gridref/coordinate matching
+    }]
+
+    return [...defaultDatasets, ...customDatasets]
 }

package/plugins/search/src/datasets.test.js

@@ -11,6 +11,21 @@ describe('createDatasets', () => {
     jest.clearAllMocks()
   })
 
+  it('returns only customDatasets if osNamesURL is not provided', () => {
+    const custom = [
+      { name: 'custom1', urlTemplate: 'https://custom.com' },
+      { name: 'custom2', urlTemplate: 'https://custom2.com' }
+    ]
+    const datasets = createDatasets({ customDatasets: custom, crs })
+    expect(datasets).toHaveLength(2)
+    expect(datasets).toEqual(custom)
+  })
+
+  it('returns empty array if neither osNamesURL nor customDatasets are provided', () => {
+    const datasets = createDatasets({ crs })
+    expect(datasets).toEqual([])
+  })
+
   it('returns default dataset with correct properties', () => {
     const datasets = createDatasets({ osNamesURL, crs })
     expect(datasets).toHaveLength(1)
@@ -18,7 +33,7 @@ describe('createDatasets', () => {
 
     expect(ds.name).toBe('osNames')
     expect(ds.urlTemplate).toBe(osNamesURL)
-    expect(ds.includeRegex).toEqual(/^[a-zA-Z0-9\s,-]+$/)
+    expect(ds.includeRegex).toEqual(/[a-zA-Z0-9]/)
     expect(ds.excludeRegex).toEqual(
       /^(?:[a-z]{2}\s*(?:\d{3}\s*\d{3}|\d{4}\s*\d{4}|\d{5}\s*\d{5})|\d+\s*,?\s*\d+)$/i
     )
@@ -39,7 +54,7 @@ describe('createDatasets', () => {
     const query = 'test query'
 
     const result = datasets[0].parseResults(json, query)
-    expect(parseMock).toHaveBeenCalledWith(json, query, crs)
+    expect(parseMock).toHaveBeenCalledWith(json, query, ['england', 'scotland', 'wales'], crs)
     expect(result).toBe('parsed')
     parseMock.mockRestore()
   })

package/plugins/search/src/events/fetchSuggestions.js

@@ -42,7 +42,7 @@ export const fetchSuggestions = async (value, datasets, dispatch, transformReque
   const sanitisedValue = sanitiseQuery(value)
 
   const activeDatasets = datasets.filter(ds => {
-    const include = ds.includeRegex ? ds.includeRegex.test(sanitisedValue) : true
+    const include = ds.includeRegex ? ds.includeRegex.test(value) : true
     const exclude = ds.excludeRegex ? ds.excludeRegex.test(sanitisedValue) : false
     return include && !exclude
   })

package/plugins/search/src/index.js

@@ -3,7 +3,7 @@ import './search.scss'
 
 export default function createPlugin (options = {}) {
   // If search is open then we need to overirde the mobile slot
-  if (options.isExpanded) {
+  if (options.expanded) {
     options.manifest = {controls: [{ id: 'search', mobile: { slot: 'banner' }}]}
   }
 

package/plugins/search/src/index.test.js

@@ -17,16 +17,16 @@ describe('createPlugin', () => {
     expect(typeof plugin.load).toBe('function')
   })
 
-  it('overrides manifest when isExpanded is true', () => {
-    const plugin = createPlugin({ isExpanded: true })
-    expect(plugin.isExpanded).toBe(true)
+  it('overrides manifest when expanded is true', () => {
+    const plugin = createPlugin({ expanded: true })
+    expect(plugin.expanded).toBe(true)
     expect(plugin.manifest).toEqual({
       controls: [{ id: 'search', mobile: { slot: 'banner' } }]
     })
   })
 
   it('spreads custom options correctly', () => {
-    const custom = { foo: 'bar', isExpanded: false }
+    const custom = { foo: 'bar', expanded: false }
     const plugin = createPlugin(custom)
     expect(plugin.foo).toBe('bar')
     expect(plugin.showMarker).toBe(true)

package/plugins/search/src/reducer.js

@@ -4,6 +4,7 @@ const initialState = {
   value: '',
   suggestions: [],
   areSuggestionsVisible: false,
+  hasFetchedSuggestions: false,
   selectedIndex: -1
 }
 
@@ -12,7 +13,8 @@ const toggleExpanded = (state, payload) => {
   return {
     ...state,
     isExpanded: payload,
-    areSuggestionsVisible: payload
+    areSuggestionsVisible: payload,
+    hasFetchedSuggestions: false
   }
 }
 
@@ -43,21 +45,24 @@ const setValue = (state, payload) => {
 const updateSuggestions = (state, payload) => {
   return {
     ...state,
-    suggestions: payload
+    suggestions: payload,
+    hasFetchedSuggestions: true
   }
 }
 
 const showSuggestions = (state) => {
   return {
     ...state,
-    areSuggestionsVisible: true
+    areSuggestionsVisible: true,
+    hasFetchedSuggestions: false
   }
 }
 
 const hideSuggestions = (state) => {
   return {
     ...state,
-    areSuggestionsVisible: false
+    areSuggestionsVisible: false,
+    hasFetchedSuggestions: false
   }
 }
 

package/plugins/search/src/reducer.test.js

@@ -3,15 +3,17 @@
 import { initialState, actions } from './reducer'
 
 describe('search state actions', () => {
-  it('TOGGLE_EXPANDED sets isExpanded and areSuggestionsVisible', () => {
-    const state = { ...initialState }
+  it('TOGGLE_EXPANDED sets isExpanded and areSuggestionsVisible, and resets hasFetchedSuggestions', () => {
+    const state = { ...initialState, hasFetchedSuggestions: true }
     const newState = actions.TOGGLE_EXPANDED(state, true)
     expect(newState.isExpanded).toBe(true)
     expect(newState.areSuggestionsVisible).toBe(true)
+    expect(newState.hasFetchedSuggestions).toBe(false)
 
     const collapsed = actions.TOGGLE_EXPANDED(state, false)
     expect(collapsed.isExpanded).toBe(false)
     expect(collapsed.areSuggestionsVisible).toBe(false)
+    expect(collapsed.hasFetchedSuggestions).toBe(false)
   })
 
   it('SET_KEYBOARD_FOCUS_WITHIN sets focus and shows suggestions', () => {
@@ -47,23 +49,26 @@ describe('search state actions', () => {
     expect(newState.value).toBe('test')
   })
 
-  it('UPDATE_SUGGESTIONS updates the suggestions array', () => {
+  it('UPDATE_SUGGESTIONS updates the suggestions array and sets hasFetchedSuggestions', () => {
     const state = { ...initialState }
     const suggestions = [{ id: 1 }, { id: 2 }]
     const newState = actions.UPDATE_SUGGESTIONS(state, suggestions)
     expect(newState.suggestions).toEqual(suggestions)
+    expect(newState.hasFetchedSuggestions).toBe(true)
   })
 
-  it('SHOW_SUGGESTIONS sets areSuggestionsVisible to true', () => {
-    const state = { ...initialState, areSuggestionsVisible: false }
+  it('SHOW_SUGGESTIONS sets areSuggestionsVisible to true and resets hasFetchedSuggestions', () => {
+    const state = { ...initialState, areSuggestionsVisible: false, hasFetchedSuggestions: true }
     const newState = actions.SHOW_SUGGESTIONS(state)
     expect(newState.areSuggestionsVisible).toBe(true)
+    expect(newState.hasFetchedSuggestions).toBe(false)
   })
 
-  it('HIDE_SUGGESTIONS sets areSuggestionsVisible to false', () => {
-    const state = { ...initialState, areSuggestionsVisible: true }
+  it('HIDE_SUGGESTIONS sets areSuggestionsVisible to false and resets hasFetchedSuggestions', () => {
+    const state = { ...initialState, areSuggestionsVisible: true, hasFetchedSuggestions: true }
     const newState = actions.HIDE_SUGGESTIONS(state)
     expect(newState.areSuggestionsVisible).toBe(false)
+    expect(newState.hasFetchedSuggestions).toBe(false)
   })
 
   it('SET_SELECTED updates selectedIndex and visibility', () => {

package/plugins/search/src/search.scss

@@ -1,11 +1,15 @@
 @use '../../../src/scss/tools/index' as tools;
 
-
 // Components, using 'CSS in Component' pattern
 @use './components/Form/Form.module';
 @use './components/CloseButton/CloseButton.module';
+@use './components/SubmitButton/SubmitButton.module';
 @use './components/Suggestions/Suggestions.module';
 
+:root {
+  --search-drop-shadow: drop-shadow(0 -2px 20px rgba(0,0,0,.1)) drop-shadow(0 0 12px rgba(0,0,0,.1));
+}
+
 // ===================================================
 // Component: Search
 // ===================================================

package/plugins/search/src/utils/parseOsNamesResults.js

@@ -10,12 +10,27 @@ const isPostcode = (value) => {
   return regex.test(value)
 }
 
+const removeRegions = (results, regions) => results.filter(r => {
+  const country = r?.GAZETTEER_ENTRY?.COUNTRY?.toLowerCase()
+  return country && regions.includes(country)
+})
+
 const removeDuplicates = (results) =>
   Array.from(new Map(results.map(r => [r.GAZETTEER_ENTRY.ID, r])).values())
 
+const transformGazetteerResult = (result) => {
+  const gazetterEntry = result.GAZETTEER_ENTRY
+  // Sometimes the NAME1 value can be welsh, so we should use NAME2 instead
+  const name = gazetterEntry.NAME2_LANG === 'eng' ? gazetterEntry.NAME2 : gazetterEntry.NAME1
+  // Force NAME1 to be the english value
+  result.GAZETTEER_ENTRY.NAME1 = name
+  result.GAZETTEER_ENTRY.NAME1_LANG = 'eng'
+  return result
+}
+
 const removeTenuousResults = (results, query) => {
   const words = query.toLowerCase().replace(/,/g, '').split(' ')
-  return results.filter(l => words.some(w => l.GAZETTEER_ENTRY.NAME1.toLowerCase().includes(w) || isPostcode(query)))
+  return results.map(transformGazetteerResult).filter(l => words.some(w => l.GAZETTEER_ENTRY.NAME1.toLowerCase().includes(w) || isPostcode(query)))
 }
 
 const markString = (string, find) => {
@@ -86,13 +101,14 @@ const label = (query, { NAME1, COUNTY_UNITARY, DISTRICT_BOROUGH, POSTCODE_DISTRI
   }
 }
 
-const parseOsNamesResults = (json, query, crs) => {
+const parseOsNamesResults = (json, query, regions, crs) => {
   if (!json || json.error || json.header?.totalresults === 0) {
     return []
   }
   let results = json.results
   results = removeTenuousResults(results, query)
   results = removeDuplicates(results)
+  results = removeRegions(results, regions)
   results = results.slice(0, MAX_RESULTS)
 
   return results.map(l => ({

package/plugins/search/src/utils/parseOsNamesResults.test.js

@@ -2,7 +2,6 @@
  * @jest-environment jsdom
  */
 import { parseOsNamesResults, point } from './parseOsNamesResults.js'
-import OsGridRef from 'geodesy/osgridref.js'
 
 // Mock OsGridRef so we can control toLatLon outputs
 jest.mock('geodesy/osgridref.js', () => {
@@ -14,6 +13,8 @@ jest.mock('geodesy/osgridref.js', () => {
 })
 
 describe('osNamesUtils', () => {
+  const regions = ['england', 'scotland', 'wales']
+
   const sampleEntry = {
     GAZETTEER_ENTRY: {
       ID: 1,
@@ -22,6 +23,7 @@ describe('osNamesUtils', () => {
       DISTRICT_BOROUGH: 'Camden',
       POSTCODE_DISTRICT: 'WC1',
       LOCAL_TYPE: 'Town',
+      COUNTRY: 'England',
       MBR_XMIN: 1000,
       MBR_YMIN: 2000,
       MBR_XMAX: 3000,
@@ -32,9 +34,9 @@ describe('osNamesUtils', () => {
   }
 
   test('returns empty array for null/invalid/error results', () => {
-    expect(parseOsNamesResults(null, 'x', 'EPSG:27700')).toEqual([])
-    expect(parseOsNamesResults({ error: true }, 'x', 'EPSG:27700')).toEqual([])
-    expect(parseOsNamesResults({ header: { totalresults: 0 } }, 'x', 'EPSG:27700')).toEqual([])
+    expect(parseOsNamesResults(null, 'x', regions, 'EPSG:27700')).toEqual([])
+    expect(parseOsNamesResults({ error: true }, 'x', regions, 'EPSG:27700')).toEqual([])
+    expect(parseOsNamesResults({ header: { totalresults: 0 } }, 'x', regions, 'EPSG:27700')).toEqual([])
   })
 
   test('removes tenuous results when query does not match', () => {
@@ -42,14 +44,14 @@ describe('osNamesUtils', () => {
       { GAZETTEER_ENTRY: { ...sampleEntry.GAZETTEER_ENTRY, NAME1: 'Bristol', ID: 2 } }
     ]
     const json = { results }
-    const output = parseOsNamesResults(json, 'London', 'EPSG:27700')
+    const output = parseOsNamesResults(json, 'London', regions, 'EPSG:27700')
     expect(output).toHaveLength(0)
   })
 
   test('removes duplicate IDs', () => {
     const dup = { ...sampleEntry, GAZETTEER_ENTRY: { ...sampleEntry.GAZETTEER_ENTRY } }
     const json = { results: [sampleEntry, dup] }
-    const output = parseOsNamesResults(json, 'London', 'EPSG:27700')
+    const output = parseOsNamesResults(json, 'London', regions, 'EPSG:27700')
     expect(output).toHaveLength(1)
   })
 
@@ -58,13 +60,13 @@ describe('osNamesUtils', () => {
       GAZETTEER_ENTRY: { ...sampleEntry.GAZETTEER_ENTRY, ID: i }
     }))
     const json = { results: manyResults }
-    const output = parseOsNamesResults(json, 'London', 'EPSG:27700')
+    const output = parseOsNamesResults(json, 'London', regions, 'EPSG:27700')
     expect(output).toHaveLength(8)
   })
 
   test('bounds returns raw OSGB values for EPSG:27700', () => {
     const json = { results: [sampleEntry] }
-    const output = parseOsNamesResults(json, 'London', 'EPSG:27700')
+    const output = parseOsNamesResults(json, 'London', regions, 'EPSG:27700')
     expect(output[0].bounds).toEqual([
       sampleEntry.GAZETTEER_ENTRY.MBR_XMIN,
       sampleEntry.GAZETTEER_ENTRY.MBR_YMIN,
@@ -79,7 +81,7 @@ describe('osNamesUtils', () => {
 
   test('bounds converts to WGS84 for EPSG:4326', () => {
     const json = { results: [sampleEntry] }
-    const output = parseOsNamesResults(json, 'London', 'EPSG:4326')
+    const output = parseOsNamesResults(json, 'London', regions, 'EPSG:4326')
     const expectedBounds = [
       Math.round(1000 / 1e5 * 1e6) / 1e6,
       Math.round(2000 / 1e5 * 1e6) / 1e6,
@@ -96,7 +98,7 @@ describe('osNamesUtils', () => {
 
   test('label generates marked text', () => {
     const json = { results: [sampleEntry] }
-    const output = parseOsNamesResults(json, 'London', 'EPSG:27700')
+    const output = parseOsNamesResults(json, 'London', regions, 'EPSG:27700')
     expect(output[0].text).toContain('London')
     expect(output[0].marked).toContain('<mark>')
   })
@@ -106,7 +108,7 @@ describe('osNamesUtils', () => {
       GAZETTEER_ENTRY: { ...sampleEntry.GAZETTEER_ENTRY, MBR_XMIN: null, MBR_YMIN: null }
     }
     const json = { results: [entry] }
-    const output = parseOsNamesResults(json, 'London', 'EPSG:27700')
+    const output = parseOsNamesResults(json, 'London', regions, 'EPSG:27700')
     expect(output[0].bounds).toEqual([
       entry.GAZETTEER_ENTRY.GEOMETRY_X - 500,
       entry.GAZETTEER_ENTRY.GEOMETRY_Y - 500,
@@ -117,24 +119,40 @@ describe('osNamesUtils', () => {
 
   test('label falls back to DISTRICT_BOROUGH when COUNTY_UNITARY is absent', () => {
     const entry = { GAZETTEER_ENTRY: { ...sampleEntry.GAZETTEER_ENTRY, COUNTY_UNITARY: null } }
-    const output = parseOsNamesResults({ results: [entry] }, 'London', 'EPSG:27700')
+    const output = parseOsNamesResults({ results: [entry] }, 'London', regions, 'EPSG:27700')
     expect(output[0].text).toContain(sampleEntry.GAZETTEER_ENTRY.DISTRICT_BOROUGH)
   })
 
   test('label omits qualifier for City type', () => {
     const entry = { GAZETTEER_ENTRY: { ...sampleEntry.GAZETTEER_ENTRY, LOCAL_TYPE: 'City' } }
-    const output = parseOsNamesResults({ results: [entry] }, 'London', 'EPSG:27700')
+    const output = parseOsNamesResults({ results: [entry] }, 'London', regions, 'EPSG:27700')
     expect(output[0].text).toBe('London')
   })
 
+  /**
+   * Cover transformGazetteerResult branches
+   */
+
+  test('uses NAME2 when NAME2_LANG is eng', () => {
+    const entry = { GAZETTEER_ENTRY: { ...sampleEntry.GAZETTEER_ENTRY, NAME1: 'Caerdydd', NAME2: 'Cardiff', NAME2_LANG: 'eng' }}
+    const output = parseOsNamesResults({ results: [entry] }, 'Cardiff', regions, 'EPSG:27700')
+    expect(output[0].text).toContain('Cardiff')
+  })
+
+  test('falls back to NAME1 when NAME2_LANG is not eng', () => {
+    const entry = { GAZETTEER_ENTRY: { ...sampleEntry.GAZETTEER_ENTRY, NAME1: 'London', NAME2: 'Londres', NAME2_LANG: 'fra' }}
+    const output = parseOsNamesResults({ results: [entry] }, 'London', regions, 'EPSG:27700')
+    expect(output[0].text).toContain('London')
+  })
+
   test('throws error for unsupported CRS', () => {
     const entry = { GAZETTEER_ENTRY: { ...sampleEntry.GAZETTEER_ENTRY } }
     const json = { results: [entry] }
-    expect(() => parseOsNamesResults(json, 'London', 'EPSG:9999')).toThrow('Unsupported CRS')
+    expect(() => parseOsNamesResults(json, 'London', regions, 'EPSG:9999')).toThrow('Unsupported CRS')
   })
 
   test('point function throws error for unsupported CRS', () => {
     const coords = { GEOMETRY_X: 1500, GEOMETRY_Y: 2500 }
     expect(() => point('EPSG:9999', coords)).toThrow('Unsupported CRS: EPSG:9999')
   })
-})
+})