@defra/interactive-map 0.0.30-alpha → 0.0.31-alpha

package/plugins/interact/src/events.test.js

@@ -2,11 +2,10 @@ import { attachEvents } from './events.js'
 
 const MOCK_POINT = { x: 1, y: 2 }
 const MOCK_COORDS = [1, 2]
-const INTERACT_DONE = 'interact:done'
 
 const createParams = () => {
   const appState = { layoutRefs: { viewportRef: { current: document.body } }, disabledButtons: new Set() }
-  const pluginState = { dispatch: jest.fn(), selectionBounds: null, selectedFeatures: [], selectedMarkers: [], closeOnAction: true, multiSelect: false }
+  const pluginState = { dispatch: jest.fn(), selectionBounds: null, selectedFeatures: [], selectedMarkers: [], multiSelect: false }
   const clickReadyRef = { current: false }
   return {
     appState,
@@ -18,11 +17,10 @@ const createParams = () => {
       markers: { remove: jest.fn(), getMarker: jest.fn(() => null) },
       crossHair: { getDetail: jest.fn(() => ({ point: { x: 0, y: 0 }, coords: [0, 0] })) }
     },
-    buttonConfig: { selectDone: {}, selectAtTarget: {}, selectCancel: {} },
+    buttonConfig: { selectAtTarget: {} },
     events: { MAP_CLICK: 'map:click' },
     eventBus: { on: jest.fn(), off: jest.fn(), emit: jest.fn() },
-    handleInteraction: jest.fn(),
-    closeApp: jest.fn()
+    handleInteraction: jest.fn()
   }
 }
 
@@ -109,102 +107,6 @@ describe('attachEvents — click handling', () => {
   })
 })
 
-describe('attachEvents — button actions', () => {
-  let cleanup = null
-
-  beforeEach(() => { jest.useFakeTimers() })
-  afterEach(() => { cleanup?.(); jest.useRealTimers() })
-
-  it('selectDone emits correct payload and respects closeOnAction', () => {
-    const params = createParams()
-    cleanup = attachEvents(params)
-
-    params.mapState.markers.getMarker.mockReturnValue({ coords: MOCK_COORDS })
-    params.buttonConfig.selectDone.onClick()
-    expect(params.closeApp).toHaveBeenCalled()
-
-    params.closeApp.mockClear()
-    params.pluginState.closeOnAction = false
-    params.buttonConfig.selectDone.onClick()
-    expect(params.closeApp).not.toHaveBeenCalled()
-  })
-
-  it('selectDone emits selectedFeatures and selectionBounds when no marker', () => {
-    const params = createParams()
-    cleanup = attachEvents(params)
-
-    params.pluginState.selectedFeatures = [{ id: 'f1' }]
-    params.pluginState.selectionBounds = { sw: [0, 0], ne: [1, 1] }
-    params.buttonConfig.selectDone.onClick()
-
-    expect(params.eventBus.emit).toHaveBeenCalledWith(INTERACT_DONE, {
-      selectedFeatures: [{ id: 'f1' }],
-      selectionBounds: { sw: [0, 0], ne: [1, 1] }
-    })
-  })
-
-  it('selectDone includes selectedMarkers in payload when present', () => {
-    const params = createParams()
-    cleanup = attachEvents(params)
-
-    params.pluginState.selectedMarkers = ['m1', 'm2']
-    params.buttonConfig.selectDone.onClick()
-
-    expect(params.eventBus.emit).toHaveBeenCalledWith(INTERACT_DONE,
-      expect.objectContaining({ selectedMarkers: ['m1', 'm2'] })
-    )
-  })
-
-  it('selectDone omits selectedMarkers from payload when empty', () => {
-    const params = createParams()
-    cleanup = attachEvents(params)
-
-    params.buttonConfig.selectDone.onClick()
-
-    const payload = params.eventBus.emit.mock.calls.find(c => c[0] === INTERACT_DONE)[1]
-    expect(payload).not.toHaveProperty('selectedMarkers')
-  })
-
-  it('does not emit or closeApp if selectDone button is disabled', () => {
-    const params = createParams()
-    cleanup = attachEvents(params)
-
-    params.appState.disabledButtons.add('selectDone')
-    params.buttonConfig.selectDone.onClick()
-
-    expect(params.eventBus.emit).not.toHaveBeenCalled()
-    expect(params.closeApp).not.toHaveBeenCalled()
-  })
-
-  it('selectCancel emits cancel and respects closeOnAction', () => {
-    const params = createParams()
-    cleanup = attachEvents(params)
-
-    params.buttonConfig.selectCancel.onClick()
-    expect(params.closeApp).toHaveBeenCalled()
-
-    cleanup()
-    const params2 = createParams()
-    cleanup = attachEvents(params2)
-    params2.pluginState.closeOnAction = false
-    params2.buttonConfig.selectCancel.onClick()
-    expect(params2.closeApp).not.toHaveBeenCalled()
-  })
-
-  it('respects default closeOnAction when value is nullish', () => {
-    const params = createParams()
-    params.pluginState.closeOnAction = null
-    cleanup = attachEvents(params)
-
-    params.buttonConfig.selectDone.onClick()
-    expect(params.closeApp).toHaveBeenCalledTimes(1)
-
-    params.closeApp.mockClear()
-    params.buttonConfig.selectCancel.onClick()
-    expect(params.closeApp).toHaveBeenCalledTimes(1)
-  })
-})
-
 describe('attachEvents — programmatic selection', () => {
   let cleanup = null
 
@@ -232,7 +134,7 @@ describe('attachEvents — cleanup', () => {
     const params = createParams()
     const cleanup = attachEvents(params)
     cleanup()
-    Object.values(params.buttonConfig).forEach(btn => expect(btn.onClick).toBeNull())
+    expect(params.buttonConfig.selectAtTarget.onClick).toBeNull()
     jest.useRealTimers()
   })
 })

