@opengeoweb/store 9.7.0 → 9.9.0

package/index.esm.js

@@ -1,9 +1,8 @@
 import { current, produce } from 'immer';
 import { webmapUtils, LayerType, webmapTestSettings, WMLayer, handleMomentISOString, getCapabilities } from '@opengeoweb/webmap';
-import { createAction, createSlice, createSelector, createEntityAdapter, current as current$1 } from '@reduxjs/toolkit';
-import { getGeoJson, moveFeature, createInterSections, defaultLayers, getFeatureCollection, emptyGeoJSON, defaultIntersectionStyleProperties } from '@opengeoweb/webmap-react';
+import { createAction, createSlice, createSelector, createEntityAdapter } from '@reduxjs/toolkit';
+import { getGeoJson, moveFeature, createInterSections, getLastEmptyFeatureIndex, defaultLayers, addSelectionTypeToGeoJSON, getFeatureCollection, emptyGeoJSON, defaultIntersectionStyleProperties } from '@opengeoweb/webmap-react';
 export { defaultLayers } from '@opengeoweb/webmap-react';
-import { differenceInMinutes, isValid, fromUnixTime } from 'date-fns';
 import { dateUtils, withEggs } from '@opengeoweb/shared';
 import { isEqual, compact } from 'lodash';
 import { createStore as createStore$1 } from '@redux-eggs/redux-toolkit';
