@defra/interactive-map 0.0.22-alpha → 0.0.24-alpha

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

@@ -19,7 +19,7 @@ export const createInputHandlers = ({ dispatch, debouncedFetchSuggestions }) =>
 
     if (value.length < DEFAULTS.minSearchLength) {
       debouncedFetchSuggestions.cancel()
-      dispatch({ type: 'UPDATE_SUGGESTIONS', payload: [] })
+      dispatch({ type: 'UPDATE_SUGGESTIONS', payload: { results: [], hasError: false } })
       dispatch({ type: 'HIDE_SUGGESTIONS' })
       return
     }

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

@@ -72,7 +72,7 @@ describe('createInputHandlers', () => {
 
     expect(dispatch).toHaveBeenCalledWith({
       type: 'UPDATE_SUGGESTIONS',
-      payload: []
+      payload: { results: [], hasError: false }
     })
 
     expect(dispatch).toHaveBeenCalledWith({

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

@@ -1,6 +1,6 @@
 import { updateMap } from '../utils/updateMap.js'
 
-export const createSuggestionHandlers = ({ dispatch, services, mapProvider, markers, showMarker, markerOptions }) => {
+export const createSuggestionHandlers = ({ dispatch, services, mapProvider, markers, showMarker, markerOptions, viewportRef }) => {
   const selectionMessage = (suggestions, index) =>
     index >= 0
       ? `${suggestions[index]?.text}. ${index + 1} of ${suggestions.length} is highlighted`
@@ -17,6 +17,7 @@ export const createSuggestionHandlers = ({ dispatch, services, mapProvider, mark
         services.eventBus.emit('search:close')
       }
 
+      viewportRef.current?.focus()
       updateMap({ mapProvider, bounds: suggestion.bounds, point: suggestion.point, markers, showMarker, markerOptions })
       services.eventBus.emit('search:match', { query: suggestion.text, ...suggestion })
     },

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

@@ -9,6 +9,7 @@ jest.mock('../utils/updateMap.js')
 describe('createSuggestionHandlers', () => {
   let dispatch
   let services
+  let viewportRef
   let handlers
 
   beforeEach(() => {
@@ -19,13 +20,16 @@ describe('createSuggestionHandlers', () => {
       announce: jest.fn()
     }
 
+    viewportRef = { current: { focus: jest.fn() } }
+
     handlers = createSuggestionHandlers({
       dispatch,
       services,
       mapProvider: 'map',
       markers: 'markers',
       showMarker: true,
-      markerOptions: { backgroundColor: 'blue' }
+      markerOptions: { backgroundColor: 'blue' },
+      viewportRef
     })
 
     jest.clearAllMocks()
@@ -41,6 +45,7 @@ describe('createSuggestionHandlers', () => {
     expect(dispatch).toHaveBeenCalledWith({ type: 'SET_VALUE', payload: 'Paris' })
     expect(dispatch).toHaveBeenCalledWith({ type: 'HIDE_SUGGESTIONS' })
     expect(dispatch).toHaveBeenCalledWith({ type: 'SET_SELECTED', payload: -1 })
+    expect(viewportRef.current.focus).toHaveBeenCalled()
     expect(updateMap).toHaveBeenCalledWith(expect.objectContaining({ bounds: 'b', point: 'p' }))
     expect(services.eventBus.emit).toHaveBeenCalledWith(
       'search:match',
@@ -55,6 +60,7 @@ describe('createSuggestionHandlers', () => {
 
     expect(dispatch).toHaveBeenCalledWith({ type: 'TOGGLE_EXPANDED', payload: false })
     expect(services.eventBus.emit).toHaveBeenCalledWith('search:close')
+    expect(viewportRef.current.focus).toHaveBeenCalled()
   })
 
   // ---------- ArrowDown ----------

package/plugins/search/src/index.js

@@ -1,16 +1,12 @@
 // /plugins/search/index.js
 import './search.scss'
+import { DEFAULTS } from './defaults.js'
 
 export default function createPlugin (options = {}) {
-  // If search is open then we need to overirde the mobile slot
-  if (options.expanded) {
-    options.manifest = { controls: [{ id: 'search', mobile: { slot: 'banner' } }] }
-  }
-
   return {
-    showMarker: true,
-    placeholder: 'Search',
+    ...DEFAULTS,
     ...options,
+    ...(options.expanded && { manifest: { controls: [{ id: 'search', mobile: { slot: 'banner' } }] } }),
     id: 'search',
     load: async () => {
       const module = (await import(/* webpackChunkName: "im-search-plugin" */ './manifest.js')).manifest

package/plugins/search/src/reducer.js

@@ -5,6 +5,7 @@ const initialState = {
   suggestions: [],
   areSuggestionsVisible: false,
   hasFetchedSuggestions: false,
+  hasSearchError: false,
   selectedIndex: -1
 }
 
@@ -13,7 +14,8 @@ const toggleExpanded = (state, payload) => {
     ...state,
     isExpanded: payload,
     areSuggestionsVisible: payload,
-    hasFetchedSuggestions: false
+    hasFetchedSuggestions: false,
+    hasSearchError: false
   }
 }
 
@@ -44,8 +46,9 @@ const setValue = (state, payload) => {
 const updateSuggestions = (state, payload) => {
   return {
     ...state,
-    suggestions: payload,
-    hasFetchedSuggestions: true
+    suggestions: payload.results,
+    hasFetchedSuggestions: true,
+    hasSearchError: payload.hasError
   }
 }
 
@@ -53,7 +56,8 @@ const showSuggestions = (state) => {
   return {
     ...state,
     areSuggestionsVisible: true,
-    hasFetchedSuggestions: false
+    hasFetchedSuggestions: false,
+    hasSearchError: false
   }
 }
 
@@ -61,7 +65,8 @@ const hideSuggestions = (state) => {
   return {
     ...state,
     areSuggestionsVisible: false,
-    hasFetchedSuggestions: false
+    hasFetchedSuggestions: false,
+    hasSearchError: false
   }
 }
 

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

@@ -52,9 +52,10 @@ describe('search state actions', () => {
   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)
+    const newState = actions.UPDATE_SUGGESTIONS(state, { results: suggestions, hasError: false })
     expect(newState.suggestions).toEqual(suggestions)
     expect(newState.hasFetchedSuggestions).toBe(true)
+    expect(newState.hasSearchError).toBe(false)
   })
 
   it('SHOW_SUGGESTIONS sets areSuggestionsVisible to true and resets hasFetchedSuggestions', () => {

package/plugins/search/src/search.scss

@@ -2,6 +2,7 @@
 
 // Components, using 'CSS in Component' pattern
 @use './components/Form/Form.module';
+@use './components/OpenButton/OpenButton.module';
 @use './components/CloseButton/CloseButton.module';
 @use './components/SubmitButton/SubmitButton.module';
 @use './components/Suggestions/Suggestions.module';

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

@@ -2,7 +2,7 @@
 import OsGridRef from 'geodesy/osgridref.js'
 
 const POINT_BUFFER = 500
-const MAX_RESULTS = 8
+const DEFAULT_MAX_RESULTS = 8
 
 const isPostcode = (value) => {
   value = value.replace(/\s/g, '')
@@ -100,7 +100,7 @@ const label = (query, { NAME1, COUNTY_UNITARY, DISTRICT_BOROUGH, POSTCODE_DISTRI
   }
 }
 
-const parseOsNamesResults = (json, query, regions, crs) => {
+const parseOsNamesResults = (json, query, regions, crs, maxSuggestions = DEFAULT_MAX_RESULTS) => {
   if (!json || json.error || json.header?.totalresults === 0) {
     return []
   }
@@ -108,7 +108,7 @@ const parseOsNamesResults = (json, query, regions, crs) => {
   results = removeTenuousResults(results, query)
   results = removeDuplicates(results)
   results = removeRegions(results, regions)
-  results = results.slice(0, MAX_RESULTS)
+  results = results.slice(0, maxSuggestions)
 
   return results.map(l => ({
     id: l.GAZETTEER_ENTRY.ID,

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 o from"@arcgis/core/Map.js";import i 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,o=new Array(n),i=0;i<n;i++)o[i]=arguments[i];clearTimeout(r),r=setTimeout(()=>{e(...o)},t)};return n.cancel=()=>{r&&(clearTimeout(r),r=null)},n};function h(e){var{mapProvider:t,view:r,baseTileLayer:n,events:o,eventBus:i,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&&i.emit(e,t)};m(()=>n.loaded&&r.resolution>0,()=>f(o.MAP_LOADED)),l(()=>r.ready).then(()=>{v||i.emit(o.MAP_READY,{map:t.map,view:t.view,mapStyleId:t.mapStyleId,mapSize:t.mapSize,crs:t.crs})}),l(()=>r.stationary).then(()=>f(o.MAP_FIRST_IDLE));var g=y(()=>f(o.MAP_MOVE_END),500);d.push(g),h.push(u(()=>[r.interacting,r.animation],e=>{var[t,r]=e;(t||r)&&i.emit(o.MAP_MOVE_START),t||r||g()}));var w,x,b,M=(w=()=>f(o.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,()=>i.emit(o.MAP_RENDER),{initial:!1}));var E=y(()=>f(o.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&&i.emit(o.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)),o=1===n?"mile":"miles";return"".concat(n," ").concat(o)}var i=Math.round(r),a=1===i?"mile":"miles";return"".concat(i," ").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 o({layers:[y]}),w=c?d(c):null,x=new i({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,o=e=>{t.loadStyle(e.url).then(()=>{n.emit(r.MAP_STYLE_CHANGE,{mapStyleId:e.id})})};return n.on(r.MAP_SET_STYLE,o),{remove(){n.off(r.MAP_SET_STYLE,o)}}}({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 o={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({},o),{},{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]},o=this.view.toMap(n);this.view.goTo({center:o,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)}getAreaDimensions(){return(e=>{if(!(e&&e instanceof c))return"";var t=e.xmin,r=e.ymin,n=e.xmax,o=e.ymax-r,i=x(n-t),a=x(o);return"".concat(a," by ").concat(i)})(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(),o={x:t.left,y:n-t.bottom},i={x:r-t.right,y:t.top},a=e.toMap(o),s=e.toMap(i);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,[o,i]=t,a=o-r,s=i-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(),o=w(e),i=[r.toScreen(new s({x:o.xmin,y:o.ymin,spatialReference:o.spatialReference})),r.toScreen(new s({x:o.xmin,y:o.ymax,spatialReference:o.spatialReference})),r.toScreen(new s({x:o.xmax,y:o.ymin,spatialReference:o.spatialReference})),r.toScreen(new s({x:o.xmax,y:o.ymax,spatialReference:o.spatialReference}))],a=Math.min(...i.map(e=>e.x)),m=Math.max(...i.map(e=>e.x)),l=Math.min(...i.map(e=>e.y)),u=Math.max(...i.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=[]}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

@@ -182,6 +182,10 @@ export default class EsriProvider {
     return queryVectorTileFeatures(this.view, point)
   }
 
+  getVisibleFeatures (_layerIds) {
+    return []
+  }
+
   // ==========================
   // Spatial helpers
   // ==========================

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

@@ -0,0 +1 @@
+import e from"@babel/runtime/helpers/asyncToGenerator";import t from"ol/Map.js";import o from"ol/View.js";import r from"ol/layer/Tile.js";import{defaults as n}from"ol/interaction/defaults.js";import i from"proj4";import{register as a}from"ol/proj/proj4.js";import s from"ol/source/XYZ.js";import l from"ol/tilegrid/TileGrid.js";import u from"ol/TileState.js";import{transformExtent as m}from"ol/proj.js";var p=[896,448,224,112,56,28,14,7,3.5,1.75,.875,.4375,.21875,.109375],c=[156543.03392800014,78271.51696400007,39135.758482000034,19567.879241000017,9783.939620500008,4891.969810250004,2445.984905125002,1222.992452562501,611.4962262812505,305.74811314062526,152.87405657031263,76.43702828515632,38.21851414257816,19.10925707128908,9.55462853564454,4.77731426782227,2.388657133911135,1.1943285669555674,.5971642834777837,.29858214173889186,.14929107086944593,.07464553543472296,.03732276771736148,.01866138385868074],v=[-238375,1376256],d=300,g=2,h=["showKeyboardHelp","selectControl","moveLarge","nudgeMap","zoomLarge","nudgeZoom"],f="uk",M="world";var w=(e,t)=>{var o=null,r=function(){for(var r=arguments.length,n=new Array(r),i=0;i<r;i++)n[i]=arguments[i];clearTimeout(o),o=setTimeout(()=>{e(...n)},t)};return r.cancel=()=>{o&&(clearTimeout(o),o=null)},r};function y(e){var{map:t,view:o,emit:r,eventBus:n,events:i,on:a,debouncers:s}=e,l=!1,u=w(()=>{l=!1,r(i.MAP_MOVE_END)},500);s.push(u);var m,p,c,v=(m=()=>r(i.MAP_MOVE),p=10,c=0,function(){var e=Date.now();e-c>=p&&(c=e,m(...arguments))});a(o,"change",()=>{l||(l=!0,n.emit(i.MAP_MOVE_START)),u()}),a(t,"postrender",()=>{l&&v()})}function b(e){var{map:t,source:o,events:r,eventBus:n,getZoom:i,getCenter:a,getBounds:s,getResolution:l}=e,u=!1,m=[],p=[],c=t.getView(),v=c.getMinZoom(),d=c.getMaxZoom(),g=e=>{var t=(()=>{if(u)return null;var e=i();return{center:a(),bounds:s(),resolution:l(),zoom:e,isAtMaxZoom:e+.01>=d,isAtMinZoom:e-.01<=v}})();t&&n.emit(e,t)},h=(e,t,o)=>{e.on(t,o),m.push([e,t,o])};!function(e){var{source:t,map:o,emit:r,eventBus:n,events:i,on:a}=e,s=!1;a(t,"tileloadend",()=>{s||(s=!0,n.emit(i.MAP_LOADED))}),o.once("rendercomplete",()=>r(i.MAP_FIRST_IDLE))}({source:o,map:t,emit:g,eventBus:n,events:r,on:h}),y({map:t,view:t.getView(),emit:g,eventBus:n,events:r,on:h,debouncers:p}),function(e){var{map:t,eventBus:o,events:r,on:n}=e,i=null;n(t,"pointerdown",e=>{i=e.pixel}),n(t,"click",e=>{if(i){var t=e.pixel[0]-i[0],n=e.pixel[1]-i[1];if(Math.hypot(t,n)>6)return}o.emit(r.MAP_CLICK,{point:{x:e.pixel[0],y:e.pixel[1]},coords:e.coordinate})})}({map:t,eventBus:n,events:r,on:h}),h(t,"postrender",()=>n.emit(r.MAP_RENDER));var f=w(()=>g(r.MAP_DATA_CHANGE),500);return p.push(f),h(o,"tileloadend",f),{remove(){u=!0,p.forEach(e=>e.cancel()),m.forEach(e=>{var[t,o,r]=e;return t.un(o,r)})}}}var S=e=>(t,o)=>{var r=e(o,"Tile")||{},n=r.url||o,i=r.headers||{};fetch(n,{headers:i}).then(e=>e.blob()).then(e=>{t.getImage().src=URL.createObjectURL(e)}).catch(()=>t.setState(u.ERROR))};function x(e,t){var o=new l({resolutions:p,origin:v,tileSize:256});return new s({projection:"EPSG:27700",tileGrid:o,tileUrlFunction:t=>{var[o,r,n]=t;return e.replace("{z}",o).replace("{x}",r).replace("{y}",n)},tileLoadFunction:t?S(t):void 0})}function E(e,t,o){if(null!==e)for(var r,n,i,a,s,l,u,m,p=0,c=0,v=e.type,d="FeatureCollection"===v,g="Feature"===v,h=d?e.features.length:1,f=0;f<h;f++){s=(m=!!(u=d?e.features[f].geometry:g?e.geometry:e)&&"GeometryCollection"===u.type)?u.geometries.length:1;for(var M=0;M<s;M++){var w=0,y=0;if(null!==(a=m?u.geometries[M]:u)){l=a.coordinates;var b=a.type;switch(p=0,b){case null:break;case"Point":if(!1===t(l,c,f,w,y))return!1;c++,w++;break;case"LineString":case"MultiPoint":for(r=0;r<l.length;r++){if(!1===t(l[r],c,f,w,y))return!1;c++,"MultiPoint"===b&&w++}"LineString"===b&&w++;break;case"Polygon":case"MultiLineString":for(r=0;r<l.length;r++){for(n=0;n<l[r].length-p;n++){if(!1===t(l[r][n],c,f,w,y))return!1;c++}"MultiLineString"===b&&w++,"Polygon"===b&&y++}"Polygon"===b&&w++;break;case"MultiPolygon":for(r=0;r<l.length;r++){for(y=0,n=0;n<l[r].length;n++){for(i=0;i<l[r][n].length-p;i++){if(!1===t(l[r][n][i],c,f,w,y))return!1;c++}y++}w++}break;case"GeometryCollection":for(r=0;r<a.geometries.length;r++)if(!1===E(a.geometries[r],t))return!1;break;default:throw new Error("Unknown Geometry Type")}}}}}var P=function(e,t={}){if(null!=e.bbox&&!0!==t.recompute)return e.bbox;const o=[1/0,1/0,-1/0,-1/0];return E(e,e=>{o[0]>e[0]&&(o[0]=e[0]),o[1]>e[1]&&(o[1]=e[1]),o[2]<e[0]&&(o[2]=e[0]),o[3]<e[1]&&(o[3]=e[1])}),o},A=e=>{var t=e/1609.344;if(t<.5)return"".concat(Math.round(e),"m");if(t<10){var o=Number.parseFloat(t.toFixed(1)),r=1===o?"mile":"miles";return"".concat(o," ").concat(r)}var n=Math.round(t);return"".concat(n," miles")},Z=(e,t,o)=>{var r=o.getTargetElement().getBoundingClientRect(),[n,i,a,s]=(e=>P(e))(e),l=[[n,i],[n,s],[a,i],[a,s]].map(e=>o.getPixelFromCoordinate(e)).filter(Boolean);if(!l.length)return!1;var u=Math.min(...l.map(e=>e[0])),m=Math.max(...l.map(e=>e[0])),p=Math.min(...l.map(e=>e[1])),c=Math.max(...l.map(e=>e[1])),v=t.left-r.left,d=t.top-r.top,g=t.right-r.left,h=t.bottom-r.top;return u<g&&m>v&&p<h&&c>d},C="EPSG:27700",_=e=>{if(e){var{top:t=0,right:o=0,bottom:r=0,left:n=0}=e;return[t,o,r,n]}};i.defs(C,"+proj=tmerc +lat_0=49 +lon_0=-2 +k=0.9996012717 +x_0=400000 +y_0=-100000 +ellps=airy +towgs84=446.448,-125.157,542.06,0.15,0.247,0.842,-20.489 +units=m +no_defs"),a(i);class T{constructor(e){var{mapProviderConfig:t={},events:o,eventBus:r}=e;this.events=o,this.eventBus=r,this.capabilities={supportedShortcuts:h,supportsMapSizes:!1},Object.assign(this,t)}initMap(i){var a=this;return e(function*(){var e,{container:s,padding:l,mapStyle:u,mapSize:m,center:v,zoom:d,bounds:g,minZoom:h,maxZoom:w,transformRequest:y}=i;a.mapStyleId=null==u?void 0:u.id,a.mapSize=m;var{events:S,eventBus:E}=a,P=x(u.url,y),A=new r({source:P}),Z=(null!==(e=a.zoomAlignment)&&void 0!==e?e:f)===M?{resolutions:c,defaultMinZoom:6,maxZoom:20}:{resolutions:p,defaultMinZoom:0,maxZoom:p.length-1},T=new o({projection:C,center:v,zoom:null!=d?d:Z.defaultMinZoom,minZoom:Math.max(null!=h?h:Z.defaultMinZoom,Z.defaultMinZoom),maxZoom:null!=w?w:Z.maxZoom,resolutions:Z.resolutions,constrainResolution:!1,padding:_(l)}),z=new t({target:s,layers:[A],view:T,controls:[],interactions:n({doubleClickZoom:!1})});g&&z.once("rendercomplete",()=>{T.fit(g,{size:z.getSize(),duration:0})}),a.mapEventHandles=b({map:z,source:P,events:S,eventBus:E,getZoom:a.getZoom.bind(a),getCenter:a.getCenter.bind(a),getBounds:a.getBounds.bind(a),getResolution:a.getResolution.bind(a)}),a.appEventHandles=function(e){var{tileLayer:t,transformRequest:o,events:r,eventBus:n}=e,i=e=>{var i=x(e.url,o);t.setSource(i),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)}}}({tileLayer:A,transformRequest:y,events:S,eventBus:E})||[],a.map=z,a.view=T,a.tileLayer=A,a.source=P,E.emit(S.MAP_READY,{map:a.map,mapStyleId:a.mapStyleId,mapSize:a.mapSize,crs:a.crs})})()}destroyMap(){var e,t;null===(e=this.mapEventHandles)||void 0===e||e.remove(),null===(t=this.appEventHandles)||void 0===t||t.remove(),this.mapEventHandles=null,this.appEventHandles=null,this.map&&(this.map.setTarget(null),this.map=null),this.view=null,this.tileLayer=null,this.source=null}setView(e){var{center:t,zoom:o}=e;this.view.animate({center:null!=t?t:this.view.getCenter(),zoom:null!=o?o:this.view.getZoom(),duration:d})}zoomIn(e){this.view.animate({zoom:this.view.getZoom()+e,duration:d})}zoomOut(e){this.view.animate({zoom:this.view.getZoom()-e,duration:d})}panBy(e){var t=this.view.getCenter(),o=this.view.getResolution();this.view.animate({center:[t[0]+e[0]*o,t[1]-e[1]*o],duration:d})}fitToBounds(e){var t,o=Array.isArray(e)?e:(t=P(e),m(t,"EPSG:4326","EPSG:27700"));this.view.fit(o,{duration:d})}setPadding(e){this.view.padding=_(e)}getCenter(){var e=this.view.getCenter(),t=g;return[Math.round(e[0]*Math.pow(10,t))/Math.pow(10,t),Math.round(e[1]*Math.pow(10,t))/Math.pow(10,t)]}getZoom(){return this.view.getZoom()}getBounds(){return this.view.calculateExtent(this.map.getSize()).map(e=>Math.round(100*e)/100)}getFeaturesAtPoint(e,t){return[]}getVisibleFeatures(e){return[]}getAreaDimensions(){return(e=>{if(!e)return"";var[t,o,r,n]=e,i=r-t;return"".concat(A(n-o)," by ").concat(A(i))})((e=>{var t=e.getSize(),o=e.getView().padding||[0,0,0,0],[r,n,i,a]=o,s=[a,t[1]-i],l=[t[0]-n,r],u=e.getCoordinateFromPixel(s),m=e.getCoordinateFromPixel(l);return u&&m?[u[0],u[1],m[0],m[1]]:null})(this.map))}getCardinalMove(e,t){return((e,t)=>{var o=t[0]-e[0],r=t[1]-e[1],n=[];return Math.abs(r)>1&&n.push("".concat(r>0?"north":"south"," ").concat(A(Math.abs(r)))),Math.abs(o)>1&&n.push("".concat(o>0?"east":"west"," ").concat(A(Math.abs(o)))),n.join(", ")})(e,t)}getResolution(){return this.view.getResolution()}mapToScreen(e){if(!this.map)return{x:0,y:0};var t=this.map.getPixelFromCoordinate(e);return t?{x:t[0],y:t[1]}:{x:0,y:0}}screenToMap(e){return this.map.getCoordinateFromPixel([e.x,e.y])}isGeometryObscured(e,t){return Z(e,t,this.map)}}export{T as default};

package/providers/beta/openlayers/dist/esm/index.js

@@ -0,0 +1 @@
+import e from"@babel/runtime/helpers/asyncToGenerator";function r(){var r,{zoomAlignment:t}=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return{checkDeviceCapabilities:()=>({isSupported:!!document.createElement("canvas").getContext,error:"Canvas is not supported in this browser"}),load:(r=e(function*(){return{MapProvider:(yield import(/* webpackChunkName: "im-openlayers-provider" */ "./im-openlayers-provider.js")).default,mapProviderConfig:{zoomAlignment:t,crs:"EPSG:27700"}}}),function(){return r.apply(this,arguments)})}}export{r as default};