package/plugins/interact/src/hooks/useAttachEvents.js

@@ -2,7 +2,7 @@ import { useEffect, useRef } from 'react'
 import { EVENTS } from '../../../../src/config/events.js'
 import { attachEvents } from '../events.js'
 
-export function useAttachEvents ({ pluginState, appState, mapState, buttonConfig, eventBus, handleInteraction, closeApp }) {
+export function useAttachEvents ({ pluginState, appState, mapState, buttonConfig, eventBus, handleInteraction }) {
   // Refs updated synchronously each render — keeps callbacks fresh without re-attaching events
   const handleInteractionRef = useRef(handleInteraction)
   handleInteractionRef.current = handleInteraction
@@ -37,10 +37,9 @@ export function useAttachEvents ({ pluginState, appState, mapState, buttonConfig
       events: EVENTS,
       eventBus,
       handleInteraction: (event) => handleInteractionRef.current(event),
-      clickReadyRef,
-      closeApp
+      clickReadyRef
     })
 
     return cleanupEvents
-  }, [pluginState.enabled, buttonConfig, eventBus, closeApp])
+  }, [pluginState.enabled, buttonConfig, eventBus])
 }

package/plugins/interact/src/hooks/useAttachEvents.test.js

@@ -21,7 +21,6 @@ beforeEach(() => {
     mapState: { mapStyle: {} },
     buttonConfig: {},
     eventBus: { emit: jest.fn() },
-    closeApp: jest.fn(),
     handleInteraction: handleInteractionMock
   }
 })
@@ -36,8 +35,7 @@ describe('useAttachEvents', () => {
       mapState: props.mapState,
       buttonConfig: props.buttonConfig,
       events: EVENTS,
-      eventBus: props.eventBus,
-      closeApp: props.closeApp
+      eventBus: props.eventBus
     }))
 
     const { getAppState, getPluginState, handleInteraction } = attachEvents.mock.calls.at(-1)[0]

package/plugins/interact/src/hooks/useInteractionHandlers.js

