@opengeoweb/store 8.2.0 → 8.3.1

package/index.esm.js

@@ -1,5 +1,5 @@
 import { webmapUtils, LayerType, webmapTestSettings, WMLayer, getCapabilities } from '@opengeoweb/webmap';
-import { defaultLayers, emptyGeoJSON, defaultGeoJSONStyleProperties } from '@opengeoweb/webmap-react';
+import { getGeoJson, moveFeature, defaultLayers, getFeatureCollection, emptyGeoJSON } from '@opengeoweb/webmap-react';
 export { defaultLayers } from '@opengeoweb/webmap-react';
 
 function _iterableToArrayLimit(r, l) {
@@ -485,7 +485,7 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-function n$1(n){for(var r=arguments.length,t=Array(r>1?r-1:0),e=1;e<r;e++)t[e-1]=arguments[e];if("production"!==process.env.NODE_ENV){var i=Y[n],o=i?"function"==typeof i?i.apply(null,t):i:"unknown error nr: "+n;throw Error("[Immer] "+o)}throw Error("[Immer] minified error nr: "+n+(t.length?" "+t.map((function(n){return "'"+n+"'"})).join(","):"")+". Find the full error at: https://bit.ly/3cXEKWf")}function r$1(n){return !!n&&!!n[Q]}function t$3(n){var r;return !!n&&(function(n){if(!n||"object"!=typeof n)return !1;var r=Object.getPrototypeOf(n);if(null===r)return !0;var t=Object.hasOwnProperty.call(r,"constructor")&&r.constructor;return t===Object||"function"==typeof t&&Function.toString.call(t)===Z}(n)||Array.isArray(n)||!!n[L]||!!(null===(r=n.constructor)||void 0===r?void 0:r[L])||s(n)||v(n))}function i$1(n,r,t){void 0===t&&(t=!1),0===o$1(n)?(t?Object.keys:nn)(n).forEach((function(e){t&&"symbol"==typeof e||r(e,n[e],n);})):n.forEach((function(t,e){return r(e,t,n)}));}function o$1(n){var r=n[Q];return r?r.i>3?r.i-4:r.i:Array.isArray(n)?1:s(n)?2:v(n)?3:0}function u$1(n,r){return 2===o$1(n)?n.has(r):Object.prototype.hasOwnProperty.call(n,r)}function a$1(n,r){return 2===o$1(n)?n.get(r):n[r]}function f(n,r,t){var e=o$1(n);2===e?n.set(r,t):3===e?n.add(t):n[r]=t;}function c$1(n,r){return n===r?0!==n||1/n==1/r:n!=n&&r!=r}function s(n){return X&&n instanceof Map}function v(n){return q&&n instanceof Set}function p(n){return n.o||n.t}function l(n){if(Array.isArray(n))return Array.prototype.slice.call(n);var r=rn(n);delete r[Q];for(var t=nn(r),e=0;e<t.length;e++){var i=t[e],o=r[i];!1===o.writable&&(o.writable=!0,o.configurable=!0),(o.get||o.set)&&(r[i]={configurable:!0,writable:!0,enumerable:o.enumerable,value:n[i]});}return Object.create(Object.getPrototypeOf(n),r)}function d(n,e){return void 0===e&&(e=!1),y(n)||r$1(n)||!t$3(n)||(o$1(n)>1&&(n.set=n.add=n.clear=n.delete=h),Object.freeze(n),e&&i$1(n,(function(n,r){return d(r,!0)}),!0)),n}function h(){n$1(2);}function y(n){return null==n||"object"!=typeof n||Object.isFrozen(n)}function b(r){var t=tn[r];return t||n$1(18,r),t}function m(n,r){tn[n]||(tn[n]=r);}function _(){return "production"===process.env.NODE_ENV||U||n$1(0),U}function j(n,r){r&&(b("Patches"),n.u=[],n.s=[],n.v=r);}function g(n){O(n),n.p.forEach(S),n.p=null;}function O(n){n===U&&(U=n.l);}function w(n){return U={p:[],l:U,h:n,m:!0,_:0}}function S(n){var r=n[Q];0===r.i||1===r.i?r.j():r.g=!0;}function P(r,e){e._=e.p.length;var i=e.p[0],o=void 0!==r&&r!==i;return e.h.O||b("ES5").S(e,r,o),o?(i[Q].P&&(g(e),n$1(4)),t$3(r)&&(r=M(e,r),e.l||x(e,r)),e.u&&b("Patches").M(i[Q].t,r,e.u,e.s)):r=M(e,i,[]),g(e),e.u&&e.v(e.u,e.s),r!==H?r:void 0}function M(n,r,t){if(y(r))return r;var e=r[Q];if(!e)return i$1(r,(function(i,o){return A(n,e,r,i,o,t)}),!0),r;if(e.A!==n)return r;if(!e.P)return x(n,e.t,!0),e.t;if(!e.I){e.I=!0,e.A._--;var o=4===e.i||5===e.i?e.o=l(e.k):e.o,u=o,a=!1;3===e.i&&(u=new Set(o),o.clear(),a=!0),i$1(u,(function(r,i){return A(n,e,o,r,i,t,a)})),x(n,o,!1),t&&n.u&&b("Patches").N(e,t,n.u,n.s);}return e.o}function A(e,i,o,a,c,s,v){if("production"!==process.env.NODE_ENV&&c===o&&n$1(5),r$1(c)){var p=M(e,c,s&&i&&3!==i.i&&!u$1(i.R,a)?s.concat(a):void 0);if(f(o,a,p),!r$1(p))return;e.m=!1;}else v&&o.add(c);if(t$3(c)&&!y(c)){if(!e.h.D&&e._<1)return;M(e,c),i&&i.A.l||x(e,c);}}function x(n,r,t){void 0===t&&(t=!1),!n.l&&n.h.D&&n.m&&d(r,t);}function z(n,r){var t=n[Q];return (t?p(t):n)[r]}function I(n,r){if(r in n)for(var t=Object.getPrototypeOf(n);t;){var e=Object.getOwnPropertyDescriptor(t,r);if(e)return e;t=Object.getPrototypeOf(t);}}function k(n){n.P||(n.P=!0,n.l&&k(n.l));}function E(n){n.o||(n.o=l(n.t));}function N(n,r,t){var e=s(r)?b("MapSet").F(r,t):v(r)?b("MapSet").T(r,t):n.O?function(n,r){var t=Array.isArray(n),e={i:t?1:0,A:r?r.A:_(),P:!1,I:!1,R:{},l:r,t:n,k:null,o:null,j:null,C:!1},i=e,o=en;t&&(i=[e],o=on);var u=Proxy.revocable(i,o),a=u.revoke,f=u.proxy;return e.k=f,e.j=a,f}(r,t):b("ES5").J(r,t);return (t?t.A:_()).p.push(e),e}function R(e){return r$1(e)||n$1(22,e),function n(r){if(!t$3(r))return r;var e,u=r[Q],c=o$1(r);if(u){if(!u.P&&(u.i<4||!b("ES5").K(u)))return u.t;u.I=!0,e=D(r,c),u.I=!1;}else e=D(r,c);return i$1(e,(function(r,t){u&&a$1(u.t,r)===t||f(e,r,n(t));})),3===c?new Set(e):e}(e)}function D(n,r){switch(r){case 2:return new Map(n);case 3:return Array.from(n)}return l(n)}function F(){function t(n,r){var t=s[n];return t?t.enumerable=r:s[n]=t={configurable:!0,enumerable:r,get:function(){var r=this[Q];return "production"!==process.env.NODE_ENV&&f(r),en.get(r,n)},set:function(r){var t=this[Q];"production"!==process.env.NODE_ENV&&f(t),en.set(t,n,r);}},t}function e(n){for(var r=n.length-1;r>=0;r--){var t=n[r][Q];if(!t.P)switch(t.i){case 5:a(t)&&k(t);break;case 4:o(t)&&k(t);}}}function o(n){for(var r=n.t,t=n.k,e=nn(t),i=e.length-1;i>=0;i--){var o=e[i];if(o!==Q){var a=r[o];if(void 0===a&&!u$1(r,o))return !0;var f=t[o],s=f&&f[Q];if(s?s.t!==a:!c$1(f,a))return !0}}var v=!!r[Q];return e.length!==nn(r).length+(v?0:1)}function a(n){var r=n.k;if(r.length!==n.t.length)return !0;var t=Object.getOwnPropertyDescriptor(r,r.length-1);if(t&&!t.get)return !0;for(var e=0;e<r.length;e++)if(!r.hasOwnProperty(e))return !0;return !1}function f(r){r.g&&n$1(3,JSON.stringify(p(r)));}var s={};m("ES5",{J:function(n,r){var e=Array.isArray(n),i=function(n,r){if(n){for(var e=Array(r.length),i=0;i<r.length;i++)Object.defineProperty(e,""+i,t(i,!0));return e}var o=rn(r);delete o[Q];for(var u=nn(o),a=0;a<u.length;a++){var f=u[a];o[f]=t(f,n||!!o[f].enumerable);}return Object.create(Object.getPrototypeOf(r),o)}(e,n),o={i:e?5:4,A:r?r.A:_(),P:!1,I:!1,R:{},l:r,t:n,k:i,o:null,g:!1,C:!1};return Object.defineProperty(i,Q,{value:o,writable:!0}),i},S:function(n,t,o){o?r$1(t)&&t[Q].A===n&&e(n.p):(n.u&&function n(r){if(r&&"object"==typeof r){var t=r[Q];if(t){var e=t.t,o=t.k,f=t.R,c=t.i;if(4===c)i$1(o,(function(r){r!==Q&&(void 0!==e[r]||u$1(e,r)?f[r]||n(o[r]):(f[r]=!0,k(t)));})),i$1(e,(function(n){void 0!==o[n]||u$1(o,n)||(f[n]=!1,k(t));}));else if(5===c){if(a(t)&&(k(t),f.length=!0),o.length<e.length)for(var s=o.length;s<e.length;s++)f[s]=!1;else for(var v=e.length;v<o.length;v++)f[v]=!0;for(var p=Math.min(o.length,e.length),l=0;l<p;l++)o.hasOwnProperty(l)||(f[l]=!0),void 0===f[l]&&n(o[l]);}}}}(n.p[0]),e(n.p));},K:function(n){return 4===n.i?o(n):a(n)}});}var G,U,W="undefined"!=typeof Symbol&&"symbol"==typeof Symbol("x"),X="undefined"!=typeof Map,q="undefined"!=typeof Set,B="undefined"!=typeof Proxy&&void 0!==Proxy.revocable&&"undefined"!=typeof Reflect,H=W?Symbol.for("immer-nothing"):((G={})["immer-nothing"]=!0,G),L=W?Symbol.for("immer-draftable"):"__$immer_draftable",Q=W?Symbol.for("immer-state"):"__$immer_state",Y={0:"Illegal state",1:"Immer drafts cannot have computed properties",2:"This object has been frozen and should not be mutated",3:function(n){return "Cannot use a proxy that has been revoked. Did you pass an object from inside an immer function to an async process? "+n},4:"An immer producer returned a new value *and* modified its draft. Either return a new value *or* modify the draft.",5:"Immer forbids circular references",6:"The first or second argument to `produce` must be a function",7:"The third argument to `produce` must be a function or undefined",8:"First argument to `createDraft` must be a plain object, an array, or an immerable object",9:"First argument to `finishDraft` must be a draft returned by `createDraft`",10:"The given draft is already finalized",11:"Object.defineProperty() cannot be used on an Immer draft",12:"Object.setPrototypeOf() cannot be used on an Immer draft",13:"Immer only supports deleting array indices",14:"Immer only supports setting array indices and the 'length' property",15:function(n){return "Cannot apply patch, path doesn't resolve: "+n},16:'Sets cannot have "replace" patches.',17:function(n){return "Unsupported patch operation: "+n},18:function(n){return "The plugin for '"+n+"' has not been loaded into Immer. To enable the plugin, import and call `enable"+n+"()` when initializing your application."},20:"Cannot use proxies if Proxy, Proxy.revocable or Reflect are not available",21:function(n){return "produce can only be called on things that are draftable: plain objects, arrays, Map, Set or classes that are marked with '[immerable]: true'. Got '"+n+"'"},22:function(n){return "'current' expects a draft, got: "+n},23:function(n){return "'original' expects a draft, got: "+n},24:"Patching reserved attributes like __proto__, prototype and constructor is not allowed"},Z=""+Object.prototype.constructor,nn="undefined"!=typeof Reflect&&Reflect.ownKeys?Reflect.ownKeys:void 0!==Object.getOwnPropertySymbols?function(n){return Object.getOwnPropertyNames(n).concat(Object.getOwnPropertySymbols(n))}:Object.getOwnPropertyNames,rn=Object.getOwnPropertyDescriptors||function(n){var r={};return nn(n).forEach((function(t){r[t]=Object.getOwnPropertyDescriptor(n,t);})),r},tn={},en={get:function(n,r){if(r===Q)return n;var e=p(n);if(!u$1(e,r))return function(n,r,t){var e,i=I(r,t);return i?"value"in i?i.value:null===(e=i.get)||void 0===e?void 0:e.call(n.k):void 0}(n,e,r);var i=e[r];return n.I||!t$3(i)?i:i===z(n.t,r)?(E(n),n.o[r]=N(n.A.h,i,n)):i},has:function(n,r){return r in p(n)},ownKeys:function(n){return Reflect.ownKeys(p(n))},set:function(n,r,t){var e=I(p(n),r);if(null==e?void 0:e.set)return e.set.call(n.k,t),!0;if(!n.P){var i=z(p(n),r),o=null==i?void 0:i[Q];if(o&&o.t===t)return n.o[r]=t,n.R[r]=!1,!0;if(c$1(t,i)&&(void 0!==t||u$1(n.t,r)))return !0;E(n),k(n);}return n.o[r]===t&&(void 0!==t||r in n.o)||Number.isNaN(t)&&Number.isNaN(n.o[r])||(n.o[r]=t,n.R[r]=!0),!0},deleteProperty:function(n,r){return void 0!==z(n.t,r)||r in n.t?(n.R[r]=!1,E(n),k(n)):delete n.R[r],n.o&&delete n.o[r],!0},getOwnPropertyDescriptor:function(n,r){var t=p(n),e=Reflect.getOwnPropertyDescriptor(t,r);return e?{writable:!0,configurable:1!==n.i||"length"!==r,enumerable:e.enumerable,value:t[r]}:e},defineProperty:function(){n$1(11);},getPrototypeOf:function(n){return Object.getPrototypeOf(n.t)},setPrototypeOf:function(){n$1(12);}},on={};i$1(en,(function(n,r){on[n]=function(){return arguments[0]=arguments[0][0],r.apply(this,arguments)};})),on.deleteProperty=function(r,t){return "production"!==process.env.NODE_ENV&&isNaN(parseInt(t))&&n$1(13),on.set.call(this,r,t,void 0)},on.set=function(r,t,e){return "production"!==process.env.NODE_ENV&&"length"!==t&&isNaN(parseInt(t))&&n$1(14),en.set.call(this,r[0],t,e,r[0])};var un=function(){function e(r){var e=this;this.O=B,this.D=!0,this.produce=function(r,i,o){if("function"==typeof r&&"function"!=typeof i){var u=i;i=r;var a=e;return function(n){var r=this;void 0===n&&(n=u);for(var t=arguments.length,e=Array(t>1?t-1:0),o=1;o<t;o++)e[o-1]=arguments[o];return a.produce(n,(function(n){var t;return (t=i).call.apply(t,[r,n].concat(e))}))}}var f;if("function"!=typeof i&&n$1(6),void 0!==o&&"function"!=typeof o&&n$1(7),t$3(r)){var c=w(e),s=N(e,r,void 0),v=!0;try{f=i(s),v=!1;}finally{v?g(c):O(c);}return "undefined"!=typeof Promise&&f instanceof Promise?f.then((function(n){return j(c,o),P(n,c)}),(function(n){throw g(c),n})):(j(c,o),P(f,c))}if(!r||"object"!=typeof r){if(void 0===(f=i(r))&&(f=r),f===H&&(f=void 0),e.D&&d(f,!0),o){var p=[],l=[];b("Patches").M(r,f,p,l),o(p,l);}return f}n$1(21,r);},this.produceWithPatches=function(n,r){if("function"==typeof n)return function(r){for(var t=arguments.length,i=Array(t>1?t-1:0),o=1;o<t;o++)i[o-1]=arguments[o];return e.produceWithPatches(r,(function(r){return n.apply(void 0,[r].concat(i))}))};var t,i,o=e.produce(n,r,(function(n,r){t=n,i=r;}));return "undefined"!=typeof Promise&&o instanceof Promise?o.then((function(n){return [n,t,i]})):[o,t,i]},"boolean"==typeof(null==r?void 0:r.useProxies)&&this.setUseProxies(r.useProxies),"boolean"==typeof(null==r?void 0:r.autoFreeze)&&this.setAutoFreeze(r.autoFreeze);}var i=e.prototype;return i.createDraft=function(e){t$3(e)||n$1(8),r$1(e)&&(e=R(e));var i=w(this),o=N(this,e,void 0);return o[Q].C=!0,O(i),o},i.finishDraft=function(r,t){var e=r&&r[Q];"production"!==process.env.NODE_ENV&&(e&&e.C||n$1(9),e.I&&n$1(10));var i=e.A;return j(i,t),P(void 0,i)},i.setAutoFreeze=function(n){this.D=n;},i.setUseProxies=function(r){r&&!B&&n$1(20),this.O=r;},i.applyPatches=function(n,t){var e;for(e=t.length-1;e>=0;e--){var i=t[e];if(0===i.path.length&&"replace"===i.op){n=i.value;break}}e>-1&&(t=t.slice(e+1));var o=b("Patches").$;return r$1(n)?o(n,t):this.produce(n,(function(n){return o(n,t)}))},e}(),an=new un,fn=an.produce;an.produceWithPatches.bind(an);an.setAutoFreeze.bind(an);an.setUseProxies.bind(an);an.applyPatches.bind(an);an.createDraft.bind(an);an.finishDraft.bind(an);var produce = fn;
+function n$1(n){for(var r=arguments.length,t=Array(r>1?r-1:0),e=1;e<r;e++)t[e-1]=arguments[e];if("production"!==process.env.NODE_ENV){var i=Y[n],o=i?"function"==typeof i?i.apply(null,t):i:"unknown error nr: "+n;throw Error("[Immer] "+o)}throw Error("[Immer] minified error nr: "+n+(t.length?" "+t.map((function(n){return "'"+n+"'"})).join(","):"")+". Find the full error at: https://bit.ly/3cXEKWf")}function r$1(n){return !!n&&!!n[Q]}function t$3(n){var r;return !!n&&(function(n){if(!n||"object"!=typeof n)return !1;var r=Object.getPrototypeOf(n);if(null===r)return !0;var t=Object.hasOwnProperty.call(r,"constructor")&&r.constructor;return t===Object||"function"==typeof t&&Function.toString.call(t)===Z}(n)||Array.isArray(n)||!!n[L]||!!(null===(r=n.constructor)||void 0===r?void 0:r[L])||s(n)||v(n))}function i$1(n,r,t){void 0===t&&(t=!1),0===o$1(n)?(t?Object.keys:nn)(n).forEach((function(e){t&&"symbol"==typeof e||r(e,n[e],n);})):n.forEach((function(t,e){return r(e,t,n)}));}function o$1(n){var r=n[Q];return r?r.i>3?r.i-4:r.i:Array.isArray(n)?1:s(n)?2:v(n)?3:0}function u$1(n,r){return 2===o$1(n)?n.has(r):Object.prototype.hasOwnProperty.call(n,r)}function a$1(n,r){return 2===o$1(n)?n.get(r):n[r]}function f(n,r,t){var e=o$1(n);2===e?n.set(r,t):3===e?n.add(t):n[r]=t;}function c$1(n,r){return n===r?0!==n||1/n==1/r:n!=n&&r!=r}function s(n){return X&&n instanceof Map}function v(n){return q&&n instanceof Set}function p(n){return n.o||n.t}function l(n){if(Array.isArray(n))return Array.prototype.slice.call(n);var r=rn(n);delete r[Q];for(var t=nn(r),e=0;e<t.length;e++){var i=t[e],o=r[i];!1===o.writable&&(o.writable=!0,o.configurable=!0),(o.get||o.set)&&(r[i]={configurable:!0,writable:!0,enumerable:o.enumerable,value:n[i]});}return Object.create(Object.getPrototypeOf(n),r)}function d(n,e){return void 0===e&&(e=!1),y(n)||r$1(n)||!t$3(n)||(o$1(n)>1&&(n.set=n.add=n.clear=n.delete=h),Object.freeze(n),e&&i$1(n,(function(n,r){return d(r,!0)}),!0)),n}function h(){n$1(2);}function y(n){return null==n||"object"!=typeof n||Object.isFrozen(n)}function b(r){var t=tn[r];return t||n$1(18,r),t}function m(n,r){tn[n]||(tn[n]=r);}function _(){return "production"===process.env.NODE_ENV||U||n$1(0),U}function j(n,r){r&&(b("Patches"),n.u=[],n.s=[],n.v=r);}function g(n){O(n),n.p.forEach(S),n.p=null;}function O(n){n===U&&(U=n.l);}function w(n){return U={p:[],l:U,h:n,m:!0,_:0}}function S(n){var r=n[Q];0===r.i||1===r.i?r.j():r.g=!0;}function P(r,e){e._=e.p.length;var i=e.p[0],o=void 0!==r&&r!==i;return e.h.O||b("ES5").S(e,r,o),o?(i[Q].P&&(g(e),n$1(4)),t$3(r)&&(r=M(e,r),e.l||x(e,r)),e.u&&b("Patches").M(i[Q].t,r,e.u,e.s)):r=M(e,i,[]),g(e),e.u&&e.v(e.u,e.s),r!==H?r:void 0}function M(n,r,t){if(y(r))return r;var e=r[Q];if(!e)return i$1(r,(function(i,o){return A(n,e,r,i,o,t)}),!0),r;if(e.A!==n)return r;if(!e.P)return x(n,e.t,!0),e.t;if(!e.I){e.I=!0,e.A._--;var o=4===e.i||5===e.i?e.o=l(e.k):e.o,u=o,a=!1;3===e.i&&(u=new Set(o),o.clear(),a=!0),i$1(u,(function(r,i){return A(n,e,o,r,i,t,a)})),x(n,o,!1),t&&n.u&&b("Patches").N(e,t,n.u,n.s);}return e.o}function A(e,i,o,a,c,s,v){if("production"!==process.env.NODE_ENV&&c===o&&n$1(5),r$1(c)){var p=M(e,c,s&&i&&3!==i.i&&!u$1(i.R,a)?s.concat(a):void 0);if(f(o,a,p),!r$1(p))return;e.m=!1;}else v&&o.add(c);if(t$3(c)&&!y(c)){if(!e.h.D&&e._<1)return;M(e,c),i&&i.A.l||x(e,c);}}function x(n,r,t){void 0===t&&(t=!1),!n.l&&n.h.D&&n.m&&d(r,t);}function z(n,r){var t=n[Q];return (t?p(t):n)[r]}function I(n,r){if(r in n)for(var t=Object.getPrototypeOf(n);t;){var e=Object.getOwnPropertyDescriptor(t,r);if(e)return e;t=Object.getPrototypeOf(t);}}function k(n){n.P||(n.P=!0,n.l&&k(n.l));}function E(n){n.o||(n.o=l(n.t));}function N(n,r,t){var e=s(r)?b("MapSet").F(r,t):v(r)?b("MapSet").T(r,t):n.O?function(n,r){var t=Array.isArray(n),e={i:t?1:0,A:r?r.A:_(),P:!1,I:!1,R:{},l:r,t:n,k:null,o:null,j:null,C:!1},i=e,o=en;t&&(i=[e],o=on);var u=Proxy.revocable(i,o),a=u.revoke,f=u.proxy;return e.k=f,e.j=a,f}(r,t):b("ES5").J(r,t);return (t?t.A:_()).p.push(e),e}function R(e){return r$1(e)||n$1(22,e),function n(r){if(!t$3(r))return r;var e,u=r[Q],c=o$1(r);if(u){if(!u.P&&(u.i<4||!b("ES5").K(u)))return u.t;u.I=!0,e=D(r,c),u.I=!1;}else e=D(r,c);return i$1(e,(function(r,t){u&&a$1(u.t,r)===t||f(e,r,n(t));})),3===c?new Set(e):e}(e)}function D(n,r){switch(r){case 2:return new Map(n);case 3:return Array.from(n)}return l(n)}function F(){function t(n,r){var t=s[n];return t?t.enumerable=r:s[n]=t={configurable:!0,enumerable:r,get:function(){var r=this[Q];return "production"!==process.env.NODE_ENV&&f(r),en.get(r,n)},set:function(r){var t=this[Q];"production"!==process.env.NODE_ENV&&f(t),en.set(t,n,r);}},t}function e(n){for(var r=n.length-1;r>=0;r--){var t=n[r][Q];if(!t.P)switch(t.i){case 5:a(t)&&k(t);break;case 4:o(t)&&k(t);}}}function o(n){for(var r=n.t,t=n.k,e=nn(t),i=e.length-1;i>=0;i--){var o=e[i];if(o!==Q){var a=r[o];if(void 0===a&&!u$1(r,o))return !0;var f=t[o],s=f&&f[Q];if(s?s.t!==a:!c$1(f,a))return !0}}var v=!!r[Q];return e.length!==nn(r).length+(v?0:1)}function a(n){var r=n.k;if(r.length!==n.t.length)return !0;var t=Object.getOwnPropertyDescriptor(r,r.length-1);if(t&&!t.get)return !0;for(var e=0;e<r.length;e++)if(!r.hasOwnProperty(e))return !0;return !1}function f(r){r.g&&n$1(3,JSON.stringify(p(r)));}var s={};m("ES5",{J:function(n,r){var e=Array.isArray(n),i=function(n,r){if(n){for(var e=Array(r.length),i=0;i<r.length;i++)Object.defineProperty(e,""+i,t(i,!0));return e}var o=rn(r);delete o[Q];for(var u=nn(o),a=0;a<u.length;a++){var f=u[a];o[f]=t(f,n||!!o[f].enumerable);}return Object.create(Object.getPrototypeOf(r),o)}(e,n),o={i:e?5:4,A:r?r.A:_(),P:!1,I:!1,R:{},l:r,t:n,k:i,o:null,g:!1,C:!1};return Object.defineProperty(i,Q,{value:o,writable:!0}),i},S:function(n,t,o){o?r$1(t)&&t[Q].A===n&&e(n.p):(n.u&&function n(r){if(r&&"object"==typeof r){var t=r[Q];if(t){var e=t.t,o=t.k,f=t.R,c=t.i;if(4===c)i$1(o,(function(r){r!==Q&&(void 0!==e[r]||u$1(e,r)?f[r]||n(o[r]):(f[r]=!0,k(t)));})),i$1(e,(function(n){void 0!==o[n]||u$1(o,n)||(f[n]=!1,k(t));}));else if(5===c){if(a(t)&&(k(t),f.length=!0),o.length<e.length)for(var s=o.length;s<e.length;s++)f[s]=!1;else for(var v=e.length;v<o.length;v++)f[v]=!0;for(var p=Math.min(o.length,e.length),l=0;l<p;l++)o.hasOwnProperty(l)||(f[l]=!0),void 0===f[l]&&n(o[l]);}}}}(n.p[0]),e(n.p));},K:function(n){return 4===n.i?o(n):a(n)}});}var G,U,W="undefined"!=typeof Symbol&&"symbol"==typeof Symbol("x"),X="undefined"!=typeof Map,q="undefined"!=typeof Set,B="undefined"!=typeof Proxy&&void 0!==Proxy.revocable&&"undefined"!=typeof Reflect,H=W?Symbol.for("immer-nothing"):((G={})["immer-nothing"]=!0,G),L=W?Symbol.for("immer-draftable"):"__$immer_draftable",Q=W?Symbol.for("immer-state"):"__$immer_state",Y={0:"Illegal state",1:"Immer drafts cannot have computed properties",2:"This object has been frozen and should not be mutated",3:function(n){return "Cannot use a proxy that has been revoked. Did you pass an object from inside an immer function to an async process? "+n},4:"An immer producer returned a new value *and* modified its draft. Either return a new value *or* modify the draft.",5:"Immer forbids circular references",6:"The first or second argument to `produce` must be a function",7:"The third argument to `produce` must be a function or undefined",8:"First argument to `createDraft` must be a plain object, an array, or an immerable object",9:"First argument to `finishDraft` must be a draft returned by `createDraft`",10:"The given draft is already finalized",11:"Object.defineProperty() cannot be used on an Immer draft",12:"Object.setPrototypeOf() cannot be used on an Immer draft",13:"Immer only supports deleting array indices",14:"Immer only supports setting array indices and the 'length' property",15:function(n){return "Cannot apply patch, path doesn't resolve: "+n},16:'Sets cannot have "replace" patches.',17:function(n){return "Unsupported patch operation: "+n},18:function(n){return "The plugin for '"+n+"' has not been loaded into Immer. To enable the plugin, import and call `enable"+n+"()` when initializing your application."},20:"Cannot use proxies if Proxy, Proxy.revocable or Reflect are not available",21:function(n){return "produce can only be called on things that are draftable: plain objects, arrays, Map, Set or classes that are marked with '[immerable]: true'. Got '"+n+"'"},22:function(n){return "'current' expects a draft, got: "+n},23:function(n){return "'original' expects a draft, got: "+n},24:"Patching reserved attributes like __proto__, prototype and constructor is not allowed"},Z=""+Object.prototype.constructor,nn="undefined"!=typeof Reflect&&Reflect.ownKeys?Reflect.ownKeys:void 0!==Object.getOwnPropertySymbols?function(n){return Object.getOwnPropertyNames(n).concat(Object.getOwnPropertySymbols(n))}:Object.getOwnPropertyNames,rn=Object.getOwnPropertyDescriptors||function(n){var r={};return nn(n).forEach((function(t){r[t]=Object.getOwnPropertyDescriptor(n,t);})),r},tn={},en={get:function(n,r){if(r===Q)return n;var e=p(n);if(!u$1(e,r))return function(n,r,t){var e,i=I(r,t);return i?"value"in i?i.value:null===(e=i.get)||void 0===e?void 0:e.call(n.k):void 0}(n,e,r);var i=e[r];return n.I||!t$3(i)?i:i===z(n.t,r)?(E(n),n.o[r]=N(n.A.h,i,n)):i},has:function(n,r){return r in p(n)},ownKeys:function(n){return Reflect.ownKeys(p(n))},set:function(n,r,t){var e=I(p(n),r);if(null==e?void 0:e.set)return e.set.call(n.k,t),!0;if(!n.P){var i=z(p(n),r),o=null==i?void 0:i[Q];if(o&&o.t===t)return n.o[r]=t,n.R[r]=!1,!0;if(c$1(t,i)&&(void 0!==t||u$1(n.t,r)))return !0;E(n),k(n);}return n.o[r]===t&&(void 0!==t||r in n.o)||Number.isNaN(t)&&Number.isNaN(n.o[r])||(n.o[r]=t,n.R[r]=!0),!0},deleteProperty:function(n,r){return void 0!==z(n.t,r)||r in n.t?(n.R[r]=!1,E(n),k(n)):delete n.R[r],n.o&&delete n.o[r],!0},getOwnPropertyDescriptor:function(n,r){var t=p(n),e=Reflect.getOwnPropertyDescriptor(t,r);return e?{writable:!0,configurable:1!==n.i||"length"!==r,enumerable:e.enumerable,value:t[r]}:e},defineProperty:function(){n$1(11);},getPrototypeOf:function(n){return Object.getPrototypeOf(n.t)},setPrototypeOf:function(){n$1(12);}},on={};i$1(en,(function(n,r){on[n]=function(){return arguments[0]=arguments[0][0],r.apply(this,arguments)};})),on.deleteProperty=function(r,t){return "production"!==process.env.NODE_ENV&&isNaN(parseInt(t))&&n$1(13),on.set.call(this,r,t,void 0)},on.set=function(r,t,e){return "production"!==process.env.NODE_ENV&&"length"!==t&&isNaN(parseInt(t))&&n$1(14),en.set.call(this,r[0],t,e,r[0])};var un=function(){function e(r){var e=this;this.O=B,this.D=!0,this.produce=function(r,i,o){if("function"==typeof r&&"function"!=typeof i){var u=i;i=r;var a=e;return function(n){var r=this;void 0===n&&(n=u);for(var t=arguments.length,e=Array(t>1?t-1:0),o=1;o<t;o++)e[o-1]=arguments[o];return a.produce(n,(function(n){var t;return (t=i).call.apply(t,[r,n].concat(e))}))}}var f;if("function"!=typeof i&&n$1(6),void 0!==o&&"function"!=typeof o&&n$1(7),t$3(r)){var c=w(e),s=N(e,r,void 0),v=!0;try{f=i(s),v=!1;}finally{v?g(c):O(c);}return "undefined"!=typeof Promise&&f instanceof Promise?f.then((function(n){return j(c,o),P(n,c)}),(function(n){throw g(c),n})):(j(c,o),P(f,c))}if(!r||"object"!=typeof r){if(void 0===(f=i(r))&&(f=r),f===H&&(f=void 0),e.D&&d(f,!0),o){var p=[],l=[];b("Patches").M(r,f,p,l),o(p,l);}return f}n$1(21,r);},this.produceWithPatches=function(n,r){if("function"==typeof n)return function(r){for(var t=arguments.length,i=Array(t>1?t-1:0),o=1;o<t;o++)i[o-1]=arguments[o];return e.produceWithPatches(r,(function(r){return n.apply(void 0,[r].concat(i))}))};var t,i,o=e.produce(n,r,(function(n,r){t=n,i=r;}));return "undefined"!=typeof Promise&&o instanceof Promise?o.then((function(n){return [n,t,i]})):[o,t,i]},"boolean"==typeof(null==r?void 0:r.useProxies)&&this.setUseProxies(r.useProxies),"boolean"==typeof(null==r?void 0:r.autoFreeze)&&this.setAutoFreeze(r.autoFreeze);}var i=e.prototype;return i.createDraft=function(e){t$3(e)||n$1(8),r$1(e)&&(e=R(e));var i=w(this),o=N(this,e,void 0);return o[Q].C=!0,O(i),o},i.finishDraft=function(r,t){var e=r&&r[Q];"production"!==process.env.NODE_ENV&&(e&&e.C||n$1(9),e.I&&n$1(10));var i=e.A;return j(i,t),P(void 0,i)},i.setAutoFreeze=function(n){this.D=n;},i.setUseProxies=function(r){r&&!B&&n$1(20),this.O=r;},i.applyPatches=function(n,t){var e;for(e=t.length-1;e>=0;e--){var i=t[e];if(0===i.path.length&&"replace"===i.op){n=i.value;break}}e>-1&&(t=t.slice(e+1));var o=b("Patches").$;return r$1(n)?o(n,t):this.produce(n,(function(n){return o(n,t)}))},e}(),an=new un,fn=an.produce;an.produceWithPatches.bind(an);an.setAutoFreeze.bind(an);an.setUseProxies.bind(an);an.applyPatches.bind(an);an.createDraft.bind(an);an.finishDraft.bind(an);var createNextState3 = fn;
 
 function _typeof(o) {
   "@babel/helpers - typeof";
@@ -1577,6 +1577,65 @@ function isPlainObject(value) {
     }
     return proto === baseProto;
 }
+// src/tsHelpers.ts
+var hasMatchFunction = function (v) {
+    return v && typeof v.match === "function";
+};
+// src/createAction.ts
+function createAction(type, prepareAction) {
+    function actionCreator() {
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+        if (prepareAction) {
+            var prepared = prepareAction.apply(void 0, args);
+            if (!prepared) {
+                throw new Error("prepareAction did not return an object");
+            }
+            return __spreadValues(__spreadValues({
+                type: type,
+                payload: prepared.payload
+            }, "meta" in prepared && { meta: prepared.meta }), "error" in prepared && { error: prepared.error });
+        }
+        return { type: type, payload: args[0] };
+    }
+    actionCreator.toString = function () { return "" + type; };
+    actionCreator.type = type;
+    actionCreator.match = function (action) { return action.type === type; };
+    return actionCreator;
+}
+function isAction(action) {
+    return isPlainObject(action) && "type" in action;
+}
+function isActionCreator(action) {
+    return typeof action === "function" && "type" in action && hasMatchFunction(action);
+}
+function isFSA(action) {
+    return isAction(action) && typeof action.type === "string" && Object.keys(action).every(isValidKey);
+}
+function isValidKey(key) {
+    return ["type", "payload", "error", "meta"].indexOf(key) > -1;
+}
+// src/actionCreatorInvariantMiddleware.ts
+function getMessage(type) {
+    var splitType = type ? ("" + type).split("/") : [];
+    var actionName = splitType[splitType.length - 1] || "actionCreator";
+    return "Detected an action creator with type \"" + (type || "unknown") + "\" being dispatched. \nMake sure you're calling the action creator before dispatching, i.e. `dispatch(" + actionName + "())` instead of `dispatch(" + actionName + ")`. This is necessary even if the action has no payload.";
+}
+function createActionCreatorInvariantMiddleware(options) {
+    if (options === void 0) { options = {}; }
+    if (process.env.NODE_ENV === "production") {
+        return function () { return function (next) { return function (action) { return next(action); }; }; };
+    }
+    var _c = options.isActionCreator, isActionCreator2 = _c === void 0 ? isActionCreator : _c;
+    return function () { return function (next) { return function (action) {
+        if (isActionCreator2(action)) {
+            console.warn(getMessage(action.type));
+        }
+        return next(action);
+    }; }; };
+}
 function getTimeMeasureUtils(maxDelay, fnName) {
     var elapsed = 0;
     return {
@@ -1672,7 +1731,7 @@ var EnhancerArray = /** @class */ (function (_super) {
     return EnhancerArray;
 }(Array));
 function freezeDraftable(val) {
-    return t$3(val) ? produce(val, function () {
+    return t$3(val) ? createNextState3(val, function () {
     }) : val;
 }
 // src/immutableStateInvariantMiddleware.ts
@@ -1722,11 +1781,13 @@ function trackForMutations(isImmutable, ignorePaths, obj) {
         }
     };
 }
-function trackProperties(isImmutable, ignorePaths, obj, path) {
+function trackProperties(isImmutable, ignorePaths, obj, path, checkedObjects) {
     if (ignorePaths === void 0) { ignorePaths = []; }
     if (path === void 0) { path = ""; }
+    if (checkedObjects === void 0) { checkedObjects = new Set(); }
     var tracked = { value: obj };
-    if (!isImmutable(obj)) {
+    if (!isImmutable(obj) && !checkedObjects.has(obj)) {
+        checkedObjects.add(obj);
         tracked.children = {};
         for (var key in obj) {
             var childPath = path ? path + "." + key : key;
@@ -1931,7 +1992,7 @@ function curryGetDefaultMiddleware() {
 }
 function getDefaultMiddleware(options) {
     if (options === void 0) { options = {}; }
-    var _c = options.thunk, thunk = _c === void 0 ? true : _c, _d = options.immutableCheck, immutableCheck = _d === void 0 ? true : _d, _e = options.serializableCheck, serializableCheck = _e === void 0 ? true : _e;
+    var _c = options.thunk, thunk = _c === void 0 ? true : _c, _d = options.immutableCheck, immutableCheck = _d === void 0 ? true : _d, _e = options.serializableCheck, serializableCheck = _e === void 0 ? true : _e, _f = options.actionCreatorCheck, actionCreatorCheck = _f === void 0 ? true : _f;
     var middlewareArray = new MiddlewareArray();
     if (thunk) {
         if (isBoolean(thunk)) {
@@ -1956,6 +2017,13 @@ function getDefaultMiddleware(options) {
             }
             middlewareArray.push(createSerializableStateInvariantMiddleware(serializableOptions));
         }
+        if (actionCreatorCheck) {
+            var actionCreatorOptions = {};
+            if (!isBoolean(actionCreatorCheck)) {
+                actionCreatorOptions = actionCreatorCheck;
+            }
+            middlewareArray.unshift(createActionCreatorInvariantMiddleware(actionCreatorOptions));
+        }
     }
     return middlewareArray;
 }
@@ -2002,39 +2070,6 @@ function configureStore(options) {
     var composedEnhancer = finalCompose.apply(void 0, storeEnhancers);
     return createStore(rootReducer, preloadedState, composedEnhancer);
 }
-// src/createAction.ts
-function createAction(type, prepareAction) {
-    function actionCreator() {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        if (prepareAction) {
-            var prepared = prepareAction.apply(void 0, args);
-            if (!prepared) {
-                throw new Error("prepareAction did not return an object");
-            }
-            return __spreadValues(__spreadValues({
-                type: type,
-                payload: prepared.payload
-            }, "meta" in prepared && { meta: prepared.meta }), "error" in prepared && { error: prepared.error });
-        }
-        return { type: type, payload: args[0] };
-    }
-    actionCreator.toString = function () { return "" + type; };
-    actionCreator.type = type;
-    actionCreator.match = function (action) { return action.type === type; };
-    return actionCreator;
-}
-function isAction(action) {
-    return isPlainObject(action) && "type" in action;
-}
-function isFSA(action) {
-    return isAction(action) && typeof action.type === "string" && Object.keys(action).every(isValidKey);
-}
-function isValidKey(key) {
-    return ["type", "payload", "error", "meta"].indexOf(key) > -1;
-}
 // src/mapBuilders.ts
 function executeReducerBuilderCallback(builderCallback) {
     var actionsMap = {};
@@ -2051,8 +2086,11 @@ function executeReducerBuilderCallback(builderCallback) {
                 }
             }
             var type = typeof typeOrActionCreator === "string" ? typeOrActionCreator : typeOrActionCreator.type;
+            if (!type) {
+                throw new Error("`builder.addCase` cannot be called with an empty action type");
+            }
             if (type in actionsMap) {
-                throw new Error("addCase cannot be called with two reducers for the same action type");
+                throw new Error("`builder.addCase` cannot be called with two reducers for the same action type");
             }
             actionsMap[type] = reducer;
             return builder;
@@ -2138,7 +2176,7 @@ function createReducer(initialState, mapOrBuilderCallback, actionMatchers, defau
                     return result;
                 }
                 else {
-                    return produce(previousState, function (draft) {
+                    return createNextState3(previousState, function (draft) {
                         return caseReducer(draft, action);
                     });
                 }
@@ -2294,7 +2332,7 @@ function createStateOperator(mutator) {
             return state;
         }
         else {
-            return produce(state, runMutator);
+            return createNextState3(state, runMutator);
         }
     };
 }
@@ -9564,32 +9602,13 @@ var filterNonTimeDimensions = function filterNonTimeDimensions(dimensions) {
     return dim.name !== 'time';
   }) : [];
 };
-/**
- * Returns geoJSON based on type and multipleShapes
- * @param geoJSON: GeoJSON.FeatureCollection
- * @param shouldAllowMultipleshapes: boolean
- */
-var getGeoJson = function getGeoJson(geojson, shouldAllowMultipleshapes) {
-  if (shouldAllowMultipleshapes || !geojson.features.length) {
-    return geojson;
-  }
-  var geometry = geojson.features[0].geometry;
-  if (geometry.type === 'Point' || geometry.type === 'LineString') {
-    return geojson;
-  }
-  return geometry.coordinates.length > 1 ? produce(geojson, function (draft) {
-    var draftFeature = draft.features[0];
-    draftFeature.geometry.coordinates = [draftFeature.geometry.coordinates[1]];
-  }) : geojson;
-};
 
 var utils$2 = /*#__PURE__*/Object.freeze({
   __proto__: null,
   isActionLayerSynced: isActionLayerSynced,
   produceDimensionActionForMapLayer: produceDimensionActionForMapLayer,
   produceDraftStateForAllLayersForDimensionWithinMap: produceDraftStateForAllLayersForDimensionWithinMap,
-  filterNonTimeDimensions: filterNonTimeDimensions,
-  getGeoJson: getGeoJson
+  filterNonTimeDimensions: filterNonTimeDimensions
 });
 
 /* *
@@ -10086,26 +10105,42 @@ var slice$9 = createSlice({
         layerId = _action$payload16.layerId,
         geojson = _action$payload16.geojson,
         _action$payload16$sho = _action$payload16.shouldAllowMultipleShapes,
-        shouldAllowMultipleShapes = _action$payload16$sho === void 0 ? false : _action$payload16$sho;
-      if (!draft.byId[layerId]) {
+        shouldAllowMultipleShapes = _action$payload16$sho === void 0 ? false : _action$payload16$sho,
+        _action$payload16$rea = _action$payload16.reason,
+        reason = _action$payload16$rea === void 0 ? '' : _action$payload16$rea;
+      var currentLayer = draft.byId[layerId];
+      if (!currentLayer) {
         return;
       }
-      var geoJSON = getGeoJson(geojson, shouldAllowMultipleShapes);
-      draft.byId[layerId].geojson = geoJSON;
+      var updatedGeoJSON = getGeoJson(geojson, shouldAllowMultipleShapes);
+      if (shouldAllowMultipleShapes) {
+        var _current = R(currentLayer),
+          currentGeoJSON = _current.geojson,
+          _current$selectedFeat = _current.selectedFeatureIndex,
+          selectedFeatureIndex = _current$selectedFeat === void 0 ? 0 : _current$selectedFeat;
+        var newFeatureIndex = moveFeature(currentGeoJSON, updatedGeoJSON, selectedFeatureIndex, reason);
+        if (newFeatureIndex !== undefined) {
+          currentLayer.selectedFeatureIndex = newFeatureIndex;
+        }
+      }
+      currentLayer.geojson = updatedGeoJSON;
     },
     updateFeatureProperties: function updateFeatureProperties(draft, action) {
       var _action$payload17 = action.payload,
         layerId = _action$payload17.layerId,
-        properties = _action$payload17.properties;
+        properties = _action$payload17.properties,
+        selectedFeatureIndex = _action$payload17.selectedFeatureIndex;
       var currentLayer = draft.byId[layerId];
       if (!currentLayer) {
         return;
       }
       if (currentLayer.geojson && currentLayer.geojson.features.length) {
         currentLayer.geojson.features.forEach(function (_, index) {
-          Object.keys(properties).forEach(function (key) {
-            draft.byId[layerId].geojson.features[index].properties[key] = properties[key];
-          });
+          if (selectedFeatureIndex === undefined || selectedFeatureIndex === index) {
+            Object.keys(properties).forEach(function (key) {
+              draft.byId[layerId].geojson.features[index].properties[key] = properties[key];
+            });
+          }
         });
       }
     },
@@ -10125,19 +10160,24 @@ var slice$9 = createSlice({
       }
     },
     exitFeatureDrawMode: function exitFeatureDrawMode(draft, action) {
-      var layerId = action.payload.layerId;
+      var _action$payload19 = action.payload,
+        layerId = _action$payload19.layerId,
+        shouldAllowMultipleShapes = _action$payload19.shouldAllowMultipleShapes,
+        reason = _action$payload19.reason;
       if (!draft.byId[layerId]) {
         return;
       }
-      draft.byId[layerId].isInEditMode = false;
-      draft.byId[layerId].drawMode = '';
+      if (!shouldAllowMultipleShapes || shouldAllowMultipleShapes && reason === 'escaped') {
+        draft.byId[layerId].isInEditMode = false;
+        draft.byId[layerId].drawMode = '';
+      }
     }
   },
   extraReducers: function extraReducers(builder) {
     builder.addCase(setTimeSync, function (draft, action) {
-      var _action$payload19 = action.payload,
-        targetsFromAction = _action$payload19.targets,
-        source = _action$payload19.source;
+      var _action$payload20 = action.payload,
+        targetsFromAction = _action$payload20.targets,
+        source = _action$payload20.source;
       /* Because we want backwards compatibility with the previous code, we also need to listen to the original source action */
       var targets = [{
         targetId: source.payload.sourceId,
@@ -10161,9 +10201,9 @@ var slice$9 = createSlice({
        * These targets can be used as payloads in new Layer actions.
        * These actions are here handled via the layer reducer, as it is the same logic
        */
-      var _action$payload20 = action.payload,
-        targets = _action$payload20.targets,
-        source = _action$payload20.source;
+      var _action$payload21 = action.payload,
+        targets = _action$payload21.targets,
+        source = _action$payload21.source;
       var state = R(draft);
       return targets.reduce(function (prevState, target) {
         var action = {
@@ -27654,7 +27694,8 @@ var getLayerEnabled = createSelector(getLayerById, function (layer) {
  * @returns {string} returnType: string -  layer name
  */
 var getLayerName = createSelector(getLayerById, function (layer) {
-  return layer && layer.name && layer.name.length > 0 ? layer.name : '';
+  var _a;
+  return (_a = layer === null || layer === void 0 ? void 0 : layer.name) !== null && _a !== void 0 ? _a : '';
 });
 /**
  * Gets layer service
@@ -27665,7 +27706,8 @@ var getLayerName = createSelector(getLayerById, function (layer) {
  * @returns {string} returnType: string -  layer service
  */
 var getLayerService = createSelector(getLayerById, function (layer) {
-  return layer && layer.service ? layer.service : '';
+  var _a;
+  return (_a = layer === null || layer === void 0 ? void 0 : layer.service) !== null && _a !== void 0 ? _a : '';
 });
 /**
  * Gets selected style of the passed layer
@@ -27736,9 +27778,10 @@ var getIsLayerInEditMode = createSelector(getLayerById, function (layer) {
 var getFeatureLayerGeoJSON = createSelector(getLayerById, function (layer) {
   return (layer === null || layer === void 0 ? void 0 : layer.geojson) || undefined;
 });
-var getFeatureLayerGeoJSONProperties = createSelector(getLayerById, function (layer) {
+var getFeatureLayerGeoJSONProperties = createSelector(getLayerById, getSelectedFeatureIndex, function (layer) {
+  var selecteFeatureIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   var _a, _b;
-  return ((_b = (_a = layer === null || layer === void 0 ? void 0 : layer.geojson) === null || _a === void 0 ? void 0 : _a.features[0]) === null || _b === void 0 ? void 0 : _b.properties) || {};
+  return ((_b = (_a = layer === null || layer === void 0 ? void 0 : layer.geojson) === null || _a === void 0 ? void 0 : _a.features[selecteFeatureIndex]) === null || _b === void 0 ? void 0 : _b.properties) || {};
 });
 /**
  * Gets layerIds that contain passed dimension
@@ -27771,19 +27814,21 @@ var getLayerIsInsideAcceptanceTime = createSelector(getAcceptanceTimeInMinutes,
     return dimension.name === 'time';
   })) === null || _d === void 0 ? void 0 : _d.currentValue;
 }, function (acceptanceTimeInMinutes, layerCurrentTime, mapCurrentTime) {
-  if (acceptanceTimeInMinutes === undefined || !mapCurrentTime || !layerCurrentTime) {
+  if (!mapCurrentTime || !layerCurrentTime) {
     return 'equal';
   }
   var mapTime = new Date(mapCurrentTime).getTime();
   var layerTime = new Date(layerCurrentTime).getTime();
-  var millisecondsBetween = mapTime - layerTime;
-  var acceptanceTimeInMilliseconds = acceptanceTimeInMinutes * 60000;
-  if (Math.abs(millisecondsBetween) > acceptanceTimeInMilliseconds) {
-    return 'outside';
-  }
   if (mapTime === layerTime) {
     return 'equal';
   }
+  if (acceptanceTimeInMinutes !== undefined) {
+    var millisecondsBetween = mapTime - layerTime;
+    var acceptanceTimeInMilliseconds = acceptanceTimeInMinutes * 60000;
+    if (Math.abs(millisecondsBetween) > acceptanceTimeInMilliseconds) {
+      return 'outside';
+    }
+  }
   return 'inside';
 });
 
@@ -28884,7 +28929,6 @@ var DialogTypes;
   DialogTypes["LayerSelect"] = "layerSelect";
   DialogTypes["DrawingTool"] = "drawingTool";
   DialogTypes["DockedLayerManager"] = "dockedLayerManager";
-  DialogTypes["DockedDrawingTool"] = "dockedDrawingTool";
   DialogTypes["ObjectManager"] = "objectManager";
   DialogTypes["PublicWarnings"] = "publicWarnings";
 })(DialogTypes || (DialogTypes = {}));
@@ -29354,7 +29398,8 @@ var syncGroupGetViewState = createSelector(syncGroupStore, function (store) {
   return store.viewState;
 });
 var getSyncedMapIdsForTimeslider = createSelector(syncGroupStore, function (store) {
-  return store.viewState.timeslider.groups[0].selected;
+  var _a, _b;
+  return (_b = (_a = store.viewState.timeslider.groups[0]) === null || _a === void 0 ? void 0 : _a.selected) !== null && _b !== void 0 ? _b : [];
 }, selectorMemoizationOptions);
 var getSyncGroupTargets = createSelector(syncGroupStore, function (store) {
   if (!store || !store.groups) {
@@ -29987,8 +30032,12 @@ var getMapTimeSliderCenterTime = createSelector(getMapById, function (store) {
  * @param {string} mapId mapId: string - Id of the map
  * @returns {number} returnType: number - unfiltered selected time as a unix timestamp
  */
-var getTimeSliderUnfilteredSelectedTime = createSelector(getMapById, function (store) {
-  return store ? store.timeSliderUnfilteredSelectedTime : null;
+var getTimeSliderUnfilteredSelectedTime = createSelector(getMapById, getSelectedTime, function (store, selectedTime) {
+  var _a;
+  if (!store) {
+    return undefined;
+  }
+  return (_a = store.timeSliderUnfilteredSelectedTime) !== null && _a !== void 0 ? _a : selectedTime;
 });
 /**
  * Returns the number of seconds per pixel on the time slider
@@ -30518,8 +30567,8 @@ var serviceActions = slice$5.actions;
  * Copyright 2020 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
  * Copyright 2020 - Finnish Meteorological Institute (FMI)
  * */
-var servicesStore = function servicesStore(store) {
-  return store && store.services ? store.services : null;
+var getServicesStore = function getServicesStore(store) {
+  return store === null || store === void 0 ? void 0 : store.services;
 };
 /**
  * Retrieves all serviceIds
@@ -30528,8 +30577,9 @@ var servicesStore = function servicesStore(store) {
  * @param {object} store store: object - object from which the service state will be extracted
  * @returns {array} returnType: array - an array of all serviceIds
  */
-var getServiceIds = createSelector(servicesStore, function (serviceState) {
-  return serviceState ? serviceState.allIds : [];
+var getServiceIds = createSelector(getServicesStore, function (serviceState) {
+  var _a;
+  return (_a = serviceState === null || serviceState === void 0 ? void 0 : serviceState.allIds) !== null && _a !== void 0 ? _a : [];
 }, selectorMemoizationOptions);
 /**
  * Gets map services
@@ -30538,8 +30588,9 @@ var getServiceIds = createSelector(servicesStore, function (serviceState) {
  * @param {object} store store: object - Store object
  * @returns {object} returnType: ServiceState
  */
-var getServices = createSelector(servicesStore, function (store) {
-  return store ? store.byId : {};
+var getServices = createSelector(getServicesStore, function (store) {
+  var _a;
+  return (_a = store === null || store === void 0 ? void 0 : store.byId) !== null && _a !== void 0 ? _a : {};
 }, selectorMemoizationOptions);
 /**
  * Gets the service object by its url
@@ -30548,18 +30599,15 @@ var getServices = createSelector(servicesStore, function (store) {
  * @param {object} store store: object - Store object
  * @returns {ReduxService} returnType: Service
  */
-var getServiceByName = createSelector([servicesStore, function (state, serviceUrl) {
+var getServiceByUrl = createSelector(getServicesStore, function (state, serviceUrl) {
   return serviceUrl;
-}], function (serviceState, serviceUrl) {
-  var foundServiceIndex = serviceState.allIds.findIndex(function (id) {
-    return serviceState.byId[id].serviceUrl === serviceUrl;
-  });
-  /* Add the service based on a url */
-  var id = foundServiceIndex !== -1 ? serviceState.allIds[foundServiceIndex] : null;
-  if (serviceState && serviceState.byId && serviceState.byId[id]) {
-    return serviceState.byId[id];
+}, function (serviceState, serviceUrl) {
+  if (!serviceState) {
+    return undefined;
   }
-  return null;
+  return Object.values(serviceState.byId).find(function (service) {
+    return service.serviceUrl === serviceUrl;
+  });
 }, selectorMemoizationOptions);
 /**
  * Gets the layer from the store using the serviceUrl and layerName
@@ -30569,8 +30617,9 @@ var getServiceByName = createSelector([servicesStore, function (state, serviceUr
  * @param {string}  serviceUrl serviceUrl: string - Url of the service where the layer belongs to
  * @returns {array} returnType: ServiceLayer[] - All layers within the service object.
  */
-var getLayersFromServiceSelector = createSelector(getServiceByName, function (service) {
-  return service && service.layers || null;
+var getLayersFromServiceSelector = createSelector(getServiceByUrl, function (service) {
+  var _a;
+  return (_a = service === null || service === void 0 ? void 0 : service.layers) !== null && _a !== void 0 ? _a : [];
 }, selectorMemoizationOptions);
 /**
  * Gets the layer from the store using the serviceUrl and layerName
@@ -30581,23 +30630,12 @@ var getLayersFromServiceSelector = createSelector(getServiceByName, function (se
  * @param {string}  layerName layerName: string - Name of the layer in the service
  * @returns {ServiceLayer} returnType: ServiceLayer - The layer from the service object.
  */
-var getLayerFromService = createSelector(function (store, serviceUrl) {
-  return getLayersFromServiceSelector(store, serviceUrl);
-}, function (store, serviceUrl) {
-  return serviceUrl;
-}, function (store, serviceUrl, layerName) {
+var getLayerFromService = createSelector(getLayersFromServiceSelector, function (_store, _serviceUrl, layerName) {
   return layerName;
-}, function (layers, serviceUrl, layerName) {
-  if (!layers) {
-    return null;
-  }
-  var index = layers.findIndex(function (serviceLayer) {
+}, function (layers, layerName) {
+  return layers.find(function (serviceLayer) {
     return serviceLayer.name === layerName;
   });
-  if (index === -1) {
-    return null;
-  }
-  return layers[index];
 }, selectorMemoizationOptions);
 /**
  * Gets the layers stylelist from the servicestore using the serviceUrl and layerName
@@ -30609,14 +30647,15 @@ var getLayerFromService = createSelector(function (store, serviceUrl) {
  * @returns {array} returnType: Style[] - array containing layer styles
  */
 var getLayerStyles = createSelector(getLayerFromService, function (layer) {
-  return layer && layer.styles ? layer.styles : [];
+  var _a;
+  return (_a = layer === null || layer === void 0 ? void 0 : layer.styles) !== null && _a !== void 0 ? _a : [];
 }, selectorMemoizationOptions);
 
 var selectors$3 = /*#__PURE__*/Object.freeze({
   __proto__: null,
   getServiceIds: getServiceIds,
   getServices: getServices,
-  getServiceByName: getServiceByName,
+  getServiceByUrl: getServiceByUrl,
   getLayersFromServiceSelector: getLayersFromServiceSelector,
   getLayerFromService: getLayerFromService,
   getLayerStyles: getLayerStyles
@@ -33308,25 +33347,27 @@ function toggleAutoUpdateSaga(_ref5) {
     return _regeneratorRuntime().wrap(function _callee5$(_context6) {
       while (1) switch (_context6.prev = _context6.next) {
         case 0:
-          _context6.prev = 0;
           shouldAutoUpdate = payload.shouldAutoUpdate, mapId = payload.mapId;
-          if (!shouldAutoUpdate) {
-            _context6.next = 24;
+          if (shouldAutoUpdate) {
+            _context6.next = 3;
             break;
           }
-          _context6.next = 5;
+          return _context6.abrupt("return");
+        case 3:
+          _context6.prev = 3;
+          _context6.next = 6;
           return select(getAutoUpdateLayerId, mapId);
-        case 5:
+        case 6:
           autoUpdateLayerId = _context6.sent;
-          _context6.next = 8;
+          _context6.next = 9;
           return select(getLayerTimeDimension, autoUpdateLayerId);
-        case 8:
+        case 9:
           timeDimension = _context6.sent;
-          if (!(timeDimension && timeDimension.maxValue)) {
-            _context6.next = 24;
+          if (!(timeDimension === null || timeDimension === void 0 ? void 0 : timeDimension.maxValue)) {
+            _context6.next = 25;
             break;
           }
-          _context6.next = 12;
+          _context6.next = 13;
           return put(layerActions.layerChangeDimension({
             layerId: autoUpdateLayerId,
             origin: LayerActionOrigin.toggleAutoUpdateSaga,
@@ -33335,16 +33376,16 @@ function toggleAutoUpdateSaga(_ref5) {
               currentValue: timeDimension.maxValue
             }
           }));
-        case 12:
-          _context6.next = 14;
+        case 13:
+          _context6.next = 15;
           return select(getSyncedMapIdsForTimeslider);
-        case 14:
+        case 15:
           syncedMapIds = _context6.sent;
           if (!(syncedMapIds.length > 0)) {
-            _context6.next = 22;
+            _context6.next = 23;
             break;
           }
-          _context6.next = 18;
+          _context6.next = 19;
           return all(syncedMapIds.map(function (syncedMapId) {
             return put(setTime({
               origin: 'mapStore saga',
@@ -33352,7 +33393,7 @@ function toggleAutoUpdateSaga(_ref5) {
               value: timeDimension.maxValue
             }));
           }));
-        case 18:
+        case 19:
           // When timesliders are synced by syncgrous autoupdate is toggled on, toggle autoupdate off for other timesliders
           payloads = syncedMapIds.reduce(function (syncedMapIdList, syncedMapId) {
             if (syncedMapId !== mapId) {
@@ -33364,29 +33405,29 @@ function toggleAutoUpdateSaga(_ref5) {
             return syncedMapIdList;
           }, []);
           if (!(payloads.length > 0)) {
-            _context6.next = 22;
+            _context6.next = 23;
             break;
           }
-          _context6.next = 22;
+          _context6.next = 23;
           return all(payloads.map(function (payload) {
             return put(mapActions.toggleAutoUpdate(payload));
           }));
-        case 22:
-          _context6.next = 24;
+        case 23:
+          _context6.next = 25;
           return call(updateAnimation, mapId, timeDimension.maxValue);
-        case 24:
-          _context6.next = 29;
+        case 25:
+          _context6.next = 30;
           break;
-        case 26:
-          _context6.prev = 26;
-          _context6.t0 = _context6["catch"](0);
+        case 27:
+          _context6.prev = 27;
+          _context6.t0 = _context6["catch"](3);
           // eslint-disable-next-line no-console
           console.warn(_context6.t0);
-        case 29:
+        case 30:
         case "end":
           return _context6.stop();
       }
-    }, _callee5, null, [[0, 26]]);
+    }, _callee5, null, [[3, 27]]);
   })();
 }
 function handleBaseLayersSaga(mapId, baseLayers) {
@@ -35369,12 +35410,15 @@ var slice = createSlice({
         drawToolId = _action$payload.drawToolId,
         drawModes = _action$payload.drawModes,
         _action$payload$geoJS = _action$payload.geoJSONLayerId,
-        geoJSONLayerId = _action$payload$geoJS === void 0 ? '' : _action$payload$geoJS;
+        geoJSONLayerId = _action$payload$geoJS === void 0 ? '' : _action$payload$geoJS,
+        _action$payload$shoul = _action$payload.shouldAllowMultipleShapes,
+        shouldAllowMultipleShapes = _action$payload$shoul === void 0 ? false : _action$payload$shoul;
       drawAdapter.addOne(draft, {
         drawToolId: drawToolId,
         geoJSONLayerId: geoJSONLayerId,
         activeDrawModeId: '',
-        drawModes: drawModes
+        drawModes: drawModes,
+        shouldAllowMultipleShapes: shouldAllowMultipleShapes
       });
     },
     unregisterDrawTool: function unregisterDrawTool(draft, action) {
@@ -35386,7 +35430,9 @@ var slice = createSlice({
     changeDrawToolMode: function changeDrawToolMode(draft, action) {
       var _action$payload2 = action.payload,
         drawModeId = _action$payload2.drawModeId,
-        drawToolId = _action$payload2.drawToolId;
+        drawToolId = _action$payload2.drawToolId,
+        _action$payload2$shou = _action$payload2.shouldUpdateShape,
+        shouldUpdateShape = _action$payload2$shou === void 0 ? true : _action$payload2$shou;
       var drawTool = draft.entities[drawToolId];
       if (!drawTool) {
         return;
@@ -35398,7 +35444,7 @@ var slice = createSlice({
         drawTool.activeDrawModeId = '';
         return;
       }
-      if ((drawTool === null || drawTool === void 0 ? void 0 : drawTool.activeDrawModeId) !== drawModeId) {
+      if ((drawTool === null || drawTool === void 0 ? void 0 : drawTool.activeDrawModeId) !== drawModeId || !shouldUpdateShape) {
         drawTool.activeDrawModeId = drawModeId;
       } else {
         drawTool.activeDrawModeId = '';
@@ -35417,16 +35463,22 @@ var slice = createSlice({
   },
   extraReducers: function extraReducers(builder) {
     builder.addCase(layerActions.exitFeatureDrawMode, function (draft, action) {
-      var layerId = action.payload.layerId;
+      var _action$payload4 = action.payload,
+        layerId = _action$payload4.layerId,
+        shouldAllowMultipleShapes = _action$payload4.shouldAllowMultipleShapes,
+        reason = _action$payload4.reason;
       var drawToolId = getDrawToolByLayerId(draft, layerId);
-      if (drawToolId && draft.entities[drawToolId] !== undefined) {
+      if (!drawToolId || drawToolId && !draft.entities[drawToolId]) {
+        return;
+      }
+      if (!shouldAllowMultipleShapes || shouldAllowMultipleShapes && reason === 'escaped') {
         draft.entities[drawToolId].activeDrawModeId = '';
       }
     }).addCase(layerActions.updateFeatureProperties, function (draft, action) {
       var _a;
-      var _action$payload4 = action.payload,
-        properties = _action$payload4.properties,
-        layerId = _action$payload4.layerId;
+      var _action$payload5 = action.payload,
+        properties = _action$payload5.properties,
+        layerId = _action$payload5.layerId;
       var drawToolId = getDrawToolByLayerId(draft, layerId);
       var entity = draft.entities[drawToolId];
       if (drawToolId && entity !== undefined) {
@@ -35521,11 +35573,11 @@ var _marked$3 = /*#__PURE__*/_regeneratorRuntime().mark(drawingSaga);
 function registerDrawToolSaga(_ref) {
   var payload = _ref.payload;
   return /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var mapId, geoJSONLayerId;
+    var mapId, geoJSONLayerId, _payload$defaultGeoJS, defaultGeoJSON;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          mapId = payload.mapId, geoJSONLayerId = payload.geoJSONLayerId; // create for every drawTool a draw layer
+          mapId = payload.mapId, geoJSONLayerId = payload.geoJSONLayerId, _payload$defaultGeoJS = payload.defaultGeoJSON, defaultGeoJSON = _payload$defaultGeoJS === void 0 ? emptyGeoJSON : _payload$defaultGeoJS; // create for every drawTool a draw layer
           if (!(geoJSONLayerId && mapId)) {
             _context.next = 4;
             break;
@@ -35535,7 +35587,7 @@ function registerDrawToolSaga(_ref) {
             mapId: mapId,
             layer: {
               // empty geoJSON
-              geojson: emptyGeoJSON,
+              geojson: defaultGeoJSON,
               layerType: LayerType.featureLayer
             },
             layerId: geoJSONLayerId,
@@ -35551,25 +35603,26 @@ function registerDrawToolSaga(_ref) {
 function changeDrawToolSaga(_ref2) {
   var payload = _ref2.payload;
   return /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var _a, _b, _c, _d, drawModeId, drawToolId, drawingTool, newDrawMode, currentGeoJSONLayer, currentSelectionType, newSelectionType;
+    var _a, _b, _c, _d, drawModeId, drawToolId, _payload$shouldUpdate, shouldUpdateShape, drawingTool, shouldAllowMultipleShapes, newDrawMode, currentGeoJSONLayer, _ref3, currentGeoJSON, _ref3$selectedFeature, selectedFeatureIndex, currentSelectionType, newSelectionType, isNewToolSelected, shouldUpdateNewShape, geoJSONFeatureCollection, newGeoJSON;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           _context2.prev = 0;
-          drawModeId = payload.drawModeId, drawToolId = payload.drawToolId;
+          drawModeId = payload.drawModeId, drawToolId = payload.drawToolId, _payload$shouldUpdate = payload.shouldUpdateShape, shouldUpdateShape = _payload$shouldUpdate === void 0 ? true : _payload$shouldUpdate;
           _context2.next = 4;
           return select(selectDrawToolById, drawToolId);
         case 4:
           drawingTool = _context2.sent;
-          _context2.next = 7;
+          shouldAllowMultipleShapes = drawingTool.shouldAllowMultipleShapes;
+          _context2.next = 8;
           return select(getDrawModeById, drawToolId, drawModeId);
-        case 7:
+        case 8:
           newDrawMode = _context2.sent;
           if (!(newDrawMode.value === 'DELETE')) {
-            _context2.next = 12;
+            _context2.next = 15;
             break;
           }
-          _context2.next = 11;
+          _context2.next = 12;
           return put(layerActions.layerChangeGeojson({
             layerId: drawingTool.geoJSONLayerId,
             geojson: {
@@ -35577,60 +35630,78 @@ function changeDrawToolSaga(_ref2) {
               features: []
             }
           }));
-        case 11:
-          return _context2.abrupt("return");
         case 12:
-          if (drawingTool.activeDrawModeId) {
-            _context2.next = 16;
+          _context2.next = 14;
+          return put(layerActions.toggleFeatureMode({
+            layerId: drawingTool.geoJSONLayerId,
+            isInEditMode: false,
+            drawMode: ''
+          }));
+        case 14:
+          return _context2.abrupt("return");
+        case 15:
+          if (!(!drawingTool.activeDrawModeId && newDrawMode.isSelectable)) {
+            _context2.next = 19;
             break;
           }
-          _context2.next = 15;
+          _context2.next = 18;
           return put(layerActions.toggleFeatureMode({
             layerId: drawingTool.geoJSONLayerId,
             isInEditMode: false,
             drawMode: ''
           }));
-        case 15:
+        case 18:
           return _context2.abrupt("return");
-        case 16:
-          _context2.next = 18;
+        case 19:
+          _context2.next = 21;
           return select(getLayerById, drawingTool.geoJSONLayerId);
-        case 18:
+        case 21:
           currentGeoJSONLayer = _context2.sent;
-          currentSelectionType = (_c = (_b = (_a = currentGeoJSONLayer === null || currentGeoJSONLayer === void 0 ? void 0 : currentGeoJSONLayer.geojson) === null || _a === void 0 ? void 0 : _a.features[0]) === null || _b === void 0 ? void 0 : _b.properties) === null || _c === void 0 ? void 0 : _c.selectionType;
-          newSelectionType = (_d = newDrawMode.shape.properties) === null || _d === void 0 ? void 0 : _d.selectionType; // don't change anything if same tool is selected again
-          if (!(currentSelectionType !== newSelectionType)) {
-            _context2.next = 24;
+          _ref3 = currentGeoJSONLayer || {}, currentGeoJSON = _ref3.geojson, _ref3$selectedFeature = _ref3.selectedFeatureIndex, selectedFeatureIndex = _ref3$selectedFeature === void 0 ? 0 : _ref3$selectedFeature;
+          currentSelectionType = (_b = (_a = currentGeoJSON === null || currentGeoJSON === void 0 ? void 0 : currentGeoJSON.features[selectedFeatureIndex]) === null || _a === void 0 ? void 0 : _a.properties) === null || _b === void 0 ? void 0 : _b.selectionType;
+          newSelectionType = (_c = newDrawMode.shape.properties) === null || _c === void 0 ? void 0 : _c.selectionType;
+          isNewToolSelected = currentSelectionType !== newSelectionType;
+          shouldUpdateNewShape = !((_d = currentGeoJSON === null || currentGeoJSON === void 0 ? void 0 : currentGeoJSON.features) === null || _d === void 0 ? void 0 : _d.length) || shouldAllowMultipleShapes || isNewToolSelected; // don't change anything if same tool is selected again
+          if (!(shouldUpdateNewShape && shouldUpdateShape)) {
+            _context2.next = 35;
             break;
           }
-          _context2.next = 24;
+          geoJSONFeatureCollection = getFeatureCollection(newDrawMode.shape, shouldAllowMultipleShapes, currentGeoJSON);
+          newGeoJSON = getGeoJson(geoJSONFeatureCollection, shouldAllowMultipleShapes);
+          if (shouldAllowMultipleShapes) {
+            moveFeature(currentGeoJSON, newGeoJSON, selectedFeatureIndex, '');
+          }
+          _context2.next = 33;
+          return put(layerActions.setSelectedFeature({
+            layerId: drawingTool.geoJSONLayerId,
+            selectedFeatureIndex: newGeoJSON.features.length - 1
+          }));
+        case 33:
+          _context2.next = 35;
           return put(mapStoreActions.layerChangeGeojson({
             layerId: drawingTool.geoJSONLayerId,
-            geojson: {
-              type: 'FeatureCollection',
-              features: [newDrawMode.shape]
-            }
+            geojson: newGeoJSON
           }));
-        case 24:
-          _context2.next = 26;
+        case 35:
+          _context2.next = 37;
           return put(layerActions.toggleFeatureMode({
             layerId: drawingTool.geoJSONLayerId,
             isInEditMode: true,
             drawMode: newDrawMode.value
           }));
-        case 26:
-          _context2.next = 31;
+        case 37:
+          _context2.next = 42;
           break;
-        case 28:
-          _context2.prev = 28;
+        case 39:
+          _context2.prev = 39;
           _context2.t0 = _context2["catch"](0);
           // eslint-disable-next-line no-console
           console.log('error changeDrawToolSaga', _context2.t0);
-        case 31:
+        case 42:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[0, 28]]);
+    }, _callee2, null, [[0, 39]]);
   })();
 }
 function drawingSaga() {
@@ -35692,22 +35763,6 @@ var drawtoolModuleConfig = {
 var getSingularDrawtoolDrawLayerId = function getSingularDrawtoolDrawLayerId(mapId) {
   return "drawlayer-".concat(mapId);
 };
-var getGeoJSONPropertyValue = function getGeoJSONPropertyValue(property, properties, polygonDrawMode) {
-  var defaultProperties = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : defaultGeoJSONStyleProperties;
-  // if a shape is set, extract the style from there
-  if (properties[property] !== undefined) {
-    return properties[property];
-  }
-  // if active polygon tool is preset, retreive style from there
-  if (polygonDrawMode) {
-    var polygonDrawModeProperty = polygonDrawMode.shape.type === 'Feature' && polygonDrawMode.shape.properties[property];
-    if (polygonDrawModeProperty !== undefined) {
-      return polygonDrawModeProperty;
-    }
-  }
-  // otherwise get values from defaultStyle
-  return defaultProperties[property];
-};
 
 var createLayersState = function createLayersState(layerId) {
   var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -36416,4 +36471,4 @@ var uiModuleConfig = {
  * */
 var coreModuleConfig = [mapStoreModuleConfig, synchronizationGroupConfig, uiModuleConfig, layerSelectConfig, snackbarModuleConfig, drawtoolModuleConfig];
 
-export { appActions, appModuleConfig, coreModuleConfig, drawtoolActions, drawtoolModuleConfig, reducer as drawtoolReducer, selectors as drawtoolSelectors, filterLayers$1 as filterLayers, genericActions, rootSaga$5 as genericSaga, selectors$5 as genericSelectors, types$3 as genericTypes, getGeoJSONPropertyValue, getSingularDrawtoolDrawLayerId, getUserAddedServices, initialState$6 as initialState, layerActions, reducer$9 as layerReducer, layerSelectActions, initialState$4 as layerSelectInitialState, selectors$2 as layerSelectSelectors, types$1 as layerSelectTypes, selectors$8 as layerSelectors, types$7 as layerTypes, utils$2 as layerUtils, mapActions, constants$1 as mapConstants, enums as mapEnums, selectors$4 as mapSelectors, mapStoreActions, mapStoreModuleConfig, mapStoreReducers, types$6 as mapTypes, mapUtils, routerActions, routerModuleConfig, utils as routerUtils, serviceActions, selectors$3 as serviceSelectors, types$2 as serviceTypes, setUserAddedServices, snackbarActions, snackbarModuleConfig, reducer$3 as snackbarReducer, rootSaga$4 as snackbarSaga, selectors$1 as snackbarSelectors, types as snackbarTypes, storeTestSettings, storeTestUtils, utils$1 as storeUtils, constants as syncConstants, actions as syncGroupsActions, reducer$6 as syncGroupsReducer, selector as syncGroupsSelector, selectors$6 as syncGroupsSelectors, types$4 as syncGroupsTypes, types$4 as types, uiActions, uiModuleConfig, reducer$8 as uiReducer, selectors$7 as uiSelectors, types$5 as uiTypes, reducer$7 as webmapReducer };
+export { appActions, appModuleConfig, coreModuleConfig, drawtoolActions, drawtoolModuleConfig, reducer as drawtoolReducer, selectors as drawtoolSelectors, filterLayers$1 as filterLayers, genericActions, rootSaga$5 as genericSaga, selectors$5 as genericSelectors, types$3 as genericTypes, getSingularDrawtoolDrawLayerId, getUserAddedServices, initialState$6 as initialState, layerActions, reducer$9 as layerReducer, layerSelectActions, initialState$4 as layerSelectInitialState, reducer$4 as layerSelectReducer, selectors$2 as layerSelectSelectors, types$1 as layerSelectTypes, selectors$8 as layerSelectors, types$7 as layerTypes, utils$2 as layerUtils, mapActions, constants$1 as mapConstants, enums as mapEnums, selectors$4 as mapSelectors, mapStoreActions, mapStoreModuleConfig, mapStoreReducers, types$6 as mapTypes, mapUtils, routerActions, routerModuleConfig, utils as routerUtils, serviceActions, selectors$3 as serviceSelectors, types$2 as serviceTypes, setUserAddedServices, snackbarActions, snackbarModuleConfig, reducer$3 as snackbarReducer, rootSaga$4 as snackbarSaga, selectors$1 as snackbarSelectors, types as snackbarTypes, storeTestSettings, storeTestUtils, utils$1 as storeUtils, constants as syncConstants, actions as syncGroupsActions, reducer$6 as syncGroupsReducer, selector as syncGroupsSelector, selectors$6 as syncGroupsSelectors, types$4 as syncGroupsTypes, types$4 as types, uiActions, uiModuleConfig, reducer$8 as uiReducer, selectors$7 as uiSelectors, types$5 as uiTypes, reducer$7 as webmapReducer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/store",
-  "version": "8.2.0",
+  "version": "8.3.1",
   "description": "GeoWeb Store library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -12,13 +12,14 @@
   "main": "./index.esm.js",
   "dependencies": {},
   "peerDependencies": {
-    "@opengeoweb/shared": "8.2.0",
-    "@opengeoweb/webmap": "8.2.0",
-    "@opengeoweb/webmap-react": "8.2.0",
+    "@opengeoweb/shared": "8.3.1",
+    "@opengeoweb/webmap": "8.3.1",
+    "@opengeoweb/webmap-react": "8.3.1",
     "@redux-eggs/core": "2.2.0",
     "@redux-eggs/redux-toolkit": "2.2.0",
     "@redux-eggs/saga-extension": "2.2.0",
-    "@reduxjs/toolkit": "1.9.5",
+    "@reduxjs/toolkit": "1.9.7",
+    "@turf/turf": "6.5.0",
     "date-fns": "2.30.0",
     "immer": "9.0.21",
     "lodash": "4.17.21",

package/src/store/drawingtool/reducer.d.ts

@@ -1,10 +1,11 @@
 import { PayloadAction, Draft, EntityState } from '@reduxjs/toolkit';
-import { DrawMode } from '@opengeoweb/webmap-react';
+import { DrawMode, MapDrawToolOptions } from '@opengeoweb/webmap-react';
 export interface DrawToolItem {
     drawToolId: string;
     geoJSONLayerId: string;
     activeDrawModeId: string;
     drawModes: DrawMode[];
+    shouldAllowMultipleShapes: boolean;
 }
 export type DrawingToolState = EntityState<DrawToolItem>;
 export interface DrawtoolModuleStore {
@@ -14,7 +15,7 @@ export declare const drawAdapter: import("@reduxjs/toolkit").EntityAdapter<DrawT
 export declare const initialState: DrawingToolState;
 export declare const reducer: import("redux").Reducer<DrawingToolState, import("redux").AnyAction>;
 export declare const drawtoolActions: import("@reduxjs/toolkit").CaseReducerActions<{
-    registerDrawTool: (draft: Draft<DrawingToolState>, action: PayloadAction<{
+    registerDrawTool: (draft: Draft<DrawingToolState>, action: PayloadAction<MapDrawToolOptions & {
         drawModes: DrawMode[];
         drawToolId: string;
         mapId?: string;
@@ -26,6 +27,7 @@ export declare const drawtoolActions: import("@reduxjs/toolkit").CaseReducerActi
     changeDrawToolMode: (draft: Draft<DrawingToolState>, action: PayloadAction<{
         drawToolId: string;
         drawModeId: string;
+        shouldUpdateShape?: boolean;
     }>) => void;
     updateGeoJSONLayerId: (draft: Draft<DrawingToolState>, action: PayloadAction<{
         drawToolId: string;

package/src/store/drawingtool/utils.d.ts

@@ -1,3 +1 @@
-import { DrawMode } from '@opengeoweb/webmap-react';
 export declare const getSingularDrawtoolDrawLayerId: (mapId: string) => string;
-export declare const getGeoJSONPropertyValue: (property: string, properties: GeoJSON.GeoJsonProperties, polygonDrawMode: DrawMode | undefined, defaultProperties?: GeoJSON.GeoJsonProperties) => number | string;

package/src/store/layerSelect/index.d.ts

@@ -1,4 +1,4 @@
-export { layerSelectActions, initialState as layerSelectInitialState, } from './reducer';
+export { layerSelectActions, initialState as layerSelectInitialState, reducer as layerSelectReducer, } from './reducer';
 export * as layerSelectSelectors from './selectors';
 export * as layerSelectTypes from './types';
 export * from './localStorage';

package/src/store/mapStore/layers/selectors.d.ts

@@ -302,7 +302,7 @@ export declare const getFeatureLayerGeoJSON: ((state: CoreAppStore, layerId?: st
 };
 export declare const getFeatureLayerGeoJSONProperties: ((state: CoreAppStore, layerId?: string | undefined) => {
     [name: string]: any;
-}) & import("reselect").OutputSelectorFields<(args_0: Layer | undefined) => {
+}) & import("reselect").OutputSelectorFields<(args_0: Layer | undefined, args_1: number | undefined) => {
     [name: string]: any;
 }, {
     clearCache: () => void;

package/src/store/mapStore/layers/types.d.ts

@@ -131,9 +131,11 @@ export interface SetSelectedFeaturePayload extends LayerPayload {
 export interface UpdateFeaturePayload extends LayerPayload {
     geojson: GeoJSON.FeatureCollection;
     shouldAllowMultipleShapes?: boolean;
+    reason?: string;
 }
 export interface UpdateFeaturePropertiesPayload extends LayerPayload {
     properties: GeoJSON.GeoJsonProperties;
+    selectedFeatureIndex?: number;
 }
 export interface ToggleFeatureModePayload extends LayerPayload {
     isInEditMode?: boolean;
@@ -141,4 +143,5 @@ export interface ToggleFeatureModePayload extends LayerPayload {
 }
 export interface ExitFeatureDrawModePayload extends LayerPayload {
     reason: string;
+    shouldAllowMultipleShapes?: boolean;
 }

package/src/store/mapStore/layers/utils.d.ts

@@ -16,9 +16,3 @@ export declare const produceDraftStateForAllLayersForDimensionWithinMap: (draft:
  * @param dimensions Dimension[]
  */
 export declare const filterNonTimeDimensions: (dimensions: Dimension[]) => Dimension[];
-/**
- * Returns geoJSON based on type and multipleShapes
- * @param geoJSON: GeoJSON.FeatureCollection
- * @param shouldAllowMultipleshapes: boolean
- */
-export declare const getGeoJson: (geojson: GeoJSON.FeatureCollection, shouldAllowMultipleshapes: boolean) => GeoJSON.FeatureCollection;

package/src/store/mapStore/map/selectors.d.ts

@@ -403,7 +403,7 @@ export declare const getMapTimeSliderCenterTime: ((state: CoreAppStore | undefin
  * @param {string} mapId mapId: string - Id of the map
  * @returns {number} returnType: number - unfiltered selected time as a unix timestamp
  */
-export declare const getTimeSliderUnfilteredSelectedTime: ((state: CoreAppStore | undefined, mapId: string) => number | null | undefined) & import("reselect").OutputSelectorFields<(args_0: WebMap | undefined) => number | null | undefined, {
+export declare const getTimeSliderUnfilteredSelectedTime: ((state: CoreAppStore, mapId: string) => number | undefined) & import("reselect").OutputSelectorFields<(args_0: WebMap | undefined, args_1: number) => number | undefined, {
     clearCache: () => void;
 }> & {
     clearCache: () => void;

package/src/store/mapStore/service/selectors.d.ts

@@ -8,7 +8,7 @@ import { ServiceState, ReduxService } from './types';
  * @param {object} store store: object - object from which the service state will be extracted
  * @returns {array} returnType: array - an array of all serviceIds
  */
-export declare const getServiceIds: ((state: CoreAppStore) => string[]) & import("reselect").OutputSelectorFields<(args_0: ServiceState) => string[], {
+export declare const getServiceIds: ((state: CoreAppStore) => string[]) & import("reselect").OutputSelectorFields<(args_0: ServiceState | undefined) => string[], {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -20,7 +20,7 @@ export declare const getServiceIds: ((state: CoreAppStore) => string[]) & import
  * @param {object} store store: object - Store object
  * @returns {object} returnType: ServiceState
  */
-export declare const getServices: ((state: CoreAppStore) => import("./types").Services) & import("reselect").OutputSelectorFields<(args_0: ServiceState) => import("./types").Services, {
+export declare const getServices: ((state: CoreAppStore) => import("./types").Services) & import("reselect").OutputSelectorFields<(args_0: ServiceState | undefined) => import("./types").Services, {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -32,7 +32,7 @@ export declare const getServices: ((state: CoreAppStore) => import("./types").Se
  * @param {object} store store: object - Store object
  * @returns {ReduxService} returnType: Service
  */
-export declare const getServiceByName: ((state: CoreAppStore, serviceUrl: string) => ReduxService) & import("reselect").OutputSelectorFields<(args_0: ServiceState, args_1: string) => ReduxService, {
+export declare const getServiceByUrl: ((state: CoreAppStore, serviceUrl: string) => ReduxService | undefined) & import("reselect").OutputSelectorFields<(args_0: ServiceState | undefined, args_1: string) => ReduxService | undefined, {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -45,7 +45,7 @@ export declare const getServiceByName: ((state: CoreAppStore, serviceUrl: string
  * @param {string}  serviceUrl serviceUrl: string - Url of the service where the layer belongs to
  * @returns {array} returnType: ServiceLayer[] - All layers within the service object.
  */
-export declare const getLayersFromServiceSelector: ((state: CoreAppStore, serviceUrl: string) => import("@opengeoweb/webmap").LayerProps[]) & import("reselect").OutputSelectorFields<(args_0: ReduxService) => import("@opengeoweb/webmap").LayerProps[], {
+export declare const getLayersFromServiceSelector: ((state: CoreAppStore, serviceUrl: string) => import("@opengeoweb/webmap").LayerProps[]) & import("reselect").OutputSelectorFields<(args_0: ReduxService | undefined) => import("@opengeoweb/webmap").LayerProps[], {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -59,7 +59,7 @@ export declare const getLayersFromServiceSelector: ((state: CoreAppStore, servic
  * @param {string}  layerName layerName: string - Name of the layer in the service
  * @returns {ServiceLayer} returnType: ServiceLayer - The layer from the service object.
  */
-export declare const getLayerFromService: ((state: CoreAppStore, serviceUrl: string, layerName: string) => import("@opengeoweb/webmap").LayerProps) & import("reselect").OutputSelectorFields<(args_0: import("@opengeoweb/webmap").LayerProps[], args_1: string, args_2: string) => import("@opengeoweb/webmap").LayerProps, {
+export declare const getLayerFromService: ((state: CoreAppStore, _serviceUrl: string, layerName: string) => import("@opengeoweb/webmap").LayerProps | undefined) & import("reselect").OutputSelectorFields<(args_0: import("@opengeoweb/webmap").LayerProps[], args_1: string) => import("@opengeoweb/webmap").LayerProps | undefined, {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -73,7 +73,7 @@ export declare const getLayerFromService: ((state: CoreAppStore, serviceUrl: str
  * @param {string}  layerName layerName: string - Name of the layer in the service
  * @returns {array} returnType: Style[] - array containing layer styles
  */
-export declare const getLayerStyles: ((state: CoreAppStore, serviceUrl: string, layerName: string) => Style[]) & import("reselect").OutputSelectorFields<(args_0: import("@opengeoweb/webmap").LayerProps) => Style[], {
+export declare const getLayerStyles: ((state: CoreAppStore, _serviceUrl: string, layerName: string) => Style[]) & import("reselect").OutputSelectorFields<(args_0: import("@opengeoweb/webmap").LayerProps | undefined) => Style[], {
     clearCache: () => void;
 }> & {
     clearCache: () => void;

package/src/store/ui/types.d.ts

@@ -14,7 +14,6 @@ export declare enum DialogTypes {
     LayerSelect = "layerSelect",
     DrawingTool = "drawingTool",
     DockedLayerManager = "dockedLayerManager",
-    DockedDrawingTool = "dockedDrawingTool",
     ObjectManager = "objectManager",
     PublicWarnings = "publicWarnings"
 }