@@ -403,6 +402,57 @@ function _nonIterableSpread() {
 function _nonIterableRest() {
   throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
+function _createForOfIteratorHelper(o, allowArrayLike) {
+  var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
+  if (!it) {
+    if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
+      if (it) o = it;
+      var i = 0;
+      var F = function () {};
+      return {
+        s: F,
+        n: function () {
+          if (i >= o.length) return {
+            done: true
+          };
+          return {
+            done: false,
+            value: o[i++]
+          };
+        },
+        e: function (e) {
+          throw e;
+        },
+        f: F
+      };
+    }
+    throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+  }
+  var normalCompletion = true,
+    didErr = false,
+    err;
+  return {
+    s: function () {
+      it = it.call(o);
+    },
+    n: function () {
+      var step = it.next();
+      normalCompletion = step.done;
+      return step;
+    },
+    e: function (e) {
+      didErr = true;
+      err = e;
+    },
+    f: function () {
+      try {
+        if (!normalCompletion && it.return != null) it.return();
+      } finally {
+        if (didErr) throw err;
+      }
+    }
+  };
+}
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -562,17 +612,17 @@ var createMap = function createMap(_ref) {
     _ref$isAnimating = _ref.isAnimating,
     isAnimating = _ref$isAnimating === void 0 ? false : _ref$isAnimating,
     _ref$animationStartTi = _ref.animationStartTime,
-    animationStartTime = _ref$animationStartTi === void 0 ? dateUtils.dateToString(dateUtils.sub(dateUtils.fromUnix(dateUtils.unix(dateUtils.utc())), {
+    animationStartTime = _ref$animationStartTi === void 0 ? dateUtils.dateToString(dateUtils.sub(dateUtils.getNowUtc(), {
       hours: 5
     }), dateFormat) : _ref$animationStartTi,
     _ref$animationEndTime = _ref.animationEndTime,
-    animationEndTime = _ref$animationEndTime === void 0 ? dateUtils.dateToString(dateUtils.sub(dateUtils.fromUnix(dateUtils.unix(dateUtils.utc())), {
+    animationEndTime = _ref$animationEndTime === void 0 ? dateUtils.dateToString(dateUtils.sub(dateUtils.getNowUtc(), {
       minutes: 10
     }), dateFormat) : _ref$animationEndTime,
     _ref$isAutoUpdating = _ref.isAutoUpdating,
     isAutoUpdating = _ref$isAutoUpdating === void 0 ? false : _ref$isAutoUpdating,
-    _ref$isEndTimeOverrid = _ref.isEndTimeOverriding,
-    isEndTimeOverriding = _ref$isEndTimeOverrid === void 0 ? false : _ref$isEndTimeOverrid,
+    _ref$shouldEndtimeOve = _ref.shouldEndtimeOverride,
+    shouldEndtimeOverride = _ref$shouldEndtimeOve === void 0 ? false : _ref$shouldEndtimeOve,
     _ref$bbox = _ref.bbox,
     bbox = _ref$bbox === void 0 ? {
       left: -19000000,
@@ -626,7 +676,7 @@ var createMap = function createMap(_ref) {
     animationStartTime: animationStartTime,
     animationEndTime: animationEndTime,
     isAutoUpdating: isAutoUpdating,
-    isEndTimeOverriding: isEndTimeOverriding,
+    shouldEndtimeOverride: shouldEndtimeOverride,
     srs: srs,
     bbox: bbox,
     baseLayers: baseLayers,
@@ -654,19 +704,28 @@ var createMap = function createMap(_ref) {
 var checkValidLayersPayload = function checkValidLayersPayload(layers, mapId) {
   /* Check for duplicate ids */
   var layerIds = {};
-  for (var i = 0; i < layers.length; i += 1) {
-    if (layers[i].id) {
-      /* Check if layer is already added to a different map */
-      if (layers[i].mapId && mapId && layers[i].mapId !== mapId) {
-        return false;
-      }
-      /* Check duplicate */
-      if (!layerIds[layers[i].id]) {
-        layerIds[layers[i].id] = true;
-      } else {
-        return false;
+  var _iterator = _createForOfIteratorHelper(layers),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var layer = _step.value;
+      if (layer.id) {
+        /* Check if layer is already added to a different map */
+        if (layer.mapId && mapId && layer.mapId !== mapId) {
+          return false;
+        }
+        /* Check duplicate */
+        if (!layerIds[layer.id]) {
+          layerIds[layer.id] = true;
+        } else {
+          return false;
+        }
       }
     }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
   }
   return true;
 };
@@ -799,7 +858,7 @@ var getSpeedFactor = function getSpeedFactor(speedDelay) {
   return defaultDelay / speedDelay;
 };
 var getAnimationDuration = function getAnimationDuration(animationEndTime, animationStartTime) {
-  return animationEndTime && animationStartTime ? differenceInMinutes(new Date(animationEndTime), new Date(animationStartTime)) : 0;
+  return animationEndTime && animationStartTime ? dateUtils.differenceInMinutes(new Date(animationEndTime), new Date(animationStartTime)) : 0;
 };
 /**
  * Returns speed delay for given speedFactor. For options, see defined above in "speedFactors"
@@ -1300,17 +1359,15 @@ var slice$7 = createSlice({
       }
       /*
           All layer id's for the specified mapId should be removed.
-          This is done by clearing the allId object, and then adding back the layer ids for the other maps we want to keep.
+          This is done by filtering the allId array. Keeping only the layer id's which don't exist in the byId object
           At the same time the byId object is synchronized.
         */
-      var state = current(draft);
-      draft.allIds = [];
-      state.allIds.forEach(function (layerId) {
-        if (state.byId[layerId] && state.byId[layerId].layerType !== LayerType.baseLayer && state.byId[layerId].layerType !== LayerType.overLayer && state.byId[layerId].mapId === mapId) {
+      draft.allIds = draft.allIds.filter(function (layerId) {
+        if (draft.byId[layerId] && draft.byId[layerId].layerType !== LayerType.baseLayer && draft.byId[layerId].layerType !== LayerType.overLayer && draft.byId[layerId].mapId === mapId) {
           delete draft.byId[layerId];
-        } else {
-          draft.allIds.push(layerId);
+          return false;
         }
+        return true;
       });
       /*
           Here we set the layers for the mapId from the action. byId and allIds is updated.
@@ -1340,14 +1397,13 @@ var slice$7 = createSlice({
           layerTypes.push(layer.layerType);
         }
       });
-      var state = current(draft);
       // remove current layers with same type as one of the passed layers
-      state.allIds.forEach(function (layerId) {
-        if (state.byId[layerId] && layerTypes.includes(state.byId[layerId].layerType) && state.byId[layerId].mapId === mapId) {
+      draft.allIds = draft.allIds.filter(function (layerId) {
+        if (draft.byId[layerId] && layerTypes.includes(draft.byId[layerId].layerType) && draft.byId[layerId].mapId === mapId) {
           delete draft.byId[layerId];
-          var index = draft.allIds.indexOf(layerId);
-          draft.allIds.splice(index, 1);
+          return false;
         }
+        return true;
       });
       // set over and base layers
       filtererdBaseLayers.forEach(function (layer) {
@@ -1412,14 +1468,13 @@ var slice$7 = createSlice({
       var _action$payload13 = action.payload,
         layers = _action$payload13.layers,
         mapId = _action$payload13.mapId;
-      var state = current(draft);
       // remove current baselayers for passed map
-      state.availableBaseLayers.allIds.forEach(function (layerId) {
-        if (state.availableBaseLayers.byId[layerId] && state.availableBaseLayers.byId[layerId].mapId === mapId) {
+      draft.availableBaseLayers.allIds = draft.availableBaseLayers.allIds.filter(function (layerId) {
+        if (draft.availableBaseLayers.byId[layerId] && draft.availableBaseLayers.byId[layerId].mapId === mapId) {
           delete draft.availableBaseLayers.byId[layerId];
-          var index = draft.availableBaseLayers.allIds.indexOf(layerId);
-          draft.availableBaseLayers.allIds.splice(index, 1);
+          return false;
         }
+        return true;
       });
       // add new available baselayers
       layers.forEach(function (layer) {
@@ -1599,9 +1654,23 @@ var slice$7 = createSlice({
       if (!draft.byId[layerId]) {
         return;
       }
-      if (!shouldAllowMultipleShapes || shouldAllowMultipleShapes && reason === 'escaped') {
+      var exitMultipleShapes = shouldAllowMultipleShapes && reason === 'escaped';
+      if (!shouldAllowMultipleShapes || exitMultipleShapes) {
         draft.byId[layerId].isInEditMode = false;
         draft.byId[layerId].drawMode = '';
+        if (exitMultipleShapes) {
+          var currentGeoJSON = current(draft.byId[layerId].geojson);
+          var lastFeatureIndex = currentGeoJSON !== undefined && getLastEmptyFeatureIndex(currentGeoJSON);
+          if (currentGeoJSON && lastFeatureIndex !== undefined) {
+            var newGeoJSON = Object.assign(Object.assign({}, currentGeoJSON), {
+              features: currentGeoJSON.features.filter(function (_feature, index) {
+                return index !== lastFeatureIndex;
+              })
+            });
+            draft.byId[layerId].geojson = newGeoJSON;
+            draft.byId[layerId].selectedFeatureIndex = newGeoJSON.features.length > 0 ? newGeoJSON.features.length - 1 : 0;
+          }
+        }
       }
     }
   },
@@ -1636,7 +1705,6 @@ var slice$7 = createSlice({
       var _action$payload22 = action.payload,
         targets = _action$payload22.targets,
         source = _action$payload22.source;
-      var state = current(draft);
       return targets.reduce(function (prevState, target) {
         var action = {
           payload: target,
@@ -1644,7 +1712,7 @@ var slice$7 = createSlice({
         };
         /* Handle the Layer action with the same logic, using the same reducer */
         return reducer$7(prevState, action);
-      }, state);
+      }, draft);
     }).addCase(setMapPreset, function (draft, action) {
       var mapId = action.payload.mapId;
       var layers = draft.allIds.map(function (id) {
@@ -2402,14 +2470,22 @@ var createLayersWithIds = function createLayersWithIds(state, layers) {
     return layers;
   }
   return produce(layers, function (draft) {
-    for (var j = 0; j < draft.length; j += 1) {
-      var layer = draft[j];
-      if (!layer.id) {
-        layer.id = webmapUtils.generateLayerId();
-      } else if (checkIfMapLayerIdIsAlreadyTaken(state, layer.id)) {
-        console.warn("Warning: Layer id ".concat(layer.id, " was already taken: Generating new one."));
-        layer.id = webmapUtils.generateLayerId();
+    var _iterator = _createForOfIteratorHelper(draft),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var layer = _step.value;
+        if (!layer.id) {
+          layer.id = webmapUtils.generateLayerId();
+        } else if (checkIfMapLayerIdIsAlreadyTaken(state, layer.id)) {
+          console.warn("Warning: Layer id ".concat(layer.id, " was already taken: Generating new one."));
+          layer.id = webmapUtils.generateLayerId();
+        }
       }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
     }
   });
 };
@@ -2639,7 +2715,7 @@ var slice$5 = createSlice({
       if (!draft.byId[mapId]) {
         return;
       }
-      draft.byId[mapId].isEndTimeOverriding = shouldEndtimeOverride;
+      draft.byId[mapId].shouldEndtimeOverride = shouldEndtimeOverride;
     },
     toggleTimestepAuto: function toggleTimestepAuto(draft, action) {
       var _action$payload18 = action.payload,
@@ -2721,7 +2797,12 @@ var slice$5 = createSlice({
         return;
       }
       draft.byId[mapId].dockedLayerManagerSize = dockedLayerManagerSize;
-    }
+    },
+    setMapPresetError: function setMapPresetError(
+    // eslint-disable-next-line no-unused-vars
+    draft,
+    // eslint-disable-next-line no-unused-vars
+    action) {}
   },
   extraReducers: function extraReducers(builder) {
     builder.addCase(layerActions.addLayer, function (draft, action) {
@@ -3341,12 +3422,13 @@ var slice$4 = createSlice({
       }
     },
     syncGroupAddTarget: function syncGroupAddTarget(draft, action) {
-      var state = current(draft);
+      var _a;
       var _action$payload2 = action.payload,
         groupId = _action$payload2.groupId,
         targetId = _action$payload2.targetId,
         linked = _action$payload2.linked;
-      if (!draft.groups.byId[groupId]) {
+      var synchronizationGroup = draft.groups.byId[groupId];
+      if (!synchronizationGroup) {
         console.warn("SYNCGROUPS_ADD_TARGET: Group ".concat(groupId, " does not exist."));
         return;
       }
@@ -3354,21 +3436,17 @@ var slice$4 = createSlice({
         console.warn("SYNCGROUPS_ADD_TARGET: targetId is not defined.");
         return;
       }
-      if (draft.groups.byId[groupId].targets.allIds.includes(targetId)) {
+      if (synchronizationGroup.targets.allIds.includes(targetId)) {
         return;
       }
-      draft.groups.byId[groupId].targets.allIds.push(targetId);
-      draft.groups.byId[groupId].targets.byId[targetId] = {
+      var isSourceLinked = (_a = synchronizationGroup.targets.byId[targetId]) === null || _a === void 0 ? void 0 : _a.linked;
+      synchronizationGroup.targets.allIds.push(targetId);
+      synchronizationGroup.targets.byId[targetId] = {
         linked: linked !== false
       };
-      /* Now try to initialize with the correct values from the state */
-      var syncronizationGroup = state.groups.byId[groupId];
-      /* Check if the source is in the target list of the synchonizationGroup */
-      var source = state.groups.byId[groupId].targets.byId[targetId];
-      /* If the source is part of the target list, and is linked, continue syncing the other targets */
-      if (source && source.linked) {
-        var type = syncronizationGroup.type;
-        draft.sources.byId[targetId].payloadByType[type] = syncronizationGroup.payloadByType[type];
+      if (isSourceLinked) {
+        var type = synchronizationGroup.type;
+        draft.sources.byId[targetId].payloadByType[type] = synchronizationGroup.payloadByType[type];
       }
     },
     syncGroupRemoveTarget: function syncGroupRemoveTarget(draft, action) {
@@ -3444,48 +3522,46 @@ var slice$4 = createSlice({
     });
   }
 });
-var setBboxOrTimeSync = function setBboxOrTimeSync(state, action) {
-  return produce(state, function (draft) {
-    var _action$payload6 = action.payload,
-      targets = _action$payload6.targets,
-      source = _action$payload6.source,
-      groups = _action$payload6.groups;
-    var getPayLoadKey = function getPayLoadKey(type) {
-      switch (type) {
-        case setTimeSync.type:
-          return SYNCGROUPS_TYPE_SETTIME;
-        case setBboxSync.type:
-          return SYNCGROUPS_TYPE_SETBBOX;
-        default:
-          return null;
-      }
-    };
-    var payloadKey = getPayLoadKey(action.type);
-    if (!source.payload || !payloadKey) {
-      console.warn('Wrong sync action: ', action);
-      return;
+var setBboxOrTimeSync = function setBboxOrTimeSync(draft, action) {
+  var _action$payload6 = action.payload,
+    targets = _action$payload6.targets,
+    source = _action$payload6.source,
+    groups = _action$payload6.groups;
+  var getPayLoadKey = function getPayLoadKey(type) {
+    switch (type) {
+      case setTimeSync.type:
+        return SYNCGROUPS_TYPE_SETTIME;
+      case setBboxSync.type:
+        return SYNCGROUPS_TYPE_SETBBOX;
+      default:
+        return null;
     }
-    if (draft.sources.byId[source.payload.sourceId]) {
-      if (!draft.sources.byId[source.payload.sourceId].payloadByType) {
-        draft.sources.byId[source.payload.sourceId].payloadByType = {};
-      }
-      draft.sources.byId[source.payload.sourceId].payloadByType[payloadKey] = source.payload;
+  };
+  var payloadKey = getPayLoadKey(action.type);
+  if (!source.payload || !payloadKey) {
+    console.warn('Wrong sync action: ', action);
+    return;
+  }
+  if (draft.sources.byId[source.payload.sourceId]) {
+    if (!draft.sources.byId[source.payload.sourceId].payloadByType) {
+      draft.sources.byId[source.payload.sourceId].payloadByType = {};
     }
-    /* Update all targets */
-    targets.forEach(function (target) {
-      if (draft.sources.byId[target.targetId]) {
-        if (!draft.sources.byId[target.targetId].payloadByType) {
-          draft.sources.byId[target.targetId].payloadByType = {};
-        }
-        draft.sources.byId[target.targetId].payloadByType[payloadKey] = source.payload;
-      }
-    });
-    /* Set the value in the group */
-    groups.forEach(function (group) {
-      if (draft.groups.byId[group]) {
-        draft.groups.byId[group].payloadByType[payloadKey] = source.payload;
+    draft.sources.byId[source.payload.sourceId].payloadByType[payloadKey] = source.payload;
+  }
+  /* Update all targets */
+  targets.forEach(function (target) {
+    if (draft.sources.byId[target.targetId]) {
+      if (!draft.sources.byId[target.targetId].payloadByType) {
+        draft.sources.byId[target.targetId].payloadByType = {};
       }
-    });
+      draft.sources.byId[target.targetId].payloadByType[payloadKey] = source.payload;
+    }
+  });
+  /* Set the value in the group */
+  groups.forEach(function (group) {
+    if (draft.groups.byId[group]) {
+      draft.groups.byId[group].payloadByType[payloadKey] = source.payload;
+    }
   });
 };
 var _slice$actions = slice$4.actions,
@@ -4065,7 +4141,7 @@ var getSelectedTime = createSelector(function (store, mapId) {
   return getMapDimension(store, mapId, 'time');
 }, function (timeDimension) {
   var now = dateUtils.unix(new Date());
-  if (!timeDimension) {
+  if (!timeDimension || !timeDimension.currentValue) {
     return now;
   }
   var timeSliderTime = dateUtils.parseISO(timeDimension.currentValue);
@@ -4198,13 +4274,13 @@ var isAutoUpdating = createSelector(getMapById, function (store) {
 /**
  * Gets if endTime and duration of animationPayload are overriding maxValue and minValue of leading layer
  *
- * Example: isEndTimeOverriding = isEndTimeOverriding(store, 'mapid_1')
+ * Example: shouldEndtimeOverride = shouldEndtimeOverride(store, 'mapid_1')
  * @param {object} store store: object - store object
  * @param {string} mapId mapId: string - Id of the map
  * @returns {boolean} returnType: boolean
  */
-var isEndTimeOverriding = createSelector(getMapById, function (store) {
-  return store ? store.isEndTimeOverriding : false;
+var shouldEndtimeOverride = createSelector(getMapById, function (store) {
+  return store ? store.shouldEndtimeOverride : false;
 }, selectorMemoizationOptions);
 /**
  * Gets activeLayerId for map
@@ -4645,7 +4721,7 @@ var selectors$2 = /*#__PURE__*/Object.freeze({
   getAnimationStartTime: getAnimationStartTime,
   getAnimationEndTime: getAnimationEndTime$1,
   isAutoUpdating: isAutoUpdating,
-  isEndTimeOverriding: isEndTimeOverriding,
+  shouldEndtimeOverride: shouldEndtimeOverride,
   getActiveLayerId: getActiveLayerId,
   getAutoUpdateLayerId: getAutoUpdateLayerId,
   getAutoTimeStepLayerId: getAutoTimeStepLayerId,
@@ -5150,6 +5226,10 @@ var generateTimeList = function generateTimeList(start, end, interval) {
   return timeList;
 };
 var getAnimationEndTime = function getAnimationEndTime(animationEndTime) {
+  var ISOtime = dateUtils.parseISO(animationEndTime);
+  if (dateUtils.isValid(ISOtime)) {
+    return ISOtime.toISOString();
+  }
   var calculateFromNow = animationEndTime.split(/[-+]/)[0] === 'NOW';
   var isAddingTime = animationEndTime.indexOf('+') !== -1;
   var duration = animationEndTime.substring(animationEndTime.indexOf('PT') + 2);
@@ -5170,7 +5250,11 @@ var isAnimationEndTimeValid = function isAnimationEndTimeValid(animationEndTime)
   var hasValidPrefix = animationEndTime.split(/[-+]/)[0] === 'NOW' || animationEndTime.split(/[-+]/)[0] === 'TODAY';
   var durationString = animationEndTime.substring(animationEndTime.indexOf('PT') + 2);
   var hasValidDate = /^(\d+H)?(\d+M)?$/.test(durationString);
-  return hasValidPrefix && hasValidDate;
+  if (hasValidPrefix && hasValidDate) {
+    return true;
+  }
+  var parsedDate = dateUtils.parseISO(animationEndTime);
+  return dateUtils.isValid(parsedDate);
 };
 var validInitialAnimationStep = function validInitialAnimationStep(initialAnimationStep, draw) {
   return !!initialAnimationStep && !!(draw === null || draw === void 0 ? void 0 : draw.length) && initialAnimationStep >= 0 && draw.length > initialAnimationStep;
@@ -5260,56 +5344,72 @@ function deleteLayerSaga(_ref3) {
   })();
 }
 function updateAnimation(mapId, maxValue) {
-  var animationStart, animationStartUnix, animationEnd, animationEndUnix, t, deltaT, start, end, isAnimating$1, timeStep;
+  var shouldEndtimeOverride$1, animationStart, animationStartUnix, animationEnd, animationEndUnix, t, deltaT, start, end, isAnimating$1, timeStep;
   return _regeneratorRuntime().wrap(function updateAnimation$(_context4) {
     while (1) switch (_context4.prev = _context4.next) {
       case 0:
         _context4.next = 2;
-        return select(getAnimationStartTime, mapId);
+        return select(shouldEndtimeOverride, mapId);
       case 2:
+        shouldEndtimeOverride$1 = _context4.sent;
+        if (!(shouldEndtimeOverride$1 === true)) {
+          _context4.next = 5;
+          break;
+        }
+        return _context4.abrupt("return");
+      case 5:
+        _context4.next = 7;
+        return select(getAnimationStartTime, mapId);
+      case 7:
         animationStart = _context4.sent;
         animationStartUnix = dateUtils.unix(dateUtils.utc(animationStart));
-        _context4.next = 6;
+        _context4.next = 11;
         return select(getAnimationEndTime$1, mapId);
-      case 6:
+      case 11:
         animationEnd = _context4.sent;
         animationEndUnix = dateUtils.unix(dateUtils.utc(animationEnd));
         t = dateUtils.unix(dateUtils.utc(maxValue));
         deltaT = t - animationEndUnix;
         start = dateUtils.dateToString(dateUtils.fromUnix(animationStartUnix + deltaT), dateFormat);
         end = dateUtils.dateToString(dateUtils.fromUnix(animationEndUnix + deltaT), dateFormat);
-        _context4.next = 14;
+        if (!(!start || !end)) {
+          _context4.next = 19;
+          break;
+        }
+        return _context4.abrupt("return");
+      case 19:
+        _context4.next = 21;
         return put(mapActions.setAnimationEndTime({
           mapId: mapId,
           animationEndTime: end
         }));
-      case 14:
-        _context4.next = 16;
+      case 21:
+        _context4.next = 23;
         return put(mapActions.setAnimationStartTime({
           mapId: mapId,
           animationStartTime: start
         }));
-      case 16:
-        _context4.next = 18;
+      case 23:
+        _context4.next = 25;
         return select(isAnimating, mapId);
-      case 18:
+      case 25:
         isAnimating$1 = _context4.sent;
         if (!isAnimating$1) {
-          _context4.next = 25;
+          _context4.next = 32;
           break;
         }
-        _context4.next = 22;
+        _context4.next = 29;
         return select(getMapTimeStep, mapId);
-      case 22:
+      case 29:
         timeStep = _context4.sent;
-        _context4.next = 25;
+        _context4.next = 32;
         return put(mapActions.mapStartAnimation({
           mapId: mapId,
           start: start,
           end: end,
           interval: timeStep
         }));
-      case 25:
+      case 32:
       case "end":
         return _context4.stop();
     }
@@ -5569,7 +5669,7 @@ function handleBaseLayersSaga(mapId, baseLayers) {
 function setMapPresetSaga(_ref6) {
   var payload = _ref6.payload;
   return /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-    var _a, _b, _c, mapId, initialProps, mapPreset, layers, activeLayerId, autoTimeStepLayerId, autoUpdateLayerId, proj, shouldAutoUpdate, shouldAnimate, animationPayload, toggleTimestepAuto, showTimeSlider, displayMapPin, shouldShowZoomControls, shouldShowLegend, dockedLayerManagerSize, _filterLayers, mapLayers, baseLayers, overLayers, autoTimeStepLayerIdNew, autoUpdateLayerIdNew, onlyActiveLayerIdIsSet, newLayerIds, firstLayerId, baseLayersWithDefaultLayer, overLayersWithDefaultLayer, allBaseLayers, animationLength, animationEndTime, shouldEndtimeOverride, interval, animationEnd, _animationEnd, duration, _animationEnd2, animationStart, shouldOpenLegend, legendId, fiveMinuteDelayForAnimation, _animationEnd3, _animationStart;
+    var _a, _b, _c, mapId, initialProps, mapPreset, layers, activeLayerId, autoTimeStepLayerId, autoUpdateLayerId, proj, shouldAutoUpdate, shouldAnimate, animationPayload, toggleTimestepAuto, showTimeSlider, displayMapPin, shouldShowZoomControls, shouldShowLegend, dockedLayerManagerSize, _filterLayers, mapLayers, baseLayers, overLayers, autoTimeStepLayerIdNew, autoUpdateLayerIdNew, onlyActiveLayerIdIsSet, newLayerIds, firstLayerId, baseLayersWithDefaultLayer, overLayersWithDefaultLayer, allBaseLayers, isProjectionSupported, animationLength, animationEndTime, shouldEndtimeOverride, interval, animationEnd, _animationEnd, duration, _animationEnd2, animationStart, shouldOpenLegend, legendId, fiveMinuteDelayForAnimation, _animationEnd3, _animationStart;
     return _regeneratorRuntime().wrap(function _callee6$(_context8) {
       while (1) switch (_context8.prev = _context8.next) {
         case 0:
@@ -5577,7 +5677,7 @@ function setMapPresetSaga(_ref6) {
           mapId = payload.mapId, initialProps = payload.initialProps;
           mapPreset = initialProps.mapPreset;
           if (!mapPreset) {
-            _context8.next = 121;
+            _context8.next = 124;
             break;
           }
           layers = mapPreset.layers, activeLayerId = mapPreset.activeLayerId, autoTimeStepLayerId = mapPreset.autoTimeStepLayerId, autoUpdateLayerId = mapPreset.autoUpdateLayerId, proj = mapPreset.proj, shouldAutoUpdate = mapPreset.shouldAutoUpdate, shouldAnimate = mapPreset.shouldAnimate, animationPayload = mapPreset.animationPayload, toggleTimestepAuto = mapPreset.toggleTimestepAuto, showTimeSlider = mapPreset.showTimeSlider, displayMapPin = mapPreset.displayMapPin, shouldShowZoomControls = mapPreset.shouldShowZoomControls, shouldShowLegend = mapPreset.shouldShowLegend, dockedLayerManagerSize = mapPreset.dockedLayerManagerSize;
@@ -5629,271 +5729,282 @@ function setMapPresetSaga(_ref6) {
           return call(handleBaseLayersSaga, mapId, allBaseLayers);
         case 24:
           if (!proj) {
-            _context8.next = 27;
+            _context8.next = 30;
+            break;
+          }
+          isProjectionSupported = webmapUtils.getWMJSMapById(mapId).isProjectionSupported(proj.srs);
+          if (isProjectionSupported) {
+            _context8.next = 28;
             break;
           }
-          _context8.next = 27;
+          throw new Error("Projection ".concat(proj.srs, " is not supported"));
+        case 28:
+          _context8.next = 30;
           return put(mapActions.setBbox({
             mapId: mapId,
-            bbox: proj === null || proj === void 0 ? void 0 : proj.bbox,
-            srs: proj === null || proj === void 0 ? void 0 : proj.srs
+            bbox: proj.bbox,
+            srs: proj.srs
           }));
-        case 27:
+        case 30:
           animationLength = animationPayload && animationPayload.duration;
           animationEndTime = animationPayload && animationPayload.endTime && isAnimationEndTimeValid(animationPayload.endTime) && animationPayload.endTime;
           shouldEndtimeOverride = animationPayload ? animationPayload.shouldEndtimeOverride : false;
           if (!shouldEndtimeOverride) {
-            _context8.next = 33;
+            _context8.next = 36;
             break;
           }
-          _context8.next = 33;
+          _context8.next = 36;
           return put(mapActions.setEndTimeOverriding({
             mapId: mapId,
             shouldEndtimeOverride: shouldEndtimeOverride
           }));
-        case 33:
+        case 36:
           if (!(shouldAutoUpdate !== undefined && !animationEndTime)) {
-            _context8.next = 36;
+            _context8.next = 39;
             break;
           }
-          _context8.next = 36;
+          _context8.next = 39;
           return put(mapActions.toggleAutoUpdate({
             mapId: mapId,
             shouldAutoUpdate: shouldAutoUpdate
           }));
-        case 36:
+        case 39:
           if (!(showTimeSlider !== undefined)) {
-            _context8.next = 39;
+            _context8.next = 42;
             break;
           }
-          _context8.next = 39;
+          _context8.next = 42;
           return put(mapActions.toggleTimeSliderIsVisible({
             mapId: mapId,
             isTimeSliderVisible: showTimeSlider
           }));
-        case 39:
+        case 42:
           if (!(shouldShowZoomControls !== undefined)) {
-            _context8.next = 42;
+            _context8.next = 45;
             break;
           }
-          _context8.next = 42;
+          _context8.next = 45;
           return put(mapActions.toggleZoomControls({
             mapId: mapId,
             shouldShowZoomControls: shouldShowZoomControls
           }));
-        case 42:
+        case 45:
           if (!(displayMapPin !== undefined)) {
-            _context8.next = 45;
+            _context8.next = 48;
             break;
           }
-          _context8.next = 45;
+          _context8.next = 48;
           return put(mapActions.toggleMapPinIsVisible({
             mapId: mapId,
             displayMapPin: displayMapPin
           }));
-        case 45:
+        case 48:
           // sets timestep by interval of animationPayload
           interval = animationPayload && animationPayload.interval;
           if (!interval) {
-            _context8.next = 49;
+            _context8.next = 52;
             break;
           }
-          _context8.next = 49;
+          _context8.next = 52;
           return put(mapActions.setTimeStep({
             mapId: mapId,
             timeStep: interval
           }));
-        case 49:
+        case 52:
           if (!animationEndTime) {
-            _context8.next = 58;
+            _context8.next = 61;
             break;
           }
-          _context8.next = 52;
+          _context8.next = 55;
           return put(mapActions.setAnimationEndTime({
             mapId: mapId,
             animationEndTime: getAnimationEndTime(animationEndTime)
           }));
-        case 52:
+        case 55:
           if (animationLength) {
-            _context8.next = 58;
+            _context8.next = 61;
             break;
           }
-          _context8.next = 55;
+          _context8.next = 58;
           return select(getAnimationEndTime$1, mapId);
-        case 55:
+        case 58:
           animationEnd = _context8.sent;
-          _context8.next = 58;
+          _context8.next = 61;
           return put(mapActions.setAnimationStartTime({
             mapId: mapId,
             animationStartTime: dateUtils.sub(dateUtils.utc(animationEnd), {
               minutes: 5 * 60 // set to default of 5 hours
             }).toISOString()
           }));
-        case 58:
+        case 61:
           if (!animationLength) {
-            _context8.next = 64;
+            _context8.next = 67;
             break;
           }
-          _context8.next = 61;
+          _context8.next = 64;
           return select(getAnimationEndTime$1, mapId);
-        case 61:
+        case 64:
           _animationEnd = _context8.sent;
-          _context8.next = 64;
+          _context8.next = 67;
           return put(mapActions.setAnimationStartTime({
             mapId: mapId,
             animationStartTime: dateUtils.sub(dateUtils.utc(_animationEnd), {
               minutes: animationLength
             }).toISOString()
           }));
-        case 64:
+        case 67:
           if (!(animationPayload && animationPayload.speed)) {
-            _context8.next = 67;
+            _context8.next = 70;
             break;
           }
-          _context8.next = 67;
+          _context8.next = 70;
           return put(mapActions.setAnimationDelay({
             mapId: mapId,
             animationDelay: getSpeedDelay(animationPayload.speed)
           }));
-        case 67:
+        case 70:
           if (!(shouldAnimate === true)) {
-            _context8.next = 92;
+            _context8.next = 95;
             break;
           }
           duration = animationPayload && animationPayload.duration ? animationPayload.duration : 5 * 60; //  set to default of 5 hours
           if (!(shouldEndtimeOverride && animationEndTime)) {
-            _context8.next = 75;
+            _context8.next = 78;
             break;
           }
-          _context8.next = 72;
+          _context8.next = 75;
           return select(getAnimationEndTime$1, mapId);
-        case 72:
+        case 75:
           _context8.t0 = _context8.sent;
-          _context8.next = 76;
+          _context8.next = 79;
           break;
-        case 75:
+        case 78:
           _context8.t0 = dateUtils.dateToString(dateUtils.utc(), dateFormat);
-        case 76:
+        case 79:
           _animationEnd2 = _context8.t0;
           if (!(shouldEndtimeOverride && animationLength)) {
-            _context8.next = 83;
+            _context8.next = 86;
             break;
           }
-          _context8.next = 80;
+          _context8.next = 83;
           return select(getAnimationStartTime, mapId);
-        case 80:
+        case 83:
           _context8.t1 = _context8.sent;
-          _context8.next = 84;
+          _context8.next = 87;
           break;
-        case 83:
+        case 86:
           _context8.t1 = dateUtils.dateToString(dateUtils.sub(dateUtils.utc(_animationEnd2), {
             minutes: duration
           }), dateFormat);
-        case 84:
+        case 87:
           animationStart = _context8.t1;
-          _context8.next = 87;
+          _context8.next = 90;
           return put(mapActions.mapStartAnimation({
             mapId: mapId,
             start: animationStart,
             end: _animationEnd2,
             interval: interval || defaultTimeStep
           }));
-        case 87:
+        case 90:
           if (!interval) {
-            _context8.next = 90;
+            _context8.next = 93;
             break;
           }
-          _context8.next = 90;
+          _context8.next = 93;
           return put(mapActions.toggleTimestepAuto({
             mapId: mapId,
             timestepAuto: false
           }));
-        case 90:
-          _context8.next = 95;
+        case 93:
+          _context8.next = 98;
           break;
-        case 92:
+        case 95:
           if (!(toggleTimestepAuto !== undefined)) {
-            _context8.next = 95;
+            _context8.next = 98;
             break;
           }
-          _context8.next = 95;
+          _context8.next = 98;
           return put(mapActions.toggleTimestepAuto({
             mapId: mapId,
             timestepAuto: toggleTimestepAuto
           }));
-        case 95:
+        case 98:
           // show legend
           shouldOpenLegend = shouldShowLegend !== undefined ? shouldShowLegend : IS_LEGEND_OPEN_BY_DEFAULT;
-          _context8.next = 98;
+          _context8.next = 101;
           return select(getLegendId, mapId);
-        case 98:
+        case 101:
           legendId = _context8.sent;
           if (!legendId) {
-            _context8.next = 102;
+            _context8.next = 105;
             break;
           }
-          _context8.next = 102;
+          _context8.next = 105;
           return put(uiActions.setToggleOpenDialog({
             type: legendId,
             setOpen: shouldOpenLegend
           }));
-        case 102:
+        case 105:
           if (!dockedLayerManagerSize) {
-            _context8.next = 105;
+            _context8.next = 108;
             break;
           }
-          _context8.next = 105;
+          _context8.next = 108;
           return put(mapActions.setDockedLayerManagerSize({
             mapId: mapId,
             dockedLayerManagerSize: dockedLayerManagerSize
           }));
-        case 105:
+        case 108:
           if (!(animationEndTime && (shouldEndtimeOverride || !(shouldAutoUpdate || shouldAnimate)))) {
-            _context8.next = 121;
+            _context8.next = 124;
             break;
           }
           fiveMinuteDelayForAnimation = 1000 * 60 * 5;
-          _context8.next = 109;
+          _context8.next = 112;
           return delay(fiveMinuteDelayForAnimation);
-        case 109:
-          _context8.next = 111;
+        case 112:
+          _context8.next = 114;
           return select(getAnimationEndTime$1, mapId);
-        case 111:
+        case 114:
           _animationEnd3 = _context8.sent;
-          _context8.next = 114;
+          _context8.next = 117;
           return put(mapActions.setAnimationEndTime({
             mapId: mapId,
             animationEndTime: dateUtils.add(dateUtils.utc(_animationEnd3), {
               minutes: 5
             }).toISOString()
           }));
-        case 114:
-          _context8.next = 116;
+        case 117:
+          _context8.next = 119;
           return select(getAnimationStartTime, mapId);
-        case 116:
+        case 119:
           _animationStart = _context8.sent;
-          _context8.next = 119;
+          _context8.next = 122;
           return put(mapActions.setAnimationStartTime({
             mapId: mapId,
             animationStartTime: dateUtils.add(dateUtils.utc(_animationStart), {
               minutes: 5
             }).toISOString()
           }));
-        case 119:
-          _context8.next = 105;
+        case 122:
+          _context8.next = 108;
           break;
-        case 121:
-          _context8.next = 126;
+        case 124:
+          _context8.next = 130;
           break;
-        case 123:
-          _context8.prev = 123;
-          _context8.t2 = _context8["catch"](0);
-          console.error(_context8.t2);
         case 126:
+          _context8.prev = 126;
+          _context8.t2 = _context8["catch"](0);
+          _context8.next = 130;
+          return put(mapActions.setMapPresetError({
+            mapId: payload.mapId,
+            error: _context8.t2.message
+          }));
+        case 130:
         case "end":
           return _context8.stop();
       }
-    }, _callee6, null, [[0, 123]]);
+    }, _callee6, null, [[0, 126]]);
   })();
 }
 function unregisterMapSaga(_ref7) {
@@ -5947,7 +6058,7 @@ function setStepBackwardOrForwardSaga(_ref8) {
           _yield$select2 = _slicedToArray(_yield$select, 2);
           dataStartTime = _yield$select2[0];
           dataEndTime = _yield$select2[1];
-          if (!isValid(currentTime)) {
+          if (!dateUtils.isValid(currentTime)) {
             _context10.next = 23;
             break;
           }
@@ -5955,13 +6066,13 @@ function setStepBackwardOrForwardSaga(_ref8) {
             var nextTime = currentTime + timeStep;
             var roundedTime = mapUtils.roundWithTimeStep(nextTime, timeStep, 'ceil');
             var newTime = Math.min(roundedTime, dataEndTime || roundedTime);
-            return fromUnixTime(newTime).toISOString();
+            return dateUtils.fromUnix(newTime).toISOString();
           };
           makeBackwardStep = function makeBackwardStep() {
             var nextTime = currentTime - timeStep;
             var roundedTime = mapUtils.roundWithTimeStep(nextTime, timeStep, 'floor');
             var newTime = Math.max(roundedTime, dataStartTime || roundedTime);
-            return fromUnixTime(newTime).toISOString();
+            return dateUtils.fromUnix(newTime).toISOString();
           };
           selectedTimeString = isForwardStep ? makeForwardStep() : makeBackwardStep();
           _context10.next = 19;
@@ -6828,9 +6939,8 @@ var drawAdapter = createEntityAdapter({
   }
 });
 var getDrawToolByLayerId = function getDrawToolByLayerId(draft, layerId) {
-  var state = current$1(draft);
-  var drawTool = state.ids.map(function (id) {
-    return state.entities[id];
+  var drawTool = draft.ids.map(function (id) {
+    return draft.entities[id];
   }).find(function (tool) {
     return (tool === null || tool === void 0 ? void 0 : tool.geoJSONLayerId) === layerId;
   });
@@ -7137,7 +7247,7 @@ function registerDrawToolSaga(_ref) {
 function changeDrawToolSaga(_ref2) {
   var payload = _ref2.payload;
   return /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var _a, _b, _c, _d, drawModeId, drawToolId, _payload$shouldUpdate, shouldUpdateShape, drawingTool, _drawingTool$shouldAl, shouldAllowMultipleShapes, geoJSONIntersectionLayerId, geoJSONIntersectionBoundsLayerId, newDrawMode, currentGeoJSONLayer, _ref3, currentGeoJSON, _ref3$selectedFeature, selectedFeatureIndex, currentSelectionType, newSelectionType, isNewToolSelected, shouldUpdateNewShape, geoJSONFeatureCollection, newGeoJSON;
+    var _a, _b, _c, drawModeId, drawToolId, _payload$shouldUpdate, shouldUpdateShape, drawingTool, _drawingTool$shouldAl, shouldAllowMultipleShapes, geoJSONIntersectionLayerId, geoJSONIntersectionBoundsLayerId, newDrawMode, geoJSONLayer, geoJSON, lastFeatureIndex, newGeoJSON, currentGeoJSONLayer, _ref3, currentGeoJSON, _ref3$selectedFeature, selectedFeatureIndex, currentSelectionType, newSelectionType, isNewToolSelected, shouldUpdateNewShape, shapeWithSelectionType, geoJSONFeatureCollection, _newGeoJSON;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -7153,7 +7263,7 @@ function changeDrawToolSaga(_ref2) {
         case 8:
           newDrawMode = _context2.sent;
           if (!(!newDrawMode || !drawingTool.activeDrawModeId && newDrawMode.isSelectable)) {
-            _context2.next = 13;
+            _context2.next = 24;
             break;
           }
           _context2.next = 12;
@@ -7163,90 +7273,118 @@ function changeDrawToolSaga(_ref2) {
             drawMode: ''
           }));
         case 12:
+          _context2.next = 14;
+          return select(getLayerById, drawingTool.geoJSONLayerId);
+        case 14:
+          geoJSONLayer = _context2.sent;
+          geoJSON = geoJSONLayer === null || geoJSONLayer === void 0 ? void 0 : geoJSONLayer.geojson;
+          lastFeatureIndex = geoJSON !== undefined && getLastEmptyFeatureIndex(geoJSON) || undefined;
+          if (!(lastFeatureIndex !== undefined)) {
+            _context2.next = 23;
+            break;
+          }
+          newGeoJSON = Object.assign(Object.assign({}, geoJSON), {
+            features: geoJSON.features.filter(function (_feature, index) {
+              return index !== lastFeatureIndex;
+            })
+          });
+          _context2.next = 21;
+          return put(layerActions.updateFeature({
+            layerId: drawingTool.geoJSONLayerId,
+            geojson: newGeoJSON
+          }));
+        case 21:
+          _context2.next = 23;
+          return put(layerActions.setSelectedFeature({
+            layerId: drawingTool.geoJSONLayerId,
+            selectedFeatureIndex: newGeoJSON.features.length > 0 ? newGeoJSON.features.length - 1 : 0
+          }));
+        case 23:
           return _context2.abrupt("return");
-        case 13:
+        case 24:
           if (!(newDrawMode.value === 'DELETE')) {
-            _context2.next = 22;
+            _context2.next = 33;
             break;
           }
-          _context2.next = 16;
+          _context2.next = 27;
           return put(layerActions.layerChangeGeojson({
             layerId: drawingTool.geoJSONLayerId,
             geojson: emptyGeoJSON
           }));
-        case 16:
+        case 27:
           if (!geoJSONIntersectionLayerId) {
-            _context2.next = 19;
+            _context2.next = 30;
             break;
           }
-          _context2.next = 19;
+          _context2.next = 30;
           return put(layerActions.layerChangeGeojson({
             layerId: geoJSONIntersectionLayerId,
             geojson: emptyGeoJSON
           }));
-        case 19:
-          _context2.next = 21;
+        case 30:
+          _context2.next = 32;
           return put(layerActions.toggleFeatureMode({
             layerId: drawingTool.geoJSONLayerId,
             isInEditMode: false,
             drawMode: ''
           }));
-        case 21:
+        case 32:
           return _context2.abrupt("return");
-        case 22:
-          _context2.next = 24;
+        case 33:
+          _context2.next = 35;
           return select(getLayerById, drawingTool.geoJSONLayerId);
-        case 24:
+        case 35:
           currentGeoJSONLayer = _context2.sent;
           _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;
+          newSelectionType = newDrawMode.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
+          shouldUpdateNewShape = !((_c = currentGeoJSON === null || currentGeoJSON === void 0 ? void 0 : currentGeoJSON.features) === null || _c === void 0 ? void 0 : _c.length) || isNewToolSelected; // don't change anything if same tool is selected again
           if (!(shouldUpdateNewShape && shouldUpdateShape)) {
-            _context2.next = 38;
+            _context2.next = 50;
             break;
           }
-          geoJSONFeatureCollection = getFeatureCollection(newDrawMode.shape, shouldAllowMultipleShapes, currentGeoJSON);
-          newGeoJSON = getGeoJson(geoJSONFeatureCollection, shouldAllowMultipleShapes);
+          shapeWithSelectionType = addSelectionTypeToGeoJSON(newDrawMode.shape, newDrawMode.selectionType);
+          geoJSONFeatureCollection = getFeatureCollection(shapeWithSelectionType, shouldAllowMultipleShapes, currentGeoJSON);
+          _newGeoJSON = getGeoJson(geoJSONFeatureCollection, shouldAllowMultipleShapes);
           if (shouldAllowMultipleShapes) {
-            moveFeature(currentGeoJSON, newGeoJSON, selectedFeatureIndex, '');
+            moveFeature(currentGeoJSON, _newGeoJSON, selectedFeatureIndex, '');
           }
-          _context2.next = 36;
+          _context2.next = 48;
           return put(layerActions.setSelectedFeature({
             layerId: drawingTool.geoJSONLayerId,
-            selectedFeatureIndex: newGeoJSON.features.length - 1
+            selectedFeatureIndex: _newGeoJSON.features.length - 1
           }));
-        case 36:
-          _context2.next = 38;
+        case 48:
+          _context2.next = 50;
           return put(layerActions.updateFeature(Object.assign(Object.assign({
             layerId: drawingTool.geoJSONLayerId,
-            geojson: newGeoJSON
+            geojson: _newGeoJSON
           }, geoJSONIntersectionLayerId && {
             geoJSONIntersectionLayerId: geoJSONIntersectionLayerId
           }), geoJSONIntersectionBoundsLayerId && {
             geoJSONIntersectionBoundsLayerId: geoJSONIntersectionBoundsLayerId
           })));
-        case 38:
-          _context2.next = 40;
+        case 50:
+          _context2.next = 52;
           return put(layerActions.toggleFeatureMode({
             layerId: drawingTool.geoJSONLayerId,
             isInEditMode: newDrawMode.isSelectable,
             drawMode: newDrawMode.value
           }));
-        case 40:
-          _context2.next = 45;
+        case 52:
+          _context2.next = 57;
           break;
-        case 42:
-          _context2.prev = 42;
+        case 54:
+          _context2.prev = 54;
           _context2.t0 = _context2["catch"](0);
           // eslint-disable-next-line no-console
           console.log('error changeDrawToolSaga', _context2.t0);
-        case 45:
+        case 57:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[0, 42]]);
+    }, _callee2, null, [[0, 54]]);
   })();
 }
 function changeIntersectionSaga(_ref4) {
@@ -7370,17 +7508,26 @@ var createMultipleLayersState = function createMultipleLayersState(layers, mapId
       byId: {}
     }
   };
-  for (var i = 0; i < layers.length; i += 1) {
-    var layerState = createLayer(Object.assign(Object.assign({}, layers[i]), {
-      id: layers[i].id,
-      mapId: mapId
-    }));
-    mockState.byId[layers[i].id] = Object.assign({}, layerState);
-    mockState.allIds.push(layers[i].id);
-    if (layers[i].layerType === LayerType.baseLayer) {
-      mockState.availableBaseLayers.byId[layers[i].id] = Object.assign({}, layerState);
-      mockState.availableBaseLayers.allIds.push(layers[i].id);
+  var _iterator = _createForOfIteratorHelper(layers),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var layer = _step.value;
+      var layerState = createLayer(Object.assign(Object.assign({}, layer), {
+        id: layer.id,
+        mapId: mapId
+      }));
+      mockState.byId[layer.id] = Object.assign({}, layerState);
+      mockState.allIds.push(layer.id);
+      if (layer.layerType === LayerType.baseLayer) {
+        mockState.availableBaseLayers.byId[layer.id] = Object.assign({}, layerState);
+        mockState.availableBaseLayers.allIds.push(layer.id);
+      }
     }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
   }
   return mockState;
 };
@@ -7392,12 +7539,13 @@ var createWebmapState = function createWebmapState() {
   for (var _len = arguments.length, mapIds = new Array(_len), _key = 0; _key < _len; _key++) {
     mapIds[_key] = arguments[_key];
   }
-  for (var i = 0; i < mapIds.length; i += 1) {
+  for (var _i = 0, _mapIds = mapIds; _i < _mapIds.length; _i++) {
+    var mapId = _mapIds[_i];
     var mapState = createMap({
-      id: mapIds[i]
+      id: mapId
     });
-    mockState.byId[mapIds[i]] = Object.assign({}, mapState);
-    mockState.allIds.push(mapIds[i]);
+    mockState.byId[mapId] = Object.assign({}, mapState);
+    mockState.allIds.push(mapId);
   }
   return mockState;
 };
@@ -7409,13 +7557,14 @@ var createMapDimensionsState = function createMapDimensionsState(dimensions) {
   for (var _len2 = arguments.length, mapIds = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
     mapIds[_key2 - 1] = arguments[_key2];
   }
-  for (var i = 0; i < mapIds.length; i += 1) {
+  for (var _i2 = 0, _mapIds2 = mapIds; _i2 < _mapIds2.length; _i2++) {
+    var mapId = _mapIds2[_i2];
     var mapState = createMap({
-      id: mapIds[i]
+      id: mapId
     });
-    mockState.byId[mapIds[i]] = Object.assign({}, mapState);
-    mockState.byId[mapIds[i]].dimensions = dimensions;
-    mockState.allIds.push(mapIds[i]);
+    mockState.byId[mapId] = Object.assign({}, mapState);
+    mockState.byId[mapId].dimensions = dimensions;
+    mockState.allIds.push(mapId);
   }
   return mockState;
 };