@@ -166,6 +166,15 @@ const resolveContiguousDispatch = ({ featureId, feature, config, selectedFeature
   return true
 }
 
+const logDebugFeatures = (coords, features) => {
+  const [lng, lat] = coords
+  console.groupCollapsed(`[interact] click (${lng.toFixed(4)}, ${lat.toFixed(4)}) — ${features.length} feature${features.length !== 1 ? 's' : ''}`) // NOSONAR
+  features.forEach(f => { // NOSONAR
+    console.log({ layer: f.layer.id, type: f.layer.type, id: f.id ?? '—', sourceLayer: f.sourceLayer ?? '—', properties: f.properties }) // NOSONAR
+  })
+  console.groupEnd() // NOSONAR
+}
+
 /**
  * Core interaction hook. Processes map clicks in fixed priority order:
  * selectMarker → selectFeature → placeMarker (fallback).
@@ -185,7 +194,7 @@ const useHandleInteraction = ({ mapProvider, layers, interactionModes, multiSele
   return useCallback(({ point, coords }) => {
     const debugFeatures = debug ? getFeaturesAtPoint(mapProvider, point, { radius: tolerance }) : null
     if (debugFeatures) {
-      console.log(`--- Features at ${coords} ---`, debugFeatures) // NOSONAR
+      logDebugFeatures(coords, debugFeatures)
     }
     if (interactionModes.includes('selectMarker')) {
       const markerHit = findMarkerAtPoint(markers, point, scale)

package/plugins/interact/src/hooks/useInteractionHandlers.test.js

@@ -423,18 +423,37 @@ it('skips emission when selection remains empty after being cleared', () => {
 /* ------------------------------------------------------------------ */
 
 it('logs features when debug mode is enabled', () => {
+  const groupSpy = jest.spyOn(console, 'groupCollapsed').mockImplementation(() => {})
   const logSpy = jest.spyOn(console, 'log').mockImplementation(() => {})
+  const groupEndSpy = jest.spyOn(console, 'groupEnd').mockImplementation(() => {})
 
   const { result } = setup({ debug: true })
 
   click(result)
 
-  expect(logSpy).toHaveBeenCalledWith(
-    expect.stringContaining('--- Features at'),
-    expect.any(Array)
-  )
+  expect(groupSpy).toHaveBeenCalledWith(expect.stringContaining('[interact] click ('))
+  expect(groupSpy).toHaveBeenCalledWith(expect.stringContaining('1 feature'))
+  expect(logSpy).toHaveBeenCalledWith(expect.objectContaining({ layer: 'parcels' }))
+  expect(groupEndSpy).toHaveBeenCalled()
 
+  groupSpy.mockRestore()
   logSpy.mockRestore()
+  groupEndSpy.mockRestore()
+})
+
+it('uses plural label when multiple features are found', () => {
+  const groupSpy = jest.spyOn(console, 'groupCollapsed').mockImplementation(() => {})
+  jest.spyOn(console, 'log').mockImplementation(() => {})
+  jest.spyOn(console, 'groupEnd').mockImplementation(() => {})
+
+  featureQueries.getFeaturesAtPoint.mockReturnValue([baseFeature, baseFeature])
+
+  const { result } = setup({ debug: true })
+  click(result)
+
+  expect(groupSpy).toHaveBeenCalledWith(expect.stringContaining('2 features'))
+
+  jest.restoreAllMocks()
 })
 
 /* ------------------------------------------------------------------ */

package/plugins/interact/src/manifest.js

@@ -21,23 +21,6 @@ export const manifest = {
   },
 
   buttons: [{
-    id: 'selectCancel',
-    label: 'Back',
-    variant: 'tertiary',
-    hiddenWhen: ({ appConfig, appState, pluginState }) => !pluginState.enabled || !(['hybrid', 'buttonFirst'].includes(appConfig.behaviour) && appState.isFullscreen),
-    mobile: {
-      slot: 'actions',
-      showLabel: true
-    },
-    tablet: {
-      slot: 'actions',
-      showLabel: true
-    },
-    desktop: {
-      slot: 'actions',
-      showLabel: true
-    }
-  }, {
     id: 'selectAtTarget',
     label: 'Select',
     variant: 'primary',
@@ -54,24 +37,6 @@ export const manifest = {
     desktop: {
       slot: 'actions'
     }
-  }, {
-    id: 'selectDone',
-    label: 'Continue',
-    variant: 'primary',
-    excludeWhen: ({ appState, pluginState }) => !pluginState.enabled || !appState.isFullscreen,
-    enableWhen: ({ mapState, pluginState }) => !!mapState.markers.items.some(m => m.id === 'location') || !!pluginState.selectionBounds,
-    mobile: {
-      slot: 'actions',
-      showLabel: true
-    },
-    tablet: {
-      slot: 'actions',
-      showLabel: true
-    },
-    desktop: {
-      slot: 'actions',
-      showLabel: true
-    }
   }],
 
   keyboardShortcuts: [

package/plugins/interact/src/manifest.test.js

@@ -18,7 +18,9 @@ describe('manifest', () => {
 
   it('defines buttons with correct ids', () => {
     const ids = manifest.buttons.map(b => b.id)
-    expect(ids).toEqual(expect.arrayContaining(['selectDone', 'selectAtTarget', 'selectCancel']))
+    expect(ids).toEqual(expect.arrayContaining(['selectAtTarget']))
+    expect(ids).not.toContain('selectDone')
+    expect(ids).not.toContain('selectCancel')
   })
 
   it('buttons have slots and showLabel', () => {
@@ -33,54 +35,12 @@ describe('manifest', () => {
   })
 
   it('button logic functions cover all branches', () => {
-    const done = manifest.buttons.find(b => b.id === 'selectDone')
     const atTarget = manifest.buttons.find(b => b.id === 'selectAtTarget')
-    const cancel = manifest.buttons.find(b => b.id === 'selectCancel')
-
-    // selectDone.excludeWhen
-    expect(done.excludeWhen({ appState: { isFullscreen: false }, pluginState: { enabled: true } })).toBe(true)
-    expect(done.excludeWhen({ appState: { isFullscreen: true }, pluginState: { enabled: true } })).toBe(false)
-
-    // selectDone.enableWhen
-    expect(done.enableWhen({
-      mapState: { markers: { items: [{ id: 'location' }] } },
-      pluginState: { selectionBounds: null }
-    })).toBe(true)
-    expect(done.enableWhen({
-      mapState: { markers: { items: [] } },
-      pluginState: { selectionBounds: null }
-    })).toBe(false)
-    expect(done.enableWhen({
-      mapState: { markers: { items: [] } },
-      pluginState: { selectionBounds: { sw: [0, 0], ne: [1, 1] } }
-    })).toBe(true)
 
     // selectAtTarget.hiddenWhen
     expect(atTarget.hiddenWhen({ appState: { interfaceType: 'pointer' }, pluginState: { enabled: true } })).toBe(true)
     expect(atTarget.hiddenWhen({ appState: { interfaceType: 'touch' }, pluginState: { enabled: true } })).toBe(false)
     expect(atTarget.hiddenWhen({ appState: { interfaceType: 'touch' }, pluginState: { enabled: false } })).toBe(true)
-
-    // selectCancel.hiddenWhen
-    expect(cancel.hiddenWhen({
-      appConfig: { behaviour: 'always' },
-      appState: { isFullscreen: true },
-      pluginState: { enabled: true }
-    })).toBe(true)
-    expect(cancel.hiddenWhen({
-      appConfig: { behaviour: 'hybrid' },
-      appState: { isFullscreen: true },
-      pluginState: { enabled: true }
-    })).toBe(false)
-    expect(cancel.hiddenWhen({
-      appConfig: { behaviour: 'hybrid' },
-      appState: { isFullscreen: false },
-      pluginState: { enabled: true }
-    })).toBe(true)
-    expect(cancel.hiddenWhen({
-      appConfig: { behaviour: 'hybrid' },
-      appState: { isFullscreen: true },
-      pluginState: { enabled: false }
-    })).toBe(true)
   })
 
   it('keyboardShortcuts array exists', () => {

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

@@ -1 +1 @@
-import e from"@babel/runtime/helpers/defineProperty";import t from"@babel/runtime/helpers/asyncToGenerator";import r from"@arcgis/core/config.js";import n from"@arcgis/core/layers/support/TileInfo.js";import i from"@arcgis/core/Map.js";import o from"@arcgis/core/views/MapView.js";import a from"@arcgis/core/layers/VectorTileLayer.js";import s from"@arcgis/core/geometry/Point.js";import{when as m,once as l,watch as u}from"@arcgis/core/core/reactiveUtils.js";import c from"@arcgis/core/geometry/Extent.js";var p={animationDuration:200},v=["showKeyboardHelp","selectControl","moveLarge","nudgeMap","zoomLarge","nudgeZoom"];var y=(e,t)=>{var r=null,n=function(){for(var n=arguments.length,i=new Array(n),o=0;o<n;o++)i[o]=arguments[o];clearTimeout(r),r=setTimeout(()=>{e(...i)},t)};return n.cancel=()=>{r&&(clearTimeout(r),r=null)},n};function h(e){var{mapProvider:t,view:r,baseTileLayer:n,events:i,eventBus:o,getZoom:a,getCenter:s,getBounds:c,getResolution:p}=e,v=!1,h=[],d=[],f=e=>{var t=(()=>{if(v||!r||r.destroyed||!r.extent)return null;var{maxZoom:e,minZoom:t}=r.constraints;return{center:s(),bounds:c(),resolution:p(),zoom:a(),isAtMaxZoom:r.zoom+.01>=e,isAtMinZoom:r.zoom-.01<=t}})();t&&o.emit(e,t)};m(()=>n.loaded&&r.resolution>0,()=>f(i.MAP_LOADED)),l(()=>r.ready).then(()=>{v||o.emit(i.MAP_READY,{map:t.map,view:t.view,mapStyleId:t.mapStyleId,mapSize:t.mapSize,crs:t.crs})}),l(()=>r.stationary).then(()=>f(i.MAP_FIRST_IDLE));var g=y(()=>f(i.MAP_MOVE_END),500);d.push(g),h.push(u(()=>[r.interacting,r.animation],e=>{var[t,r]=e;(t||r)&&o.emit(i.MAP_MOVE_START),t||r||g()}));var w,x,b,M=(w=()=>f(i.MAP_MOVE),x=10,b=0,function(){var e=Date.now();e-b>=x&&(b=e,w(...arguments))});d.push(M),h.push(u(()=>r.zoom,M)),h.push(u(()=>r.extent,()=>o.emit(i.MAP_RENDER),{initial:!1}));var E=y(()=>f(i.MAP_DATA_CHANGE),500);d.push(E),h.push(u(()=>r.updating,e=>!e&&E()));var A=null,T=null;return h.push(r.on("pointer-down",e=>{A=e.x,T=e.y})),h.push(r.on("pointer-up",e=>{var n;if(0===e.button&&!(Math.hypot(e.x-A,e.y-T)>6)&&"active"!==(null===(n=t.sketchViewModel)||void 0===n?void 0:n.state)){var a={x:e.x,y:e.y},s=r.toMap(a);s&&o.emit(i.MAP_CLICK,{point:a,coords:[s.x,s.y]})}})),{remove(){v=!0,d.forEach(e=>e.cancel()),h.forEach(e=>e.remove())}}}var d=e=>e?new c({xmin:e[0],ymin:e[1],xmax:e[2],ymax:e[3],spatialReference:{wkid:27700}}):void 0,f=e=>e?new s({x:e[0],y:e[1],spatialReference:{wkid:27700}}):void 0,g=(e,t)=>{if(e)if("FeatureCollection"===e.type)e.features.forEach(e=>g(e,t));else if("Feature"===e.type)g(e.geometry,t);else if("GeometryCollection"===e.type)e.geometries.forEach(e=>g(e,t));else{var r=e=>{Array.isArray(e)&&("number"==typeof e[0]?t.push(e):e.forEach(r))};r(e.coordinates)}},w=e=>{var t=[];g(e,t);var r=t.map(e=>e[0]),n=t.map(e=>e[1]);return d([Math.min(...r),Math.min(...n),Math.max(...r),Math.max(...n)])},x=e=>{var t=1609.344,r=e/t;if(r<.5/t)return"".concat(Math.round(e),"m");if(r<10){var n=Number.parseFloat(r.toFixed(1)),i=1===n?"mile":"miles";return"".concat(n," ").concat(i)}var o=Math.round(r),a=1===o?"mile":"miles";return"".concat(o," ").concat(a)};var b={top:0,right:0,bottom:0,left:0};function M(){return(M=t(function*(e,t){if(!e||!t)return[];var r=e.map.layers.filter(e=>e instanceof a);return r.length?(yield e.hitTest(t,{include:r.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)}function E(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),r.push.apply(r,n)}return r}function A(t){for(var r=1;r<arguments.length;r++){var n=null!=arguments[r]?arguments[r]:{};r%2?E(Object(n),!0).forEach(function(r){e(t,r,n[r])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):E(Object(n)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))})}return t}class T{constructor(e){var{mapProviderConfig:t={},events:r,eventBus:n}=e;this.events=r,this.eventBus=n,this.capabilities={supportedShortcuts:v,supportsMapSizes:!1},Object.assign(this,t),this.mapEventHandles=[],this.appEventHandles=[]}initMap(e){var s=this;return t(function*(){var{container:t,padding:m,mapStyle:l,mapSize:u,maxExtent:c}=e;s.mapStyleId=null==l?void 0:l.id,s.mapSize=u;var{events:p,eventBus:v}=s;s.setupConfig&&(yield s.setupConfig(r));var y=new a({id:"baselayer",url:l.url,visible:!0}),g=new i({layers:[y]}),w=c?d(c):null,x=new o({spatialReference:27700,container:t,map:g,zoom:e.zoom,center:f(e.center),maxExtent:c,constraints:{lods:n.create({spatialReference:{wkid:27700}}).lods,snapToZoom:!1,minZoom:e.minZoom,maxZoom:e.maxZoom,maxScale:0,geometry:w,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"}})(x.container),x.padding=m,e.bounds&&x.when(()=>x.goTo(d(e.bounds),{duration:0})),s.mapEventHandles=h({mapProvider:s,view:x,baseTileLayer:y,events:p,eventBus:v,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:r,eventBus:n}=e,i=e=>{t.loadStyle(e.url).then(()=>{n.emit(r.MAP_STYLE_CHANGE,{mapStyleId:e.id})})};return n.on(r.MAP_SET_STYLE,i),{remove(){n.off(r.MAP_SET_STYLE,i)}}}({baseTileLayer:y,events:p,eventBus:v})||[],s.map=g,s.view=x,s.baseTileLayer=y})()}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:r,zoom:n}=e;null===(t=this.view.animation)||void 0===t||t.destroy();var i={center:r?new s({x:r[0],y:r[1],spatialReference:{wkid:27700}}):this.view.center,zoom:null!=n?n:this.view.zoom};this.view.goTo(A(A({},i),{},{duration:p.animationDuration}))}zoomIn(e){var t;null===(t=this.view.animation)||void 0===t||t.destroy(),this.view.goTo({zoom:this.view.zoom+e,duration:p.animationDuration})}zoomOut(e){var t;null===(t=this.view.animation)||void 0===t||t.destroy(),this.view.goTo({zoom:this.view.zoom-e,duration:p.animationDuration})}panBy(e){var{x:t,y:r}=this.view.toScreen(this.view.center),n={x:t+e[0],y:r+e[1]},i=this.view.toMap(n);this.view.goTo({center:i,duration:p.animationDuration})}fitToBounds(e){var t=Array.isArray(e)?d(e):w(e);this.view.goTo(t,{duration:p.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:r,ymax:n}=this.view.extent;return[e,t,r,n].map(e=>Math.round(100*e)/100)}getFeaturesAtPoint(e,t){return function(e,t){return M.apply(this,arguments)}(this.view,e)}getVisibleFeatures(e){return[]}getAreaDimensions(){return(e=>{if(!(e&&e instanceof c))return"";var t=e.xmin,r=e.ymin,n=e.xmax,i=e.ymax-r,o=x(n-t),a=x(i);return"".concat(a," by ").concat(o)})(function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:b;if(!e.container)return null;var{width:r,height:n}=e.container.getBoundingClientRect(),i={x:t.left,y:n-t.bottom},o={x:r-t.right,y:t.top},a=e.toMap(i),s=e.toMap(o);return new c({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[r,n]=e,[i,o]=t,a=i-r,s=o-n,m=[];return Math.abs(s)>.1&&m.push("".concat(s>0?"north":"south"," ").concat(x(Math.abs(s)))),Math.abs(a)>.1&&m.push("".concat(a>0?"east":"west"," ").concat(x(Math.abs(a)))),m.join(", ")}(e,t)}getResolution(){return this.view.resolution}mapToScreen(e){var t=f(e),r=this.view.toScreen(t);return{x:r.x,y:r.y}}screenToMap(e){var t=this.view.toMap(e);return[t.x,t.y]}isGeometryObscured(e,t){return((e,t,r)=>{if(null==r||!r.container)return!1;var n=r.container.getBoundingClientRect(),i=w(e),o=[r.toScreen(new s({x:i.xmin,y:i.ymin,spatialReference:i.spatialReference})),r.toScreen(new s({x:i.xmin,y:i.ymax,spatialReference:i.spatialReference})),r.toScreen(new s({x:i.xmax,y:i.ymin,spatialReference:i.spatialReference})),r.toScreen(new s({x:i.xmax,y:i.ymax,spatialReference:i.spatialReference}))],a=Math.min(...o.map(e=>e.x)),m=Math.max(...o.map(e=>e.x)),l=Math.min(...o.map(e=>e.y)),u=Math.max(...o.map(e=>e.y)),c=t.left-n.left,p=t.top-n.top,v=t.right-n.left,y=t.bottom-n.top;return a<v&&m>c&&l<y&&u>p})(e,t,this.view)}}export{T as default};
+import e from"@babel/runtime/helpers/defineProperty";import t from"@babel/runtime/helpers/asyncToGenerator";import r from"@arcgis/core/config.js";import n from"@arcgis/core/layers/support/TileInfo.js";import i from"@arcgis/core/Map.js";import o from"@arcgis/core/views/MapView.js";import a from"@arcgis/core/layers/VectorTileLayer.js";import s from"@arcgis/core/geometry/Point.js";import{when as m,once as l,watch as u}from"@arcgis/core/core/reactiveUtils.js";import c from"@arcgis/core/geometry/Extent.js";var p={animationDuration:200},v=["showKeyboardHelp","selectControl","moveLarge","nudgeMap","zoomLarge","nudgeZoom"];var y=(e,t)=>{var r=null,n=function(){for(var n=arguments.length,i=new Array(n),o=0;o<n;o++)i[o]=arguments[o];clearTimeout(r),r=setTimeout(()=>{e(...i)},t)};return n.cancel=()=>{r&&(clearTimeout(r),r=null)},n};function h(e){var{mapProvider:t,view:r,baseTileLayer:n,events:i,eventBus:o,getZoom:a,getCenter:s,getBounds:c,getResolution:p}=e,v=!1,h=[],d=[],f=e=>{var t=(()=>{if(v||!r||r.destroyed||!r.extent)return null;var{maxZoom:e,minZoom:t}=r.constraints;return{center:s(),bounds:c(),resolution:p(),zoom:a(),isAtMaxZoom:r.zoom+.01>=e,isAtMinZoom:r.zoom-.01<=t}})();t&&o.emit(e,t)};m(()=>n.loaded&&r.resolution>0,()=>f(i.MAP_LOADED)),l(()=>r.ready).then(()=>{v||o.emit(i.MAP_READY,{map:t.map,view:t.view,mapStyleId:t.mapStyleId,mapSize:t.mapSize,crs:t.crs})}),l(()=>r.stationary).then(()=>f(i.MAP_FIRST_IDLE));var g=y(()=>f(i.MAP_MOVE_END),500);d.push(g),h.push(u(()=>[r.interacting,r.animation],e=>{var[t,r]=e;(t||r)&&o.emit(i.MAP_MOVE_START),t||r||g()}));var w,x,b,M=(w=()=>f(i.MAP_MOVE),x=10,b=0,function(){var e=Date.now();e-b>=x&&(b=e,w(...arguments))});d.push(M),h.push(u(()=>r.zoom,M)),h.push(u(()=>r.extent,()=>o.emit(i.MAP_RENDER),{initial:!1}));var E=y(()=>f(i.MAP_DATA_CHANGE),500);d.push(E),h.push(u(()=>r.updating,e=>!e&&E()));var A=null,T=null;return h.push(r.on("pointer-down",e=>{A=e.x,T=e.y})),h.push(r.on("pointer-up",e=>{var n;if(0===e.button&&!(Math.hypot(e.x-A,e.y-T)>6)&&"active"!==(null===(n=t.sketchViewModel)||void 0===n?void 0:n.state)){var a={x:e.x,y:e.y},s=r.toMap(a);s&&o.emit(i.MAP_CLICK,{point:a,coords:[s.x,s.y]})}})),{remove(){v=!0,d.forEach(e=>e.cancel()),h.forEach(e=>e.remove())}}}var d=e=>e?new c({xmin:e[0],ymin:e[1],xmax:e[2],ymax:e[3],spatialReference:{wkid:27700}}):void 0,f=e=>e?new s({x:e[0],y:e[1],spatialReference:{wkid:27700}}):void 0,g=(e,t)=>{if(e)if("FeatureCollection"===e.type)e.features.forEach(e=>g(e,t));else if("Feature"===e.type)g(e.geometry,t);else if("GeometryCollection"===e.type)e.geometries.forEach(e=>g(e,t));else{var r=e=>{Array.isArray(e)&&("number"==typeof e[0]?t.push(e):e.forEach(r))};r(e.coordinates)}},w=e=>{var t=[];g(e,t);var r=t.map(e=>e[0]),n=t.map(e=>e[1]);return d([Math.min(...r),Math.min(...n),Math.max(...r),Math.max(...n)])},x=e=>{var t=1609.344,r=e/t;if(r<.5/t)return"".concat(Math.round(e),"m");if(r<10){var n=Number.parseFloat(r.toFixed(1)),i=1===n?"mile":"miles";return"".concat(n," ").concat(i)}var o=Math.round(r),a=1===o?"mile":"miles";return"".concat(o," ").concat(a)};var b={top:0,right:0,bottom:0,left:0};function M(){return(M=t(function*(e,t){if(!e||!t)return[];var r=e.map.layers.filter(e=>e instanceof a);return r.length?(yield e.hitTest(t,{include:r.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)}function E(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),r.push.apply(r,n)}return r}function A(t){for(var r=1;r<arguments.length;r++){var n=null!=arguments[r]?arguments[r]:{};r%2?E(Object(n),!0).forEach(function(r){e(t,r,n[r])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):E(Object(n)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))})}return t}class T{constructor(e){var{mapProviderConfig:t={},events:r,eventBus:n}=e;this.events=r,this.eventBus=n,this.capabilities={supportedShortcuts:v,supportsMapSizes:!1},Object.assign(this,t),this.mapEventHandles=[],this.appEventHandles=[]}get name(){return"EsriProvider"}initMap(e){var s=this;return t(function*(){var{container:t,padding:m,mapStyle:l,mapSize:u,maxExtent:c}=e;s.mapStyleId=null==l?void 0:l.id,s.mapSize=u;var{events:p,eventBus:v}=s;s.setupConfig&&(yield s.setupConfig(r));var y=new a({id:"baselayer",url:l.url,visible:!0}),g=new i({layers:[y]}),w=c?d(c):null,x=new o({spatialReference:27700,container:t,map:g,zoom:e.zoom,center:f(e.center),maxExtent:c,constraints:{lods:n.create({spatialReference:{wkid:27700}}).lods,snapToZoom:!1,minZoom:e.minZoom,maxZoom:e.maxZoom,maxScale:0,geometry:w,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"}})(x.container),x.padding=m,e.bounds&&x.when(()=>x.goTo(d(e.bounds),{duration:0})),s.mapEventHandles=h({mapProvider:s,view:x,baseTileLayer:y,events:p,eventBus:v,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:r,eventBus:n}=e,i=e=>{t.loadStyle(e.url).then(()=>{n.emit(r.MAP_STYLE_CHANGE,{mapStyleId:e.id})})};return n.on(r.MAP_SET_STYLE,i),{remove(){n.off(r.MAP_SET_STYLE,i)}}}({baseTileLayer:y,events:p,eventBus:v})||[],s.map=g,s.view=x,s.baseTileLayer=y})()}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:r,zoom:n}=e;null===(t=this.view.animation)||void 0===t||t.destroy();var i={center:r?new s({x:r[0],y:r[1],spatialReference:{wkid:27700}}):this.view.center,zoom:null!=n?n:this.view.zoom};this.view.goTo(A(A({},i),{},{duration:p.animationDuration}))}zoomIn(e){var t;null===(t=this.view.animation)||void 0===t||t.destroy(),this.view.goTo({zoom:this.view.zoom+e,duration:p.animationDuration})}zoomOut(e){var t;null===(t=this.view.animation)||void 0===t||t.destroy(),this.view.goTo({zoom:this.view.zoom-e,duration:p.animationDuration})}panBy(e){var{x:t,y:r}=this.view.toScreen(this.view.center),n={x:t+e[0],y:r+e[1]},i=this.view.toMap(n);this.view.goTo({center:i,duration:p.animationDuration})}fitToBounds(e){var t=Array.isArray(e)?d(e):w(e);this.view.goTo(t,{duration:p.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:r,ymax:n}=this.view.extent;return[e,t,r,n].map(e=>Math.round(100*e)/100)}getFeaturesAtPoint(e,t){return function(e,t){return M.apply(this,arguments)}(this.view,e)}getVisibleFeatures(e){return[]}getAreaDimensions(){return(e=>{if(!(e&&e instanceof c))return"";var t=e.xmin,r=e.ymin,n=e.xmax,i=e.ymax-r,o=x(n-t),a=x(i);return"".concat(a," by ").concat(o)})(function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:b;if(!e.container)return null;var{width:r,height:n}=e.container.getBoundingClientRect(),i={x:t.left,y:n-t.bottom},o={x:r-t.right,y:t.top},a=e.toMap(i),s=e.toMap(o);return new c({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[r,n]=e,[i,o]=t,a=i-r,s=o-n,m=[];return Math.abs(s)>.1&&m.push("".concat(s>0?"north":"south"," ").concat(x(Math.abs(s)))),Math.abs(a)>.1&&m.push("".concat(a>0?"east":"west"," ").concat(x(Math.abs(a)))),m.join(", ")}(e,t)}getResolution(){return this.view.resolution}mapToScreen(e){var t=f(e),r=this.view.toScreen(t);return{x:r.x,y:r.y}}screenToMap(e){var t=this.view.toMap(e);return[t.x,t.y]}isGeometryObscured(e,t){return((e,t,r)=>{if(null==r||!r.container)return!1;var n=r.container.getBoundingClientRect(),i=w(e),o=[r.toScreen(new s({x:i.xmin,y:i.ymin,spatialReference:i.spatialReference})),r.toScreen(new s({x:i.xmin,y:i.ymax,spatialReference:i.spatialReference})),r.toScreen(new s({x:i.xmax,y:i.ymin,spatialReference:i.spatialReference})),r.toScreen(new s({x:i.xmax,y:i.ymax,spatialReference:i.spatialReference}))],a=Math.min(...o.map(e=>e.x)),m=Math.max(...o.map(e=>e.x)),l=Math.min(...o.map(e=>e.y)),u=Math.max(...o.map(e=>e.y)),c=t.left-n.left,p=t.top-n.top,v=t.right-n.left,y=t.bottom-n.top;return a<v&&m>c&&l<y&&u>p})(e,t,this.view)}}export{T as default};

package/providers/beta/esri/src/esriProvider.js

@@ -29,6 +29,10 @@ export default class EsriProvider {
     this.appEventHandles = []
   }
 
+  get name () {
+    return 'EsriProvider'
+  }
+
   async initMap (config) {
     const { container, padding, mapStyle, mapSize, maxExtent } = config
     this.mapStyleId = mapStyle?.id