@defra/interactive-map 0.0.9-alpha → 0.0.11-alpha

package/plugins/search/src/events/suggestionHandlers.test.js

@@ -0,0 +1,166 @@
+/**
+ * @jest-environment jsdom
+ */
+import { createSuggestionHandlers } from './suggestionHandlers.js'
+import { updateMap } from '../utils/updateMap.js'
+
+jest.mock('../utils/updateMap.js')
+
+describe('createSuggestionHandlers', () => {
+  let dispatch
+  let services
+  let handlers
+
+  beforeEach(() => {
+    dispatch = jest.fn()
+
+    services = {
+      eventBus: { emit: jest.fn() },
+      announce: jest.fn()
+    }
+
+    handlers = createSuggestionHandlers({
+      dispatch,
+      services,
+      mapProvider: 'map',
+      markers: 'markers',
+      showMarker: true,
+      markerColor: 'blue'
+    })
+
+    jest.clearAllMocks()
+  })
+
+  // ---------- Suggestion click ----------
+
+  test('handleSuggestionClick (desktop)', () => {
+    const suggestion = { text: 'Paris', bounds: 'b', point: 'p' }
+
+    handlers.handleSuggestionClick(suggestion, { breakpoint: 'desktop' })
+
+    expect(dispatch).toHaveBeenCalledWith({ type: 'SET_VALUE', payload: 'Paris' })
+    expect(dispatch).toHaveBeenCalledWith({ type: 'HIDE_SUGGESTIONS' })
+    expect(dispatch).toHaveBeenCalledWith({ type: 'SET_SELECTED', payload: -1 })
+    expect(updateMap).toHaveBeenCalledWith(expect.objectContaining({ bounds: 'b', point: 'p' }))
+    expect(services.eventBus.emit).toHaveBeenCalledWith(
+      'search:match',
+      expect.objectContaining({ query: 'Paris' })
+    )
+  })
+
+  test('handleSuggestionClick (mobile closes search)', () => {
+    const suggestion = { text: 'Berlin', bounds: 'b', point: 'p' }
+
+    handlers.handleSuggestionClick(suggestion, { breakpoint: 'mobile' })
+
+    expect(dispatch).toHaveBeenCalledWith({ type: 'TOGGLE_EXPANDED', payload: false })
+    expect(services.eventBus.emit).toHaveBeenCalledWith('search:close')
+  })
+
+  // ---------- ArrowDown ----------
+
+  test('ArrowDown selects next suggestion', () => {
+    const e = { key: 'ArrowDown', preventDefault: jest.fn() }
+
+    handlers.handleInputKeyDown(e, {
+      suggestions: [{ text: 'A' }, { text: 'B' }],
+      selectedIndex: 0
+    })
+
+    expect(e.preventDefault).toHaveBeenCalled()
+    expect(services.announce).toHaveBeenCalledWith('B. 2 of 2 is highlighted')
+    expect(dispatch).toHaveBeenCalledWith({ type: 'SET_SELECTED', payload: 1 })
+    expect(dispatch).toHaveBeenCalledWith({ type: 'SET_KEYBOARD_FOCUS_WITHIN', payload: false })
+  })
+
+  test('ArrowDown does nothing when no suggestions', () => {
+    const e = { key: 'ArrowDown', preventDefault: jest.fn() }
+
+    handlers.handleInputKeyDown(e, { suggestions: [], selectedIndex: 0 })
+
+    expect(e.preventDefault).not.toHaveBeenCalled()
+    expect(dispatch).not.toHaveBeenCalled()
+    expect(services.announce).not.toHaveBeenCalled()
+  })
+
+  test('ArrowDown does nothing when at last suggestion', () => {
+    const e = { key: 'ArrowDown', preventDefault: jest.fn() }
+
+    handlers.handleInputKeyDown(e, {
+      suggestions: [{ text: 'A' }, { text: 'B' }],
+      selectedIndex: 1 // last index
+    })
+
+    expect(e.preventDefault).toHaveBeenCalled()
+    expect(dispatch).not.toHaveBeenCalled()
+    expect(services.announce).not.toHaveBeenCalled()
+  })
+
+  // ---------- ArrowUp ----------
+
+  test('ArrowUp moves selection up and resets to -1', () => {
+    const e = { key: 'ArrowUp', preventDefault: jest.fn() }
+
+    handlers.handleInputKeyDown(e, {
+      suggestions: [{ text: 'A' }, { text: 'B' }],
+      selectedIndex: 0
+    })
+
+    expect(e.preventDefault).toHaveBeenCalled()
+    expect(services.announce).toHaveBeenCalledWith('2 suggestions available')
+    expect(dispatch).toHaveBeenCalledWith({ type: 'SET_SELECTED', payload: -1 })
+    expect(dispatch).toHaveBeenCalledWith({ type: 'SET_KEYBOARD_FOCUS_WITHIN', payload: true })
+  })
+
+  test('ArrowUp moves selection up normally when selectedIndex > 0', () => {
+    const e = { key: 'ArrowUp', preventDefault: jest.fn() }
+
+    handlers.handleInputKeyDown(e, {
+      suggestions: [{ text: 'A' }, { text: 'B' }, { text: 'C' }],
+      selectedIndex: 2
+    })
+
+    expect(e.preventDefault).toHaveBeenCalled()
+    expect(services.announce).toHaveBeenCalledWith('B. 2 of 3 is highlighted')
+    expect(dispatch).toHaveBeenCalledWith({ type: 'SET_SELECTED', payload: 1 })
+    expect(dispatch).toHaveBeenCalledWith({ type: 'SET_KEYBOARD_FOCUS_WITHIN', payload: false })
+  })
+
+  test('ArrowUp does nothing when no suggestions', () => {
+    const e = { key: 'ArrowUp', preventDefault: jest.fn() }
+
+    handlers.handleInputKeyDown(e, { suggestions: [], selectedIndex: 0 })
+
+    expect(e.preventDefault).not.toHaveBeenCalled()
+    expect(dispatch).not.toHaveBeenCalled()
+    expect(services.announce).not.toHaveBeenCalled()
+  })
+
+  // ---------- Escape & default ----------
+
+  test('Escape hides suggestions and clears selection', () => {
+    const e = { key: 'Escape', preventDefault: jest.fn() }
+
+    handlers.handleInputKeyDown(e, {
+      suggestions: [{ text: 'A' }],
+      selectedIndex: 0
+    })
+
+    expect(e.preventDefault).toHaveBeenCalled()
+    expect(dispatch).toHaveBeenCalledWith({ type: 'HIDE_SUGGESTIONS' })
+    expect(dispatch).toHaveBeenCalledWith({ type: 'SET_SELECTED', payload: -1 })
+  })
+
+  test('Other keys do nothing', () => {
+    const e = { key: 'Enter', preventDefault: jest.fn() }
+
+    handlers.handleInputKeyDown(e, {
+      suggestions: [{ text: 'A' }],
+      selectedIndex: 0
+    })
+
+    expect(e.preventDefault).not.toHaveBeenCalled()
+    expect(dispatch).not.toHaveBeenCalled()
+    expect(services.announce).not.toHaveBeenCalled()
+  })
+})

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

