@defra/interactive-map 0.0.48-fmp-1 → 0.0.49-alpha

package/plugins/map-key/dist/umd/index.js

@@ -1,2 +1,2 @@
 /*! For license information please see index.js.LICENSE.txt */
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define("defra",[],t):"object"==typeof exports?exports.defra=t():(e.defra=e.defra||{},e.defra.mapKeyPlugin=t())}(this,()=>(()=>{"use strict";var e,t,r={738(e){e.exports=preactCompat},287(e){e.exports=preactJsxRuntime}},n={};function o(e){var t=n[e];if(void 0!==t)return t.exports;var i=n[e]={exports:{}};return r[e](i,i.exports,o),i.exports}o.m=r,o.d=(e,t)=>{for(var r in t)o.o(t,r)&&!o.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},o.f={},o.e=e=>Promise.all(Object.keys(o.f).reduce((t,r)=>(o.f[r](e,t),t),[])),o.u=e=>"im-map-key-plugin.js",o.miniCssF=e=>{},o.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),o.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),e={},t="defra.mapKeyPlugin:",o.l=(r,n,i,a)=>{if(e[r])e[r].push(n);else{var u,c;if(void 0!==i)for(var f=document.getElementsByTagName("script"),p=0;p<f.length;p++){var l=f[p];if(l.getAttribute("src")==r||l.getAttribute("data-webpack")==t+i){u=l;break}}u||(c=!0,(u=document.createElement("script")).charset="utf-8",o.nc&&u.setAttribute("nonce",o.nc),u.setAttribute("data-webpack",t+i),u.src=r),e[r]=[n];var s=(t,n)=>{u.onerror=u.onload=null,clearTimeout(d);var o=e[r];if(delete e[r],u.parentNode&&u.parentNode.removeChild(u),o&&o.forEach(e=>e(n)),t)return t(n)},d=setTimeout(s.bind(null,void 0,{type:"timeout",target:u}),12e4);u.onerror=s.bind(null,u.onerror),u.onload=s.bind(null,u.onload),c&&document.head.appendChild(u)}},o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},(()=>{var e;o.g.importScripts&&(e=o.g.location+"");var t=o.g.document;if(!e&&t&&(t.currentScript&&"SCRIPT"===t.currentScript.tagName.toUpperCase()&&(e=t.currentScript.src),!e)){var r=t.getElementsByTagName("script");if(r.length)for(var n=r.length-1;n>-1&&(!e||!/^http(s?):/.test(e));)e=r[n--].src}if(!e)throw new Error("Automatic publicPath is not supported in this browser");e=e.replace(/^blob:/,"").replace(/#.*$/,"").replace(/\?.*$/,"").replace(/\/[^\/]+$/,"/"),o.p=e})(),(()=>{var e={57:0};o.f.j=(t,r)=>{var n=o.o(e,t)?e[t]:void 0;if(0!==n)if(n)r.push(n[2]);else{var i=new Promise((r,o)=>n=e[t]=[r,o]);r.push(n[2]=i);var a=o.p+o.u(t),u=new Error;o.l(a,r=>{if(o.o(e,t)&&(0!==(n=e[t])&&(e[t]=void 0),n)){var i=r&&("load"===r.type?"missing":r.type),a=r&&r.target&&r.target.src;u.message="Loading chunk "+t+" failed.\n("+i+": "+a+")",u.name="ChunkLoadError",u.type=i,u.request=a,n[1](u)}},"chunk-"+t,t)}};var t=(t,r)=>{var n,i,[a,u,c]=r,f=0;if(a.some(t=>0!==e[t])){for(n in u)o.o(u,n)&&(o.m[n]=u[n]);c&&c(o)}for(t&&t(r);f<a.length;f++)i=a[f],o.o(e,i)&&e[i]&&e[i][0](),e[i]=0},r=this.webpackChunkdefra_DefraMap=this.webpackChunkdefra_DefraMap||[];r.forEach(t.bind(null,0)),r.push=t.bind(null,r.push.bind(r))})();var i={};function a(e){return a="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},a(e)}function u(){var e,t,r="function"==typeof Symbol?Symbol:{},n=r.iterator||"@@iterator",o=r.toStringTag||"@@toStringTag";function i(r,n,o,i){var u=n&&n.prototype instanceof f?n:f,p=Object.create(u.prototype);return c(p,"_invoke",function(r,n,o){var i,u,c,f=0,p=o||[],l=!1,s={p:0,n:0,v:e,a:d,f:d.bind(e,4),d:function(t,r){return i=t,u=0,c=e,s.n=r,a}};function d(r,n){for(u=r,c=n,t=0;!l&&f&&!o&&t<p.length;t++){var o,i=p[t],d=s.p,b=i[2];r>3?(o=b===n)&&(c=i[(u=i[4])?5:(u=3,3)],i[4]=i[5]=e):i[0]<=d&&((o=r<2&&d<i[1])?(u=0,s.v=n,s.n=i[1]):d<b&&(o=r<3||i[0]>n||n>b)&&(i[4]=r,i[5]=n,s.n=b,u=0))}if(o||r>1)return a;throw l=!0,n}return function(o,p,b){if(f>1)throw TypeError("Generator is already running");for(l&&1===p&&d(p,b),u=p,c=b;(t=u<2?e:c)||!l;){i||(u?u<3?(u>1&&(s.n=-1),d(u,c)):s.n=c:s.v=c);try{if(f=2,i){if(u||(o="next"),t=i[o]){if(!(t=t.call(i,c)))throw TypeError("iterator result is not an object");if(!t.done)return t;c=t.value,u<2&&(u=0)}else 1===u&&(t=i.return)&&t.call(i),u<2&&(c=TypeError("The iterator does not provide a '"+o+"' method"),u=1);i=e}else if((t=(l=s.n<0)?c:r.call(n,s))!==a)break}catch(t){i=e,u=1,c=t}finally{f=1}}return{value:t,done:l}}}(r,o,i),!0),p}var a={};function f(){}function p(){}function l(){}t=Object.getPrototypeOf;var s=[][n]?t(t([][n]())):(c(t={},n,function(){return this}),t),d=l.prototype=f.prototype=Object.create(s);function b(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,l):(e.__proto__=l,c(e,o,"GeneratorFunction")),e.prototype=Object.create(d),e}return p.prototype=l,c(d,"constructor",l),c(l,"constructor",p),p.displayName="GeneratorFunction",c(l,o,"GeneratorFunction"),c(d),c(d,o,"Generator"),c(d,n,function(){return this}),c(d,"toString",function(){return"[object Generator]"}),(u=function(){return{w:i,m:b}})()}function c(e,t,r,n){var o=Object.defineProperty;try{o({},"",{})}catch(e){o=0}c=function(e,t,r,n){function i(t,r){c(e,t,function(e){return this._invoke(t,r,e)})}t?o?o(e,t,{value:r,enumerable:!n,configurable:!n,writable:!n}):e[t]=r:(i("next",0),i("throw",1),i("return",2))},c(e,t,r,n)}function f(e,t,r,n,o,i,a){try{var u=e[i](a),c=u.value}catch(e){return void r(e)}u.done?t(c):Promise.resolve(c).then(n,o)}function p(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 l(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?p(Object(r),!0).forEach(function(t){s(e,t,r[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):p(Object(r)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))})}return e}function s(e,t,r){return(t=function(e){var t=function(e){if("object"!=a(e)||!e)return e;var t=e[Symbol.toPrimitive];if(void 0!==t){var r=t.call(e,"string");if("object"!=a(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(e)}(e);return"symbol"==a(t)?t:t+""}(t))in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function d(){var e,t;return l(l({noKeyItemText:"No features displayed"},arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}),{},{id:"mapKey",load:(e=u().m(function e(){var t;return u().w(function(e){for(;;)switch(e.n){case 0:return e.n=1,o.e(414).then(o.bind(o,935));case 1:return t=e.v.manifest,e.a(2,t)}},e)}),t=function(){var t=this,r=arguments;return new Promise(function(n,o){var i=e.apply(t,r);function a(e){f(i,n,o,a,u,"next",e)}function u(e){f(i,n,o,a,u,"throw",e)}a(void 0)})},function(){return t.apply(this,arguments)})})}return o.d(i,{default:()=>d}),i.default})());
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define("defra",[],t):"object"==typeof exports?exports.defra=t():(e.defra=e.defra||{},e.defra.mapKeyPlugin=t())}(this,()=>(()=>{"use strict";var e,t,r={738(e){e.exports=preactCompat},287(e){e.exports=preactJsxRuntime}},n={};function o(e){var t=n[e];if(void 0!==t)return t.exports;var i=n[e]={exports:{}};return r[e](i,i.exports,o),i.exports}o.m=r,o.d=(e,t)=>{for(var r in t)o.o(t,r)&&!o.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},o.f={},o.e=e=>Promise.all(Object.keys(o.f).reduce((t,r)=>(o.f[r](e,t),t),[])),o.u=e=>"im-map-key-plugin.js",o.miniCssF=e=>{},o.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),o.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),e={},t="defra.mapKeyPlugin:",o.l=(r,n,i,a)=>{if(e[r])e[r].push(n);else{var u,c;if(void 0!==i)for(var f=document.getElementsByTagName("script"),p=0;p<f.length;p++){var l=f[p];if(l.getAttribute("src")==r||l.getAttribute("data-webpack")==t+i){u=l;break}}u||(c=!0,(u=document.createElement("script")).charset="utf-8",o.nc&&u.setAttribute("nonce",o.nc),u.setAttribute("data-webpack",t+i),u.src=r),e[r]=[n];var s=(t,n)=>{u.onerror=u.onload=null,clearTimeout(d);var o=e[r];if(delete e[r],u.parentNode&&u.parentNode.removeChild(u),o&&o.forEach(e=>e(n)),t)return t(n)},d=setTimeout(s.bind(null,void 0,{type:"timeout",target:u}),12e4);u.onerror=s.bind(null,u.onerror),u.onload=s.bind(null,u.onload),c&&document.head.appendChild(u)}},o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},(()=>{var e;o.g.importScripts&&(e=o.g.location+"");var t=o.g.document;if(!e&&t&&(t.currentScript&&"SCRIPT"===t.currentScript.tagName.toUpperCase()&&(e=t.currentScript.src),!e)){var r=t.getElementsByTagName("script");if(r.length)for(var n=r.length-1;n>-1&&(!e||!/^http(s?):/.test(e));)e=r[n--].src}if(!e)throw new Error("Automatic publicPath is not supported in this browser");e=e.replace(/^blob:/,"").replace(/#.*$/,"").replace(/\?.*$/,"").replace(/\/[^\/]+$/,"/"),o.p=e})(),(()=>{var e={57:0};o.f.j=(t,r)=>{var n=o.o(e,t)?e[t]:void 0;if(0!==n)if(n)r.push(n[2]);else{var i=new Promise((r,o)=>n=e[t]=[r,o]);r.push(n[2]=i);var a=o.p+o.u(t),u=new Error;o.l(a,r=>{if(o.o(e,t)&&(0!==(n=e[t])&&(e[t]=void 0),n)){var i=r&&("load"===r.type?"missing":r.type),a=r&&r.target&&r.target.src;u.message="Loading chunk "+t+" failed.\n("+i+": "+a+")",u.name="ChunkLoadError",u.type=i,u.request=a,n[1](u)}},"chunk-"+t,t)}};var t=(t,r)=>{var n,i,[a,u,c]=r,f=0;if(a.some(t=>0!==e[t])){for(n in u)o.o(u,n)&&(o.m[n]=u[n]);c&&c(o)}for(t&&t(r);f<a.length;f++)i=a[f],o.o(e,i)&&e[i]&&e[i][0](),e[i]=0},r=this.webpackChunkdefra_DefraMap=this.webpackChunkdefra_DefraMap||[];r.forEach(t.bind(null,0)),r.push=t.bind(null,r.push.bind(r))})();var i={};function a(e){return a="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},a(e)}function u(){var e,t,r="function"==typeof Symbol?Symbol:{},n=r.iterator||"@@iterator",o=r.toStringTag||"@@toStringTag";function i(r,n,o,i){var u=n&&n.prototype instanceof f?n:f,p=Object.create(u.prototype);return c(p,"_invoke",function(r,n,o){var i,u,c,f=0,p=o||[],l=!1,s={p:0,n:0,v:e,a:d,f:d.bind(e,4),d:function(t,r){return i=t,u=0,c=e,s.n=r,a}};function d(r,n){for(u=r,c=n,t=0;!l&&f&&!o&&t<p.length;t++){var o,i=p[t],d=s.p,b=i[2];r>3?(o=b===n)&&(c=i[(u=i[4])?5:(u=3,3)],i[4]=i[5]=e):i[0]<=d&&((o=r<2&&d<i[1])?(u=0,s.v=n,s.n=i[1]):d<b&&(o=r<3||i[0]>n||n>b)&&(i[4]=r,i[5]=n,s.n=b,u=0))}if(o||r>1)return a;throw l=!0,n}return function(o,p,b){if(f>1)throw TypeError("Generator is already running");for(l&&1===p&&d(p,b),u=p,c=b;(t=u<2?e:c)||!l;){i||(u?u<3?(u>1&&(s.n=-1),d(u,c)):s.n=c:s.v=c);try{if(f=2,i){if(u||(o="next"),t=i[o]){if(!(t=t.call(i,c)))throw TypeError("iterator result is not an object");if(!t.done)return t;c=t.value,u<2&&(u=0)}else 1===u&&(t=i.return)&&t.call(i),u<2&&(c=TypeError("The iterator does not provide a '"+o+"' method"),u=1);i=e}else if((t=(l=s.n<0)?c:r.call(n,s))!==a)break}catch(t){i=e,u=1,c=t}finally{f=1}}return{value:t,done:l}}}(r,o,i),!0),p}var a={};function f(){}function p(){}function l(){}t=Object.getPrototypeOf;var s=[][n]?t(t([][n]())):(c(t={},n,function(){return this}),t),d=l.prototype=f.prototype=Object.create(s);function b(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,l):(e.__proto__=l,c(e,o,"GeneratorFunction")),e.prototype=Object.create(d),e}return p.prototype=l,c(d,"constructor",l),c(l,"constructor",p),p.displayName="GeneratorFunction",c(l,o,"GeneratorFunction"),c(d),c(d,o,"Generator"),c(d,n,function(){return this}),c(d,"toString",function(){return"[object Generator]"}),(u=function(){return{w:i,m:b}})()}function c(e,t,r,n){var o=Object.defineProperty;try{o({},"",{})}catch(e){o=0}c=function(e,t,r,n){function i(t,r){c(e,t,function(e){return this._invoke(t,r,e)})}t?o?o(e,t,{value:r,enumerable:!n,configurable:!n,writable:!n}):e[t]=r:(i("next",0),i("throw",1),i("return",2))},c(e,t,r,n)}function f(e,t,r,n,o,i,a){try{var u=e[i](a),c=u.value}catch(e){return void r(e)}u.done?t(c):Promise.resolve(c).then(n,o)}function p(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 l(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?p(Object(r),!0).forEach(function(t){s(e,t,r[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):p(Object(r)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))})}return e}function s(e,t,r){return(t=function(e){var t=function(e){if("object"!=a(e)||!e)return e;var t=e[Symbol.toPrimitive];if(void 0!==t){var r=t.call(e,"string");if("object"!=a(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(e)}(e);return"symbol"==a(t)?t:t+""}(t))in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function d(){var e,t;return l(l({noKeyItemText:"No features displayed"},arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}),{},{id:"mapKey",load:(e=u().m(function e(){var t;return u().w(function(e){for(;;)switch(e.n){case 0:return e.n=1,o.e(414).then(o.bind(o,64));case 1:return t=e.v.manifest,e.a(2,t)}},e)}),t=function(){var t=this,r=arguments;return new Promise(function(n,o){var i=e.apply(t,r);function a(e){f(i,n,o,a,u,"next",e)}function u(e){f(i,n,o,a,u,"throw",e)}a(void 0)})},function(){return t.apply(this,arguments)})})}return o.d(i,{default:()=>d}),i.default})());

package/plugins/map-key/src/api/addSymbol.js

@@ -0,0 +1,3 @@
+export const addSymbol = ({ pluginState: { dispatch } }, keyDefinition) => {
+  dispatch({ type: 'ADD_KEY_SYMBOL', payload: keyDefinition })
+}

package/plugins/map-key/src/api/addSymbol.test.js

@@ -0,0 +1,14 @@
+import { addSymbol } from './addSymbol.js'
+
+describe('addSymbol', () => {
+  it('dispatches an ADD_KEY_SYMBOL action with the key definition', () => {
+    const dispatch = jest.fn()
+
+    addSymbol({ pluginState: { dispatch } }, { id: 'map-key', groupLabel: 'Map key' })
+
+    expect(dispatch).toHaveBeenCalledWith({
+      type: 'ADD_KEY_SYMBOL',
+      payload: { id: 'map-key', groupLabel: 'Map key' }
+    })
+  })
+})

package/plugins/map-key/src/api/index.js

@@ -1,7 +1,7 @@
-import { addKeyItem } from './addKeyItem.js'
-import { removeKeyItem } from './removeKeyItem.js'
+import { addSymbol } from './addSymbol.js'
+import { removeSymbol } from './removeSymbol.js'
 
 export const api = {
-  addKeyItem,
-  removeKeyItem
+  addSymbol,
+  removeSymbol
 }

package/plugins/map-key/src/api/index.test.js

@@ -1,13 +1,13 @@
 import { api } from './index.js'
-import { addKeyItem } from './addKeyItem.js'
-import { removeKeyItem } from './removeKeyItem.js'
+import { addSymbol } from './addSymbol.js'
+import { removeSymbol } from './removeSymbol.js'
 
 describe('api/index', () => {
-  it('exports the addKeyItem API', () => {
-    expect(api.addKeyItem).toBe(addKeyItem)
+  it('exports the addSymbol API', () => {
+    expect(api.addSymbol).toBe(addSymbol)
   })
 
-  it('exports the removeKeyItem API', () => {
-    expect(api.removeKeyItem).toBe(removeKeyItem)
+  it('exports the removeSymbol API', () => {
+    expect(api.removeSymbol).toBe(removeSymbol)
   })
 })

package/plugins/map-key/src/api/removeSymbol.js

@@ -0,0 +1,3 @@
+export const removeSymbol = ({ pluginState: { dispatch } }, keyDefinition) => {
+  dispatch({ type: 'REMOVE_KEY_SYMBOL', payload: keyDefinition })
+}

package/plugins/map-key/src/api/removeSymbol.test.js

@@ -0,0 +1,14 @@
+import { removeSymbol } from './removeSymbol.js'
+
+describe('removeSymbol', () => {
+  it('dispatches a REMOVE_KEY_SYMBOL action with the key definition', () => {
+    const dispatch = jest.fn()
+
+    removeSymbol({ pluginState: { dispatch } }, { id: 'map-key' })
+
+    expect(dispatch).toHaveBeenCalledWith({
+      type: 'REMOVE_KEY_SYMBOL',
+      payload: { id: 'map-key' }
+    })
+  })
+})

package/plugins/map-key/src/initialise/MapKeyInit.jsx

@@ -16,6 +16,7 @@ export function MapKeyInit ({ pluginConfig, pluginState, mapState, services }) {
     attachPluginStateRef(pluginStateRef)
     // Request a handle on the datasetsRegistry singleton
     eventBus.requestOnce('datasets:registry', setDatasetRegistry)
+    eventBus.emit('map-key:ready')
   }, [mapState.isMapReady])
 
   useEffect(() => {

package/plugins/map-key/src/initialise/MapKeyInit.test.jsx

@@ -6,7 +6,7 @@ jest.mock('../registry/getDatasetRegistry.js', () => ({
   setDatasetRegistry: jest.fn()
 }))
 
-const eventBus = { requestOnce: jest.fn() }
+const eventBus = { requestOnce: jest.fn(), emit: jest.fn() }
 const pluginState = { dispatch: jest.fn() }
 const pluginConfig = {
   groups: {

package/plugins/map-key/src/reducers/pluginState.js

@@ -17,7 +17,7 @@ const findGroup = (state, id, groupId) => {
   })
 }
 
-const addKeyItem = (state, keyDefinition) => {
+const addSymbol = (state, keyDefinition) => {
   const { id, groupLabel } = keyDefinition
   const groupId = keyDefinition.groupId || labelToId(groupLabel)
   // Check for an existingGroup
@@ -41,7 +41,7 @@ const addKeyItem = (state, keyDefinition) => {
   }
 }
 
-const removeKeyItem = (state, keyDefinition) => {
+const removeSymbol = (state, keyDefinition) => {
   const { id } = keyDefinition
   return {
     ...state,
@@ -57,8 +57,8 @@ const addKeyGroups = (state, groups) => {
 }
 
 const actions = {
-  ADD_KEY_ITEM: addKeyItem,
-  REMOVE_KEY_ITEM: removeKeyItem,
+  ADD_KEY_SYMBOL: addSymbol,
+  REMOVE_KEY_SYMBOL: removeSymbol,
   ADD_KEY_GROUPS: addKeyGroups
 }
 

package/plugins/map-key/src/reducers/pluginState.test.js

@@ -6,7 +6,7 @@ describe('pluginState reducer helpers', () => {
   })
 
   it('adds a flat key item and creates a flat group when needed', () => {
-    const nextState = actions.ADD_KEY_ITEM(initialState, { id: 'flat-key', label: 'Flat key' })
+    const nextState = actions.ADD_KEY_SYMBOL(initialState, { id: 'flat-key', label: 'Flat key' })
 
     expect(nextState).toEqual({
       keyDefinitions: [{ id: 'flat-key', label: 'Flat key', type: 'manual' }],
@@ -15,7 +15,7 @@ describe('pluginState reducer helpers', () => {
   })
 
   it('adds a grouped key item when the label can be converted to a group id', () => {
-    const nextState = actions.ADD_KEY_ITEM(initialState, { id: 'group-key', groupLabel: 'Group Label', label: 'Group key' })
+    const nextState = actions.ADD_KEY_SYMBOL(initialState, { id: 'group-key', groupLabel: 'Group Label', label: 'Group key' })
 
     expect(nextState).toEqual({
       keyDefinitions: [{
@@ -35,7 +35,7 @@ describe('pluginState reducer helpers', () => {
       groups: [{ id: 'existing-item', type: 'flat' }]
     }
 
-    expect(actions.ADD_KEY_ITEM(state, { id: 'existing-item', label: 'Existing item' })).toEqual({
+    expect(actions.ADD_KEY_SYMBOL(state, { id: 'existing-item', label: 'Existing item' })).toEqual({
       keyDefinitions: [
         { id: 'existing-item' },
         { id: 'existing-item', label: 'Existing item', type: 'manual' }
@@ -50,7 +50,7 @@ describe('pluginState reducer helpers', () => {
       groups: [{ id: 'group-1', type: 'group', groupLabel: 'Group 1' }]
     }
 
-    expect(actions.ADD_KEY_ITEM(state, { id: 'new-item', groupId: 'group-1', groupLabel: 'Group 1', label: 'New item' })).toEqual({
+    expect(actions.ADD_KEY_SYMBOL(state, { id: 'new-item', groupId: 'group-1', groupLabel: 'Group 1', label: 'New item' })).toEqual({
       keyDefinitions: [
         { id: 'existing-group-item', groupId: 'group-1' },
         { id: 'new-item', groupId: 'group-1', groupLabel: 'Group 1', label: 'New item', type: 'manual' }
@@ -65,7 +65,7 @@ describe('pluginState reducer helpers', () => {
       groups: [{ id: 'a', type: 'flat' }]
     }
 
-    expect(actions.REMOVE_KEY_ITEM(state, { id: 'a' })).toEqual({
+    expect(actions.REMOVE_KEY_SYMBOL(state, { id: 'a' })).toEqual({
       keyDefinitions: [{ id: 'b' }],
       groups: [{ id: 'a', type: 'flat' }]
     })

package/src/App/hooks/useLayoutMeasurements.js

@@ -17,8 +17,12 @@ const symmetricWidth = (left, right) => left || right ? Math.max(left, right) :
 const subSlotMaxHeight = (columnHeight, siblingButtons, gap) => columnHeight - (siblingButtons ? siblingButtons + gap : 0)
 
 // bottomRightHeight is 0 when empty, falling back to the attributions' own height for spacing.
-const rightOffsetBottom = (containerPad, bottomRightHeight, attributionsHeight, gap) =>
-  containerPad + (bottomRightHeight > 0 ? bottomRightHeight + gap : attributionsHeight)
+// rise is how far attributions has lifted .im-o-app__bottom-right above .im-o-app__bottom's
+// own bottom edge (see attributionsRise below) — without adding it here, .im-o-app__right's
+// computed bottom offset stays at the box's un-lifted position and the floating right column
+// overlaps the now-raised bottom-right buttons.
+const rightOffsetBottom = (containerPad, bottomRightHeight, attributionsHeight, rise, gap) =>
+  containerPad + (bottomRightHeight > 0 ? bottomRightHeight + rise + gap : attributionsHeight)
 
 // Clears the bottom row's own TOP edge (not just its trailing gap below), so the hint
 // never overlaps the logo/attribution row itself, plus a gap above it. That trivially
@@ -74,13 +78,22 @@ const attributionsNaturalWidth = (attributionsEl) => {
 // longer fits, at its natural width, in the space beside the logo column.
 const isAttributionsStacked = (naturalWidth, availableWidth) => naturalWidth > availableWidth
 
-// Docked, attributions bleeds primaryGap below the row's bottom edge then grows upward from
-// there by its own height — once that height exceeds primaryGap, it creeps back up into the
-// row itself, where .im-o-app__bottom-right shares the same horizontal space. This is how far
-// that needs pushing up to stay clear. Stacked already has its own clearance (the stacked
-// rule's margin-top), so none is needed there.
-const attributionsBottomRightClearance = (isStacked, attributionsHeight, dividerGap, primaryGap) =>
-  isStacked ? 0 : Math.max(0, attributionsHeight + dividerGap - primaryGap)
+// How far attributions lifts .im-o-app__bottom-right above .im-o-app__bottom's own bottom
+// edge. The same figure covers both modes, because both bleed primaryGap past that edge and
+// then take attributionsHeight (plus a dividerGap) back up from there:
+//  - docked: the box grows upward from the bleed into the row itself, where
+//    .im-o-app__bottom-right shares the same horizontal space, so the row needs an explicit
+//    margin-bottom (--bottom-right-clearance) to stay clear of it;
+//  - stacked: the box is an extra flex line *below* the row, so it lifts the row by exactly
+//    that much on its own — no margin needed, hence bottomRightClearance's isStacked branch.
+// Either way .im-o-app__right must clear the lift, so the offsets below use this, not the
+// clearance. Clamped at 0: a box shorter than its own bleed lifts nothing.
+const attributionsRise = (attributionsHeight, dividerGap, primaryGap) =>
+  Math.max(0, attributionsHeight + dividerGap - primaryGap)
+
+// Stacked gets its lift from the extra flex line itself (see attributionsRise above), so only
+// docked needs the row pushed up by a margin.
+const bottomRightClearance = (isStacked, rise) => isStacked ? 0 : rise
 
 // Docks centred between the side columns when there's room, otherwise stacks full-width
 // (mobile always stacks). Sets the banner's own CSS vars and returns what the side-column
@@ -125,8 +138,9 @@ function applyAttributionsLayout ({ appContainer, bottom, attributions, dividerG
   // space-between` gap between the two columns isn't a fixed value (unlike `gap`) to reconstruct.
   const left = attributionsCol ? Math.round(attributionsCol.getBoundingClientRect().left - bottom.getBoundingClientRect().left) : 0
   appContainer.style.setProperty('--attributions-left', `${left}px`)
-  const clearance = attributionsBottomRightClearance(isStacked, attributions.offsetHeight, dividerGap, primaryGap)
-  appContainer.style.setProperty('--bottom-right-clearance', `${clearance}px`)
+  const rise = attributionsRise(attributions.offsetHeight, dividerGap, primaryGap)
+  appContainer.style.setProperty('--bottom-right-clearance', `${bottomRightClearance(isStacked, rise)}px`)
+  return { rise }
 }
 
 /**
@@ -174,7 +188,7 @@ function calculateLayout (layoutRefs, breakpoint) {
     ? bannerTop + bannerHeight + dividerGap
     : colHeight + top.offsetTop
 
-  applyAttributionsLayout({ appContainer, bottom, attributions, dividerGap, primaryGap })
+  const { rise: attributionsLift } = applyAttributionsLayout({ appContainer, bottom, attributions, dividerGap, primaryGap })
 
   // === Left container offsets ===
   const leftOffsetTop = sideOffsetTop(topLeftCol.offsetHeight)
@@ -187,10 +201,10 @@ function calculateLayout (layoutRefs, breakpoint) {
   const bottomRightHeight = buttonHeight(bottomRightRef)
   const bottomContainerPad = main.offsetHeight - bottom.offsetTop - bottom.offsetHeight
   const rightOffsetTop = sideOffsetTop(topRightCol.offsetHeight)
-  const rightEffectiveBottom = bottom.offsetTop + bottom.offsetHeight - bottomRightHeight
+  const rightEffectiveBottom = bottom.offsetTop + bottom.offsetHeight - bottomRightHeight - attributionsLift
   const rightColumnHeight = rightEffectiveBottom - rightOffsetTop - dividerGap
   appContainer.style.setProperty('--right-offset-top', `${rightOffsetTop}px`)
-  appContainer.style.setProperty('--right-offset-bottom', `${rightOffsetBottom(bottomContainerPad, bottomRightHeight, attributions.offsetHeight, dividerGap)}px`)
+  appContainer.style.setProperty('--right-offset-bottom', `${rightOffsetBottom(bottomContainerPad, bottomRightHeight, attributions.offsetHeight, attributionsLift, dividerGap)}px`)
   appContainer.style.setProperty('--right-top-max-height', `${rightColumnHeight}px`)
 
   // === Keyboard hint bottom offset ===

package/src/App/hooks/useLayoutMeasurements.test.js

@@ -88,9 +88,11 @@ describe('useLayoutMeasurements', () => {
   test.each([
     ['right-offset-top', { topRightCol: { offsetHeight: 80 }, top: { offsetTop: 15 } }, '95px'],
     ['right-offset-bottom', { main: { offsetHeight: 600 }, bottom: { offsetTop: 500 } }, '116px'],
-    // leftColumnHeight = 400 - (50+10) - 8 = 332; rightColumnHeight = 400 - (40+10) - 8 = 342
+    // leftColumnHeight = 400 - (50+10) - 8 = 332
+    // rightColumnHeight: rightEffectiveBottom = 400 - 0 (bottomRightHeight) - 16 (bottom-right-clearance,
+    // since default attributions offsetHeight 16 + dividerGap 8 - primaryGap 8 = 16) = 384; 384 - 50 - 8 = 326
     ['left-top-max-height', {}, '332px'],
-    ['right-top-max-height', {}, '342px']
+    ['right-top-max-height', {}, '326px']
   ])('calculates %s correctly', (name, refOverrides, expected) => {
     const { layoutRefs } = setup({ refs: refOverrides })
     renderHook(() => useLayoutMeasurements())
@@ -103,10 +105,11 @@ describe('useLayoutMeasurements', () => {
     ['--left-top-panel-max-height', { leftBottom: { offsetHeight: 50 } }, '274px'], // 332 - 50 - 8
     ['--left-bottom-panel-max-height', {}, '332px'],
     ['--left-bottom-panel-max-height', { leftTop: { offsetHeight: 40 } }, '284px'], // 332 - 40 - 8
-    ['--right-top-panel-max-height', {}, '342px'],
-    ['--right-top-panel-max-height', { rightBottom: { offsetHeight: 60 } }, '274px'], // 342 - 60 - 8
-    ['--right-bottom-panel-max-height', {}, '342px'],
-    ['--right-bottom-panel-max-height', { rightTop: { offsetHeight: 30 } }, '304px'] // 342 - 30 - 8
+    // rightColumnHeight is 326 by default here (see the right-top-max-height case above)
+    ['--right-top-panel-max-height', {}, '326px'],
+    ['--right-top-panel-max-height', { rightBottom: { offsetHeight: 60 } }, '258px'], // 326 - 60 - 8
+    ['--right-bottom-panel-max-height', {}, '326px'],
+    ['--right-bottom-panel-max-height', { rightTop: { offsetHeight: 30 } }, '288px'] // 326 - 30 - 8
   ])('calculates %s with sibling buttons=%o correctly', (varName, refOverrides, expected) => {
     const { layoutRefs } = setup({ refs: refOverrides })
     renderHook(() => useLayoutMeasurements())
@@ -232,7 +235,7 @@ describe('useLayoutMeasurements', () => {
     appendChild(layoutRefs.attributionsRef.current, { scrollWidth: 250 }) // attribution text, too wide to fit
     renderHook(() => useLayoutMeasurements())
     expect(layoutRefs.attributionsRef.current.classList.contains('im-o-app__attributions--stacked')).toBe(true)
-    // stacked already has its own clearance (the stacked rule's own margin-top), so none needed here
+    // stacked is lifted by its own extra flex line, not a margin, so no clearance is needed here
     expect(layoutRefs.appContainerRef.current.style.setProperty).toHaveBeenCalledWith('--bottom-right-clearance', '0px')
   })
 
@@ -260,9 +263,53 @@ describe('useLayoutMeasurements', () => {
     })
     renderHook(() => useLayoutMeasurements())
     // bottomContainerPad = 500 - 400 - 0 = 100
-    // expected = 100 + (20 + 8) = 128
+    // attributions lift = 16 (default attributions offsetHeight 16 + dividerGap 8 - primaryGap 8)
+    // expected = 100 + (20 + 16 + 8) = 144
     expect(layoutRefs.appContainerRef.current.style.setProperty)
-      .toHaveBeenCalledWith('--right-offset-bottom', '128px')
+      .toHaveBeenCalledWith('--right-offset-bottom', '144px')
+  })
+
+  test('adds the attributions lift into right-offset-bottom so .im-o-app__right does not overlap a bottom-right box pushed up by tall docked attributions', () => {
+    const { layoutRefs } = setup({
+      refs: {
+        bottomRight: { offsetHeight: 20 },
+        attributions: { offsetHeight: 40 } // lift = 40 + 8 (dividerGap) - 8 (primaryGap) = 40
+      }
+    })
+    renderHook(() => useLayoutMeasurements())
+    // bottomContainerPad = 500 - 400 - 0 = 100; expected = 100 + (20 + 40 + 8) = 168
+    // Without the lift term this regressed to 128px, letting .im-o-app__right's
+    // bottom offset sit below the (margin-bottom-raised) bottom-right box's real top edge.
+    expect(layoutRefs.appContainerRef.current.style.setProperty)
+      .toHaveBeenCalledWith('--right-offset-bottom', '168px')
+  })
+
+  // Stacked attributions takes a flex line of its own BELOW the bottom-right row, lifting the
+  // row by the same amount the docked box's margin-bottom does — but as part of
+  // .im-o-app__bottom's own grown height, not as a margin, so --bottom-right-clearance is 0.
+  // Reading the clearance here (rather than the mode-independent lift) left the right column's
+  // bottom offset at the un-lifted position, so a right-bottom scale bar overlapped a
+  // bottom-right draw menu on mobile — the breakpoint where attributions always stacks.
+  test('adds the attributions lift into right-offset-bottom when attributions is stacked, not just docked', () => {
+    const { layoutRefs } = setup({
+      refs: {
+        bottom: { rect: { left: 0 } },
+        bottomRight: { offsetHeight: 20 },
+        attributions: { offsetHeight: 40 } // lift = 40 + 8 (dividerGap) - 8 (primaryGap) = 40
+      }
+    })
+    appendChild(layoutRefs.bottomRef.current, {}) // logo column
+    appendChild(layoutRefs.bottomRef.current, { offsetWidth: 192, rect: { left: 115 } }) // bottom-right column
+    layoutRefs.bottomRef.current.appendChild(layoutRefs.attributionsRef.current) // sibling of both columns
+    appendChild(layoutRefs.attributionsRef.current, { scrollWidth: 250 }) // too wide to fit beside the logo
+    renderHook(() => useLayoutMeasurements())
+    const spy = layoutRefs.appContainerRef.current.style.setProperty
+    expect(layoutRefs.attributionsRef.current.classList.contains('im-o-app__attributions--stacked')).toBe(true)
+    expect(spy).toHaveBeenCalledWith('--bottom-right-clearance', '0px')
+    // Same 168px as the docked case above, despite the 0px clearance.
+    expect(spy).toHaveBeenCalledWith('--right-offset-bottom', '168px')
+    // rightEffectiveBottom = 400 + 0 - 20 - 40 = 340; 340 - 50 (rightOffsetTop) - 8 = 282
+    expect(spy).toHaveBeenCalledWith('--right-top-max-height', '282px')
   })
 
   test('uses 0 when sub-slot refs have null current', () => {
@@ -274,7 +321,7 @@ describe('useLayoutMeasurements', () => {
     renderHook(() => useLayoutMeasurements())
     // With all sub-slot refs null, buttons = 0 ?? 0 = 0, so max-heights equal full column height
     expect(layoutRefs.appContainerRef.current.style.setProperty).toHaveBeenCalledWith('--left-top-panel-max-height', '332px')
-    expect(layoutRefs.appContainerRef.current.style.setProperty).toHaveBeenCalledWith('--right-bottom-panel-max-height', '342px')
+    expect(layoutRefs.appContainerRef.current.style.setProperty).toHaveBeenCalledWith('--right-bottom-panel-max-height', '326px')
   })
 
   test('dispatches safe zone inset on desktop (post-batch RAF read only)', () => {

package/src/App/layout/layout.module.scss

@@ -266,6 +266,12 @@
   flex-wrap: wrap; // lets a stacked attributions row wrap onto its own line
   justify-content: space-between;
   align-items: flex-end;
+  // No effect on a single line (the common case), only between wrapped lines — covers both
+  // a too-wide .im-o-app__bottom-right dropping below the logo/bottom-left column, and the
+  // stacked attributions row below that (see its own comment further down: this same gap
+  // replaces what used to be its one-off margin-top, so a doubly-wrapped bottom stays evenly
+  // spaced rather than gapping only at the line the margin happened to be declared on).
+  row-gap: var(--divider-gap);
   z-index: -2; // Support masking the viewport
 }
 
@@ -323,7 +329,9 @@
 // (being bottom-pinned) pushes the logo and bottom-right buttons up rather than squeezing
 // the text into an ever-narrower column. The oversized flex-basis plus negative
 // right/bottom/left margin bleeds that row flush to the true edges the same way the docked
-// box's absolute offsets do above.
+// box's absolute offsets do above; the gap above it comes from .im-o-app__bottom's own
+// row-gap (not a margin-top here), so it stays exactly one gap even if .im-o-app__bottom-right
+// has also wrapped onto a line of its own above it.
 
 .im-o-app__attributions:not(:empty) {
   position: absolute;
@@ -337,7 +345,7 @@
 .im-o-app__attributions--stacked:not(:empty) {
   position: static;
   flex-basis: calc(100% + var(--primary-gap) * 2);
-  margin: var(--divider-gap) calc(var(--primary-gap) * -1) calc(var(--primary-gap) * -1) calc(var(--primary-gap) * -1);
+  margin: 0 calc(var(--primary-gap) * -1) calc(var(--primary-gap) * -1);
 }
 
 // ---------------------------------------------------

package/plugins/map-key/src/api/addKeyItem.js

@@ -1,3 +0,0 @@
-export const addKeyItem = ({ pluginState: { dispatch } }, keyDefinition) => {
-  dispatch({ type: 'ADD_KEY_ITEM', payload: keyDefinition })
-}

package/plugins/map-key/src/api/addKeyItem.test.js

@@ -1,14 +0,0 @@
-import { addKeyItem } from './addKeyItem.js'
-
-describe('addKeyItem', () => {
-  it('dispatches an ADD_KEY_ITEM action with the key definition', () => {
-    const dispatch = jest.fn()
-
-    addKeyItem({ pluginState: { dispatch } }, { id: 'map-key', groupLabel: 'Map key' })
-
-    expect(dispatch).toHaveBeenCalledWith({
-      type: 'ADD_KEY_ITEM',
-      payload: { id: 'map-key', groupLabel: 'Map key' }
-    })
-  })
-})

package/plugins/map-key/src/api/removeKeyItem.js

@@ -1,3 +0,0 @@
-export const removeKeyItem = ({ pluginState: { dispatch } }, keyDefinition) => {
-  dispatch({ type: 'REMOVE_KEY_ITEM', payload: keyDefinition })
-}

package/plugins/map-key/src/api/removeKeyItem.test.js

@@ -1,14 +0,0 @@
-import { removeKeyItem } from './removeKeyItem.js'
-
-describe('removeKeyItem', () => {
-  it('dispatches a REMOVE_KEY_ITEM action with the key definition', () => {
-    const dispatch = jest.fn()
-
-    removeKeyItem({ pluginState: { dispatch } }, { id: 'map-key' })
-
-    expect(dispatch).toHaveBeenCalledWith({
-      type: 'REMOVE_KEY_ITEM',
-      payload: { id: 'map-key' }
-    })
-  })
-})