@@ -0,0 +1,47 @@
+// /plugins/search/index.test.js
+
+// Mock SCSS import so Jest can run without parsing errors
+jest.mock('./search.scss', () => {})
+
+import createPlugin from './index'
+
+describe('createPlugin', () => {
+  beforeEach(() => {
+    jest.resetModules()
+  })
+
+  it('returns default plugin structure with showMarker and id', async () => {
+    const plugin = createPlugin()
+    expect(plugin.showMarker).toBe(true)
+    expect(plugin.id).toBe('search')
+    expect(typeof plugin.load).toBe('function')
+  })
+
+  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', expanded: false }
+    const plugin = createPlugin(custom)
+    expect(plugin.foo).toBe('bar')
+    expect(plugin.showMarker).toBe(true)
+    expect(plugin.id).toBe('search')
+  })
+
+  it('load function dynamically imports the manifest and returns it', async () => {
+    // Mock the dynamic import for './manifest.js'
+    const manifestMock = { data: 'test-manifest' }
+    jest.mock('./manifest.js', () => ({
+      manifest: manifestMock
+    }), { virtual: true })
+
+    const plugin = createPlugin()
+    const result = await plugin.load()
+    expect(result).toEqual(manifestMock)
+  })
+})

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

@@ -0,0 +1,85 @@
+// /plugins/search/reducer.test.js
+
+import { initialState, actions } from './reducer'
+
+describe('search state actions', () => {
+  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', () => {
+    const state = { ...initialState }
+    const newState = actions.SET_KEYBOARD_FOCUS_WITHIN(state, true)
+    expect(newState.hasKeyboardFocusWithin).toBe(true)
+    expect(newState.areSuggestionsVisible).toBe(true)
+
+    const removedFocus = actions.SET_KEYBOARD_FOCUS_WITHIN(state, false)
+    expect(removedFocus.hasKeyboardFocusWithin).toBe(false)
+    expect(removedFocus.areSuggestionsVisible).toBe(true) // always true
+  })
+
+  it('INPUT_BLUR removes focus and updates areSuggestionsVisible correctly', () => {
+    const state = { ...initialState, areSuggestionsVisible: true, hasKeyboardFocusWithin: true }
+
+    // Non-keyboard blur
+    const newStateMouse = actions.INPUT_BLUR(state, 'mouse')
+    expect(newStateMouse.hasKeyboardFocusWithin).toBe(false)
+    expect(newStateMouse.areSuggestionsVisible).toBe(true) // still true
+    expect(newStateMouse.selectedIndex).toBe(-1)
+
+    // Keyboard blur hides suggestions
+    const newStateKeyboard = actions.INPUT_BLUR(state, 'keyboard')
+    expect(newStateKeyboard.hasKeyboardFocusWithin).toBe(false)
+    expect(newStateKeyboard.areSuggestionsVisible).toBe(false) // now false
+    expect(newStateKeyboard.selectedIndex).toBe(-1)
+  })
+
+  it('SET_VALUE updates the input value', () => {
+    const state = { ...initialState }
+    const newState = actions.SET_VALUE(state, 'test')
+    expect(newState.value).toBe('test')
+  })
+
+  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 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 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', () => {
+    const state = { ...initialState, areSuggestionsVisible: false }
+    
+    const selected = actions.SET_SELECTED(state, 1)
+    expect(selected.selectedIndex).toBe(1)
+    expect(selected.areSuggestionsVisible).toBe(true)
+
+    const deselected = actions.SET_SELECTED(state, -1)
+    expect(deselected.selectedIndex).toBe(-1)
+    expect(deselected.areSuggestionsVisible).toBe(false)
+  })
+})

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 => ({
@@ -105,5 +121,6 @@ const parseOsNamesResults = (json, query, crs) => {
 }
 
 export {
-  parseOsNamesResults
+  parseOsNamesResults,
+  point
 }

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

@@ -0,0 +1,158 @@
+/**
+ * @jest-environment jsdom
+ */
+import { parseOsNamesResults, point } from './parseOsNamesResults.js'
+
+// Mock OsGridRef so we can control toLatLon outputs
+jest.mock('geodesy/osgridref.js', () => {
+  return jest.fn().mockImplementation((x, y) => ({
+    x,
+    y,
+    toLatLon: () => ({ lat: y / 1e5, lon: x / 1e5 }) // deterministic lat/lon
+  }))
+})
+
+describe('osNamesUtils', () => {
+  const regions = ['england', 'scotland', 'wales']
+
+  const sampleEntry = {
+    GAZETTEER_ENTRY: {
+      ID: 1,
+      NAME1: 'London',
+      COUNTY_UNITARY: 'Greater London',
+      DISTRICT_BOROUGH: 'Camden',
+      POSTCODE_DISTRICT: 'WC1',
+      LOCAL_TYPE: 'Town',
+      COUNTRY: 'England',
+      MBR_XMIN: 1000,
+      MBR_YMIN: 2000,
+      MBR_XMAX: 3000,
+      MBR_YMAX: 4000,
+      GEOMETRY_X: 1500,
+      GEOMETRY_Y: 2500
+    }
+  }
+
+  test('returns empty array for null/invalid/error results', () => {
+    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', () => {
+    const results = [
+      { GAZETTEER_ENTRY: { ...sampleEntry.GAZETTEER_ENTRY, NAME1: 'Bristol', ID: 2 } }
+    ]
+    const json = { results }
+    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', regions, 'EPSG:27700')
+    expect(output).toHaveLength(1)
+  })
+
+  test('limits results to MAX_RESULTS', () => {
+    const manyResults = Array.from({ length: 10 }, (_, i) => ({
+      GAZETTEER_ENTRY: { ...sampleEntry.GAZETTEER_ENTRY, ID: i }
+    }))
+    const json = { results: manyResults }
+    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', regions, 'EPSG:27700')
+    expect(output[0].bounds).toEqual([
+      sampleEntry.GAZETTEER_ENTRY.MBR_XMIN,
+      sampleEntry.GAZETTEER_ENTRY.MBR_YMIN,
+      sampleEntry.GAZETTEER_ENTRY.MBR_XMAX,
+      sampleEntry.GAZETTEER_ENTRY.MBR_YMAX
+    ])
+    expect(output[0].point).toEqual([
+      sampleEntry.GAZETTEER_ENTRY.GEOMETRY_X,
+      sampleEntry.GAZETTEER_ENTRY.GEOMETRY_Y
+    ])
+  })
+
+  test('bounds converts to WGS84 for EPSG:4326', () => {
+    const json = { results: [sampleEntry] }
+    const output = parseOsNamesResults(json, 'London', regions, 'EPSG:4326')
+    const expectedBounds = [
+      Math.round(1000 / 1e5 * 1e6) / 1e6,
+      Math.round(2000 / 1e5 * 1e6) / 1e6,
+      Math.round(3000 / 1e5 * 1e6) / 1e6,
+      Math.round(4000 / 1e5 * 1e6) / 1e6
+    ]
+    expect(output[0].bounds).toEqual(expectedBounds)
+    const expectedPoint = [
+      Math.round(1500 / 1e5 * 1e6) / 1e6,
+      Math.round(2500 / 1e5 * 1e6) / 1e6
+    ]
+    expect(output[0].point).toEqual(expectedPoint)
+  })
+
+  test('label generates marked text', () => {
+    const json = { results: [sampleEntry] }
+    const output = parseOsNamesResults(json, 'London', regions, 'EPSG:27700')
+    expect(output[0].text).toContain('London')
+    expect(output[0].marked).toContain('<mark>')
+  })
+
+  test('handles MBR_XMIN null by using buffered GEOMETRY_X/Y', () => {
+    const entry = {
+      GAZETTEER_ENTRY: { ...sampleEntry.GAZETTEER_ENTRY, MBR_XMIN: null, MBR_YMIN: null }
+    }
+    const json = { results: [entry] }
+    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,
+      entry.GAZETTEER_ENTRY.GEOMETRY_X + 500,
+      entry.GAZETTEER_ENTRY.GEOMETRY_Y + 500
+    ])
+  })
+
+  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', 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', 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', 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')
+  })
+})

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

@@ -0,0 +1,52 @@
+// src/plugins/search/utils/updateMap.test.js
+
+import { updateMap } from './updateMap.js'
+
+describe('updateMap', () => {
+  let mapProvider
+  let markers
+  const bounds = { north: 1, south: 0 }
+  const point = { lat: 10, lng: 20 }
+
+  beforeEach(() => {
+    mapProvider = {
+      fitToBounds: jest.fn(),
+    }
+
+    markers = {
+      add: jest.fn(),
+    }
+  })
+
+  it('fits the map to bounds and adds a marker when showMarker is true', () => {
+    updateMap({
+      mapProvider,
+      bounds,
+      point,
+      markers,
+      showMarker: true,
+      markerColor: 'red',
+    })
+
+    expect(mapProvider.fitToBounds).toHaveBeenCalledWith(bounds)
+    expect(markers.add).toHaveBeenCalledWith(
+      'search',
+      point,
+      { color: 'red' }
+    )
+  })
+
+  it('fits the map to bounds and does not add a marker when showMarker is false', () => {
+    updateMap({
+      mapProvider,
+      bounds,
+      point,
+      markers,
+      showMarker: false,
+      markerColor: 'blue',
+    })
+
+    expect(mapProvider.fitToBounds).toHaveBeenCalledWith(bounds)
+    expect(markers.add).not.toHaveBeenCalled()
+  })
+})

package/providers/beta/esri/dist/esm/im-esri-provider.js

@@ -1 +1 @@
-import e from"@babel/runtime/helpers/objectWithoutProperties";import t from"@babel/runtime/helpers/asyncToGenerator";import i from"@arcgis/core/config.js";import n from"@arcgis/core/Map.js";import o from"@arcgis/core/views/MapView.js";import r from"@arcgis/core/layers/VectorTileLayer.js";import{when as a,once as s,watch as m}from"@arcgis/core/core/reactiveUtils.js";import u from"@arcgis/core/geometry/Extent.js";import l from"@arcgis/core/geometry/Point.js";var v={animationDuration:200},c=["showKeyboardHelp","selectControl","moveLarge","nudgeMap","zoomLarge","nudgeZoom"];var p=(e,t)=>{var i=null,n=function(){for(var n=arguments.length,o=new Array(n),r=0;r<n;r++)o[r]=arguments[r];clearTimeout(i),i=setTimeout(()=>{e(...o)},t)};return n.cancel=()=>{i&&(clearTimeout(i),i=null)},n};function h(e){var{mapProvider:t,view:i,baseTileLayer:n,events:o,eventBus:r,getZoom:u,getCenter:l,getBounds:v,getResolution:c}=e,h=!1,d=[],y=[],g=e=>{var t=(()=>{if(h||!i||i.destroyed||!i.extent)return null;var{maxZoom:e,minZoom:t}=i.constraints;return{center:l(),bounds:v(),resolution:c(),zoom:u(),isAtMaxZoom:i.zoom+.01>=e,isAtMinZoom:i.zoom-.01<=t}})();t&&r.emit(e,t)};a(()=>n.loaded&&i.resolution>0,()=>g(o.MAP_LOADED)),s(()=>i.ready).then(()=>{h||r.emit(o.MAP_READY,t.getMapAPI())}),s(()=>i.stationary).then(()=>g(o.MAP_FIRST_IDLE));var w=p(()=>g(o.MAP_MOVE_END),500);y.push(w),d.push(m(()=>[i.interacting,i.animation],e=>{var[t,i]=e;(t||i)&&r.emit(o.MAP_MOVE_START),t||i||w()}));var f,x,M,b=(f=()=>g(o.MAP_MOVE),x=10,M=0,function(){var e=Date.now();e-M>=x&&(M=e,f(...arguments))});y.push(b),d.push(m(()=>i.zoom,b)),d.push(m(()=>i.extent,()=>r.emit(o.MAP_RENDER),{initial:!1}));var E=p(()=>g(o.MAP_DATA_CHANGE),500);return y.push(E),d.push(m(()=>i.updating,e=>!e&&E())),d.push(i.on("click",e=>{var t=e.mapPoint,i={x:e.x,y:e.y};r.emit(o.MAP_CLICK,{point:i,coords:[t.x,t.y]})})),{remove(){h=!0,y.forEach(e=>e.cancel()),d.forEach(e=>e.remove())}}}var d=e=>{var t=1609.344,i=e/t;if(i<.5/t)return"".concat(Math.round(e),"m");if(i<10){var n=Number.parseFloat(i.toFixed(1)),o=1===n?"mile":"miles";return"".concat(n," ").concat(o)}var r=Math.round(i),a=1===r?"mile":"miles";return"".concat(r," ").concat(a)};var y={top:0,right:0,bottom:0,left:0};function g(){return(g=t(function*(e,t){if(!e||!t)return[];var i=e.map.layers.filter(e=>e instanceof r);return i.length?(yield e.hitTest(t,{include:i.toArray()})).results.map(e=>({layerId:e.layer.id,layerTitle:e.layer.title||e.layer.id,type:e.layer.type,geometry:e.graphic.geometry,symbol:e.graphic.symbol})):[]})).apply(this,arguments)}var w=e=>e?new u({xmin:e[0],ymin:e[1],xmax:e[2],ymax:e[3],spatialReference:{wkid:27700}}):void 0,f=e=>e?new l({x:e[0],y:e[1],spatialReference:{wkid:27700}}):void 0,x=["container","padding","mapStyle","maxExtent"];class M{constructor(e){var{mapProviderConfig:t={},events:i,eventBus:n}=e;this.events=i,this.eventBus=n,this.capabilities={supportedShortcuts:c,supportsMapSizes:!1},Object.assign(this,t),this.mapEventHandles=[],this.appEventHandles=[]}initMap(a){var s=this;return t(function*(){var{container:t,padding:m,mapStyle:u,maxExtent:l}=a;e(a,x);var{events:v,eventBus:c}=s;s.setupConfig&&(yield s.setupConfig(i));var p=new r({id:"baselayer",url:u.url,visible:!0}),d=new n({layers:[p]}),y=l?w(l):null,g=new o({spatialReference:27700,container:t,map:d,zoom:a.zoom,center:f(a.center),maxExtent:l,constraints:{snapToZoom:!1,minZoom:a.minZoom,maxZoom:a.maxZoom,maxScale:0,geometry:y,rotationEnabled:!1},ui:{components:[]},popupEnabled:!1});(e=>{if(e){var t=e.querySelector(".esri-view-surface");t.removeAttribute("role"),t.tabIndex=-1,t.style["outline-color"]="transparent",t.style.touchAction="none"}})(g.container),g.padding=m,a.bounds&&g.when(()=>g.goTo(w(a.bounds),{duration:0})),s.mapEventHandles=h({mapProvider:s,view:g,baseTileLayer:p,events:v,eventBus:c,getZoom:s.getZoom.bind(s),getCenter:s.getCenter.bind(s),getBounds:s.getBounds.bind(s),getResolution:s.getResolution.bind(s)}),s.appEventHandles=function(e){var{baseTileLayer:t,events:i,eventBus:n}=e,o=e=>{t.loadStyle(e.url).then(()=>{n.emit(i.MAP_STYLE_CHANGE,e)})};return n.on(i.MAP_SET_STYLE,o),{remove(){n.off(i.MAP_SET_STYLE,o)}}}({baseTileLayer:p,events:v,eventBus:c})||[],s.map=d,s.view=g,s.baseTileLayer=p})()}destroyMap(){var e,t;null===(e=this.mapEvents)||void 0===e||e.remove(),null===(t=this.appEvents)||void 0===t||t.remove(),this.mapEvents=null,this.appEvents=null,this.view&&(this.view.container=null,this.view.destroy(),this.view=null),this.map&&(this.map.removeAll(),this.map=null)}getMapAPI(){return{map:this.map,view:this.view,crs:this.crs,fitToBounds:this.fitToBounds.bind(this),setView:this.setView.bind(this)}}setView(e){var t,{center:i,zoom:n}=e;null===(t=this.view.animation)||void 0===t||t.destroy(),this.view.goTo({center:i,zoom:n,duration:v.animationDuration})}zoomIn(e){var t;null===(t=this.view.animation)||void 0===t||t.destroy(),this.view.goTo({zoom:this.view.zoom+e,duration:v.animationDuration})}zoomOut(e){var t;null===(t=this.view.animation)||void 0===t||t.destroy(),this.view.goTo({zoom:this.view.zoom-e,duration:v.animationDuration})}panBy(e){var{x:t,y:i}=this.view.toScreen(this.view.center),n={x:t+e[0],y:i+e[1]},o=this.view.toMap(n);this.view.goTo({center:o,duration:v.animationDuration})}fitToBounds(e){this.view.goTo(w(e),{duration:v.DELAY})}setPadding(e){this.view.padding=e}getCenter(){var e=this.view.center;return[e.x,e.y].map(e=>Math.round(100*e)/100)}getZoom(){return this.view.zoom}getBounds(){var{xmin:e,ymin:t,xmax:i,ymax:n}=this.view.extent;return[e,t,i,n].map(e=>Math.round(100*e)/100)}getFeaturesAtPoint(e,t){return function(e,t){return g.apply(this,arguments)}(this.view,e)}getAreaDimensions(){return(e=>{if(!(e&&e instanceof u))return"";var t=e.xmin,i=e.ymin,n=e.xmax,o=e.ymax-i,r=d(n-t),a=d(o);return"".concat(a," by ").concat(r)})(function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:y;if(!e.container)return null;var{width:i,height:n}=e.container.getBoundingClientRect(),o={x:t.left,y:n-t.bottom},r={x:i-t.right,y:t.top},a=e.toMap(o),s=e.toMap(r);return new u({xmin:a.x,ymin:a.y,xmax:s.x,ymax:s.y,spatialReference:a.spatialReference})}(this.view))}getCardinalMove(e,t){return function(e,t){var[i,n]=e,[o,r]=t,a=o-i,s=r-n,m=[];return Math.abs(s)>.1&&m.push("".concat(s>0?"north":"south"," ").concat(d(Math.abs(s)))),Math.abs(a)>.1&&m.push("".concat(a>0?"east":"west"," ").concat(d(Math.abs(a)))),m.join(", ")}(e,t)}getResolution(){return this.view.resolution}mapToScreen(e){var t=f(e),i=this.view.toScreen(t);return{x:i.x,y:i.y}}screenToMap(e){var t=this.view.toMap(e);return[t.x,t.y]}}export{M as default};
+import e from"@babel/runtime/helpers/objectWithoutProperties";import t from"@babel/runtime/helpers/asyncToGenerator";import o from"@arcgis/core/config.js";import i from"@arcgis/core/Map.js";import r from"@arcgis/core/views/MapView.js";import n from"@arcgis/core/layers/VectorTileLayer.js";import{when as a,once as s,watch as m}from"@arcgis/core/core/reactiveUtils.js";import u from"@arcgis/core/geometry/Extent.js";import l from"@arcgis/core/geometry/Point.js";var v={animationDuration:200},c=["showKeyboardHelp","selectControl","moveLarge","nudgeMap","zoomLarge","nudgeZoom"];var p=(e,t)=>{var o=null,i=function(){for(var i=arguments.length,r=new Array(i),n=0;n<i;n++)r[n]=arguments[n];clearTimeout(o),o=setTimeout(()=>{e(...r)},t)};return i.cancel=()=>{o&&(clearTimeout(o),o=null)},i};function h(e){var{mapProvider:t,view:o,baseTileLayer:i,events:r,eventBus:n,getZoom:u,getCenter:l,getBounds:v,getResolution:c}=e,h=!1,d=[],y=[],g=e=>{var t=(()=>{if(h||!o||o.destroyed||!o.extent)return null;var{maxZoom:e,minZoom:t}=o.constraints;return{center:l(),bounds:v(),resolution:c(),zoom:u(),isAtMaxZoom:o.zoom+.01>=e,isAtMinZoom:o.zoom-.01<=t}})();t&&n.emit(e,t)};a(()=>i.loaded&&o.resolution>0,()=>g(r.MAP_LOADED)),s(()=>o.ready).then(()=>{h||n.emit(r.MAP_READY,{map:t.map,view:t.view,mapStyleId:t.mapStyleId,mapSize:t.mapSize,crs:t.crs})}),s(()=>o.stationary).then(()=>g(r.MAP_FIRST_IDLE));var f=p(()=>g(r.MAP_MOVE_END),500);y.push(f),d.push(m(()=>[o.interacting,o.animation],e=>{var[t,o]=e;(t||o)&&n.emit(r.MAP_MOVE_START),t||o||f()}));var x,w,M,b=(x=()=>g(r.MAP_MOVE),w=10,M=0,function(){var e=Date.now();e-M>=w&&(M=e,x(...arguments))});y.push(b),d.push(m(()=>o.zoom,b)),d.push(m(()=>o.extent,()=>n.emit(r.MAP_RENDER),{initial:!1}));var E=p(()=>g(r.MAP_DATA_CHANGE),500);return y.push(E),d.push(m(()=>o.updating,e=>!e&&E())),d.push(o.on("click",e=>{var t=e.mapPoint,o={x:e.x,y:e.y};n.emit(r.MAP_CLICK,{point:o,coords:[t.x,t.y]})})),{remove(){h=!0,y.forEach(e=>e.cancel()),d.forEach(e=>e.remove())}}}var d=e=>{var t=1609.344,o=e/t;if(o<.5/t)return"".concat(Math.round(e),"m");if(o<10){var i=Number.parseFloat(o.toFixed(1)),r=1===i?"mile":"miles";return"".concat(i," ").concat(r)}var n=Math.round(o),a=1===n?"mile":"miles";return"".concat(n," ").concat(a)};var y={top:0,right:0,bottom:0,left:0};function g(){return(g=t(function*(e,t){if(!e||!t)return[];var o=e.map.layers.filter(e=>e instanceof n);return o.length?(yield e.hitTest(t,{include:o.toArray()})).results.map(e=>({layerId:e.layer.id,layerTitle:e.layer.title||e.layer.id,type:e.layer.type,geometry:e.graphic.geometry,symbol:e.graphic.symbol})):[]})).apply(this,arguments)}var f=e=>e?new u({xmin:e[0],ymin:e[1],xmax:e[2],ymax:e[3],spatialReference:{wkid:27700}}):void 0,x=e=>e?new l({x:e[0],y:e[1],spatialReference:{wkid:27700}}):void 0,w=(e,t)=>{if(e)if("FeatureCollection"===e.type)e.features.forEach(e=>w(e,t));else if("Feature"===e.type)w(e.geometry,t);else if("GeometryCollection"===e.type)e.geometries.forEach(e=>w(e,t));else{var o=e=>{"number"==typeof e[0]?t.push(e):e.forEach(o)};o(e.coordinates)}},M=["container","padding","mapStyle","mapSize","maxExtent"];class b{constructor(e){var{mapProviderConfig:t={},events:o,eventBus:i}=e;this.events=o,this.eventBus=i,this.capabilities={supportedShortcuts:c,supportsMapSizes:!1},Object.assign(this,t),this.mapEventHandles=[],this.appEventHandles=[]}initMap(a){var s=this;return t(function*(){var{container:t,padding:m,mapStyle:u,mapSize:l,maxExtent:v}=a;e(a,M),s.mapStyleId=null==u?void 0:u.id,s.mapSize=l;var{events:c,eventBus:p}=s;s.setupConfig&&(yield s.setupConfig(o));var d=new n({id:"baselayer",url:u.url,visible:!0}),y=new i({layers:[d]}),g=v?f(v):null,w=new r({spatialReference:27700,container:t,map:y,zoom:a.zoom,center:x(a.center),maxExtent:v,constraints:{snapToZoom:!1,minZoom:a.minZoom,maxZoom:a.maxZoom,maxScale:0,geometry:g,rotationEnabled:!1},ui:{components:[]},popupEnabled:!1});(e=>{if(e){var t=e.querySelector(".esri-view-surface");t.removeAttribute("role"),t.tabIndex=-1,t.style["outline-color"]="transparent",t.style.touchAction="none"}})(w.container),w.padding=m,a.bounds&&w.when(()=>w.goTo(f(a.bounds),{duration:0})),s.mapEventHandles=h({mapProvider:s,view:w,baseTileLayer:d,events:c,eventBus:p,getZoom:s.getZoom.bind(s),getCenter:s.getCenter.bind(s),getBounds:s.getBounds.bind(s),getResolution:s.getResolution.bind(s)}),s.appEventHandles=function(e){var{baseTileLayer:t,events:o,eventBus:i}=e,r=e=>{t.loadStyle(e.url).then(()=>{i.emit(o.MAP_STYLE_CHANGE,{mapStyleId:e.id})})};return i.on(o.MAP_SET_STYLE,r),{remove(){i.off(o.MAP_SET_STYLE,r)}}}({baseTileLayer:d,events:c,eventBus:p})||[],s.map=y,s.view=w,s.baseTileLayer=d})()}destroyMap(){var e,t;null===(e=this.mapEvents)||void 0===e||e.remove(),null===(t=this.appEvents)||void 0===t||t.remove(),this.mapEvents=null,this.appEvents=null,this.view&&(this.view.container=null,this.view.destroy(),this.view=null),this.map&&(this.map.removeAll(),this.map=null)}setView(e){var t,{center:o,zoom:i}=e;null===(t=this.view.animation)||void 0===t||t.destroy(),this.view.goTo({center:o,zoom:i,duration:v.animationDuration})}zoomIn(e){var t;null===(t=this.view.animation)||void 0===t||t.destroy(),this.view.goTo({zoom:this.view.zoom+e,duration:v.animationDuration})}zoomOut(e){var t;null===(t=this.view.animation)||void 0===t||t.destroy(),this.view.goTo({zoom:this.view.zoom-e,duration:v.animationDuration})}panBy(e){var{x:t,y:o}=this.view.toScreen(this.view.center),i={x:t+e[0],y:o+e[1]},r=this.view.toMap(i);this.view.goTo({center:r,duration:v.animationDuration})}fitToBounds(e){var t=Array.isArray(e)?f(e):(e=>{var t=[];w(e,t);var o=t.map(e=>e[0]),i=t.map(e=>e[1]);return f([Math.min(...o),Math.min(...i),Math.max(...o),Math.max(...i)])})(e);this.view.goTo(t,{duration:v.DELAY})}setPadding(e){this.view.padding=e}getCenter(){var e=this.view.center;return[e.x,e.y].map(e=>Math.round(100*e)/100)}getZoom(){return this.view.zoom}getBounds(){var{xmin:e,ymin:t,xmax:o,ymax:i}=this.view.extent;return[e,t,o,i].map(e=>Math.round(100*e)/100)}getFeaturesAtPoint(e,t){return function(e,t){return g.apply(this,arguments)}(this.view,e)}getAreaDimensions(){return(e=>{if(!(e&&e instanceof u))return"";var t=e.xmin,o=e.ymin,i=e.xmax,r=e.ymax-o,n=d(i-t),a=d(r);return"".concat(a," by ").concat(n)})(function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:y;if(!e.container)return null;var{width:o,height:i}=e.container.getBoundingClientRect(),r={x:t.left,y:i-t.bottom},n={x:o-t.right,y:t.top},a=e.toMap(r),s=e.toMap(n);return new u({xmin:a.x,ymin:a.y,xmax:s.x,ymax:s.y,spatialReference:a.spatialReference})}(this.view))}getCardinalMove(e,t){return function(e,t){var[o,i]=e,[r,n]=t,a=r-o,s=n-i,m=[];return Math.abs(s)>.1&&m.push("".concat(s>0?"north":"south"," ").concat(d(Math.abs(s)))),Math.abs(a)>.1&&m.push("".concat(a>0?"east":"west"," ").concat(d(Math.abs(a)))),m.join(", ")}(e,t)}getResolution(){return this.view.resolution}mapToScreen(e){var t=x(e),o=this.view.toScreen(t);return{x:o.x,y:o.y}}screenToMap(e){var t=this.view.toMap(e);return[t.x,t.y]}}export{b as default};