@opengeoweb/store 12.1.2 → 12.3.0

package/index.esm.js

@@ -1,10 +1,10 @@
-import { createSlice, createSelector, createAction, createListenerMiddleware, isAnyOf, createEntityAdapter, combineReducers, configureStore, compose, EnhancerArray } from '@reduxjs/toolkit';
+import { createSlice, createSelector, createAction, createListenerMiddleware, isAnyOf, createEntityAdapter, combineReducers, configureStore } from '@reduxjs/toolkit';
 import { isEqual, isEmpty, compact } from 'lodash';
 import { dateUtils, PROJECTION, defaultDelay } from '@opengeoweb/shared';
 import { webmapUtils, parseISO8601IntervalToDateInterval, LayerType, getWMJSMapById, webmapTestSettings, WMLayer, getWMSRequests, handleDateUtilsISOString, isProjectionSupported, queryWMSLayers, getWMLayerById, WMInvalidDateValues } from '@opengeoweb/webmap';
-import { defaultTimeStep, defaultTimeSpan, defaultAnimationDelayAtStart, defaultSecondsPerPx, roundWithTimeStep, getSpeedDelay } from '@opengeoweb/timeslider';
+import { defaultSecondsPerPx, defaultAnimationDelayAtStart, defaultTimeStep, defaultTimeSpan, roundWithTimeStep, getSpeedDelay } from '@opengeoweb/timeslider';
 import { produce } from 'immer';
-import { getGeoJson, moveFeature, createInterSections, getLastEmptyFeatureIndex, defaultLayers, addSelectionTypeToGeoJSON, getFeatureCollection, emptyGeoJSON, defaultIntersectionStyleProperties, isOpenLayersEnabled } from '@opengeoweb/webmap-react';
+import { getLastEmptyFeatureIndex, getGeoJson, moveFeature, createInterSections, defaultLayers, emptyGeoJSON, defaultIntersectionStyleProperties, addSelectionTypeToGeoJSON, getFeatureCollection, isOpenLayersEnabled } from '@opengeoweb/webmap-react';
 export { defaultLayers } from '@opengeoweb/webmap-react';
 import { useSelector, useDispatch } from 'react-redux';
 import { useCallback, useEffect } from 'react';
@@ -62,18 +62,18 @@ function _classCallCheck(a, n) {
 function _defineProperties(e, r) {
   for (var t = 0; t < r.length; t++) {
     var o = r[t];
-    o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o);
+    o.enumerable = o.enumerable || false, o.configurable = true, "value" in o && (o.writable = true), Object.defineProperty(e, _toPropertyKey(o.key), o);
   }
 }
 function _createClass(e, r, t) {
   return r && _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
-    writable: !1
+    writable: false
   }), e;
 }
 function _createForOfIteratorHelper(r, e) {
   var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
   if (!t) {
-    if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e  ) {
+    if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e) {
       t && (r = t);
       var n = 0,
         F = function () {};
@@ -81,9 +81,9 @@ function _createForOfIteratorHelper(r, e) {
         s: F,
         n: function () {
           return n >= r.length ? {
-            done: !0
+            done: true
           } : {
-            done: !1,
+            done: false,
             value: r[n++]
           };
         },
@@ -96,8 +96,8 @@ function _createForOfIteratorHelper(r, e) {
     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 o,
-    a = !0,
-    u = !1;
+    a = true,
+    u = false;
   return {
     s: function () {
       t = t.call(r);
@@ -107,7 +107,7 @@ function _createForOfIteratorHelper(r, e) {
       return a = r.done, r;
     },
     e: function (r) {
-      u = !0, o = r;
+      u = true, o = r;
     },
     f: function () {
       try {
@@ -121,9 +121,9 @@ function _createForOfIteratorHelper(r, e) {
 function _defineProperty(e, r, t) {
   return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
     value: t,
-    enumerable: !0,
-    configurable: !0,
-    writable: !0
+    enumerable: true,
+    configurable: true,
+    writable: true
   }) : e[r] = t, e;
 }
 function _getPrototypeOf(t) {
@@ -136,11 +136,11 @@ function _inherits(t, e) {
   t.prototype = Object.create(e && e.prototype, {
     constructor: {
       value: t,
-      writable: !0,
-      configurable: !0
+      writable: true,
+      configurable: true
     }
   }), Object.defineProperty(t, "prototype", {
-    writable: !1
+    writable: false
   }), e && _setPrototypeOf(t, e);
 }
 function _isNativeReflectConstruct() {
@@ -162,15 +162,15 @@ function _iterableToArrayLimit(r, l) {
       i,
       u,
       a = [],
-      f = !0,
-      o = !1;
+      f = true,
+      o = false;
     try {
       if (i = (t = t.call(r)).next, 0 === l) {
         if (Object(t) !== t) return;
         f = !1;
       } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
     } catch (r) {
-      o = !0, n = r;
+      o = true, n = r;
     } finally {
       try {
         if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return;
@@ -200,7 +200,7 @@ function ownKeys(e, r) {
 function _objectSpread2(e) {
   for (var r = 1; r < arguments.length; r++) {
     var t = null != arguments[r] ? arguments[r] : {};
-    r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
+    r % 2 ? ownKeys(Object(t), true).forEach(function (r) {
       _defineProperty(e, r, t[r]);
     }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
       Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
@@ -215,7 +215,7 @@ function _objectWithoutProperties(e, t) {
     i = _objectWithoutPropertiesLoose(e, t);
   if (Object.getOwnPropertySymbols) {
     var n = Object.getOwnPropertySymbols(e);
-    for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
+    for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
   }
   return i;
 }
@@ -223,7 +223,7 @@ function _objectWithoutPropertiesLoose(r, e) {
   if (null == r) return {};
   var t = {};
   for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (e.indexOf(n) >= 0) continue;
+    if (-1 !== e.indexOf(n)) continue;
     t[n] = r[n];
   }
   return t;
@@ -251,9 +251,9 @@ function _regeneratorRuntime() {
   function define(t, e, r) {
     return Object.defineProperty(t, e, {
       value: r,
-      enumerable: !0,
-      configurable: !0,
-      writable: !0
+      enumerable: true,
+      configurable: true,
+      writable: true
     }), t[e];
   }
   try {
@@ -346,7 +346,7 @@ function _regeneratorRuntime() {
         if ("throw" === i) throw a;
         return {
           value: t,
-          done: !0
+          done: true
         };
       }
       for (n.method = i, n.arg = a;;) {
@@ -397,7 +397,7 @@ function _regeneratorRuntime() {
   function Context(t) {
     this.tryEntries = [{
       tryLoc: "root"
-    }], t.forEach(pushTryEntry, this), this.reset(!0);
+    }], t.forEach(pushTryEntry, this), this.reset(true);
   }
   function values(e) {
     if (e || "" === e) {
@@ -407,8 +407,8 @@ function _regeneratorRuntime() {
       if (!isNaN(e.length)) {
         var o = -1,
           i = function next() {
-            for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next;
-            return next.value = t, next.done = !0, next;
+            for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = false, next;
+            return next.value = t, next.done = true, next;
           };
         return i.next = i;
       }
@@ -417,10 +417,10 @@ function _regeneratorRuntime() {
   }
   return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", {
     value: GeneratorFunctionPrototype,
-    configurable: !0
+    configurable: true
   }), o(GeneratorFunctionPrototype, "constructor", {
     value: GeneratorFunction,
-    configurable: !0
+    configurable: true
   }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) {
     var e = "function" == typeof t && t.constructor;
     return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name));
@@ -449,17 +449,17 @@ function _regeneratorRuntime() {
     return r.reverse(), function next() {
       for (; r.length;) {
         var t = r.pop();
-        if (t in e) return next.value = t, next.done = !1, next;
+        if (t in e) return next.value = t, next.done = false, next;
       }
-      return next.done = !0, next;
+      return next.done = true, next;
     };
   }, e.values = values, Context.prototype = {
     constructor: Context,
     reset: function (e) {
-      if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t);
+      if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = false, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t);
     },
     stop: function () {
-      this.done = !0;
+      this.done = true;
       var t = this.tryEntries[0].completion;
       if ("throw" === t.type) throw t.arg;
       return this.rval;
@@ -478,10 +478,10 @@ function _regeneratorRuntime() {
           var c = n.call(i, "catchLoc"),
             u = n.call(i, "finallyLoc");
           if (c && u) {
-            if (this.prev < i.catchLoc) return handle(i.catchLoc, !0);
+            if (this.prev < i.catchLoc) return handle(i.catchLoc, true);
             if (this.prev < i.finallyLoc) return handle(i.finallyLoc);
           } else if (c) {
-            if (this.prev < i.catchLoc) return handle(i.catchLoc, !0);
+            if (this.prev < i.catchLoc) return handle(i.catchLoc, true);
           } else {
             if (!u) throw Error("try statement without catch or finally");
             if (this.prev < i.finallyLoc) return handle(i.finallyLoc);
@@ -549,7 +549,7 @@ function _toPrimitive(t, r) {
   if ("object" != typeof t || !t) return t;
   var e = t[Symbol.toPrimitive];
   if (void 0 !== e) {
-    var i = e.call(t, r || "default");
+    var i = e.call(t, r);
     if ("object" != typeof i) return i;
     throw new TypeError("@@toPrimitive must return a primitive value.");
   }
@@ -878,8 +878,8 @@ var createMap = function createMap(_ref) {
     shouldEndtimeOverride = _ref$shouldEndtimeOve === void 0 ? false : _ref$shouldEndtimeOve,
     _ref$bbox = _ref.bbox,
     bbox = _ref$bbox === void 0 ? {
-      left: -19000000,
-      bottom: -19000000,
+      left: -19e6,
+      bottom: -19e6,
       right: 19000000,
       top: 19000000
     } : _ref$bbox,
@@ -1955,8 +1955,14 @@ var slice$6 = createSlice({
     onUpdateLayerInformation: function onUpdateLayerInformation(draft, action) {
       var _action$payload16 = action.payload,
         layerStyle = _action$payload16.layerStyle,
-        layerDimensions = _action$payload16.layerDimensions;
+        layerDimensions = _action$payload16.layerDimensions,
+        error = _action$payload16.error;
+      if (error) {
+        draft.byId[error.layerId].status = LayerStatus.error;
+        return;
+      }
       if (layerStyle && draft.byId[layerStyle.layerId]) {
+        draft.byId[layerStyle.layerId].status = LayerStatus["default"];
         draft.byId[layerStyle.layerId].style = layerStyle === null || layerStyle === void 0 ? void 0 : layerStyle.style;
       }
       if (!layerDimensions) {
@@ -1974,6 +1980,7 @@ var slice$6 = createSlice({
         var _reduxLayer$dimension;
         var layerId = layerToUpdate.id;
         var reduxLayer = draft.byId[layerId];
+        reduxLayer.status = LayerStatus["default"];
         /* Find the wmLayer */
         var wmLayer = webmapUtils.getWMLayerById(layerId);
         (_reduxLayer$dimension = reduxLayer.dimensions) !== null && _reduxLayer$dimension !== void 0 ? _reduxLayer$dimension : reduxLayer.dimensions = [];
@@ -2194,9 +2201,10 @@ var slice$6 = createSlice({
         targets = _action$payload24.targets,
         source = _action$payload24.source;
       return targets.reduce(function (prevState, target) {
+        var actionType = (source === null || source === void 0 ? void 0 : source.type) || 'GENERIC_SYNC_SETLAYERACTIONS';
         var action = {
           payload: target,
-          type: source && source.type
+          type: actionType
         };
         /* Handle the Layer action with the same logic, using the same reducer */
         return layerReducer(prevState, action);
@@ -2957,9 +2965,10 @@ var slice$4 = createSlice({
         targets = _action$payload37.targets,
         source = _action$payload37.source;
       return targets.reduce(function (prevState, target) {
+        var actionType = (source === null || source === void 0 ? void 0 : source.type) || 'GENERIC_SYNC_SETLAYERACTIONS';
         var action = {
           payload: target,
-          type: source && source.type
+          type: actionType
         };
         /* Handle the Layer action with the same logic, using the same reducer */
         return mapReducer(prevState, action);
@@ -3697,6 +3706,8 @@ var DialogTypes;
   DialogTypes["PublicWarnings"] = "publicWarnings";
   DialogTypes["Search"] = "search";
   DialogTypes["AreaObjectLoader"] = "areaObjectLoader";
+  DialogTypes["SoundingsSources"] = "soundingsSources";
+  DialogTypes["soundingsLocations"] = "soundingsLocations";
 })(DialogTypes || (DialogTypes = {}));
 
 var types$2 = /*#__PURE__*/Object.freeze({
@@ -7382,6 +7393,7 @@ var getGroupForMap = function getGroupForMap(mapId, state) {
 openlayersListener.startListening({
   actionCreator: mapActions.setBbox,
   effect: function effect(_ref, listenerApi) {
+    var _window$visualViewpor, _window$visualViewpor2;
     var payload = _ref.payload;
     var mapId = payload.mapId,
       bbox = payload.bbox,
@@ -7393,11 +7405,16 @@ openlayersListener.startListening({
       center: getCenter(extent)
     });
     storedViewForMap.setView(view);
-    // 1024 is the current best guess for width / height of a map
+    // OpenLayers View need a viewportsize to optimally fit an extent to a map. Try to find it in the following order:
+    // 1. Try to find the div element containing the layers and get its clientWidth/clientHeight
+    // 2. If that fails try the viewport visualViewport width/height
+    // 3. If that fails, fallback to 1024 / 1024
     // Feature request made for OL to help us get this right https://github.com/openlayers/openlayers/issues/16572
-    view.setViewportSize([1024, 1024]);
-    var resolution = view.getResolutionForExtent(extent);
-    view.setResolution(resolution);
+    var mapElement = document.getElementById("mapcontainer_".concat(mapId));
+    var viewPortWidth = (mapElement === null || mapElement === void 0 ? void 0 : mapElement.clientWidth) || ((_window$visualViewpor = window.visualViewport) === null || _window$visualViewpor === void 0 ? void 0 : _window$visualViewpor.width) || 1024;
+    var viewPortHeight = (mapElement === null || mapElement === void 0 ? void 0 : mapElement.clientHeight) || ((_window$visualViewpor2 = window.visualViewport) === null || _window$visualViewpor2 === void 0 ? void 0 : _window$visualViewpor2.height) || 1024;
+    view.setViewportSize([viewPortWidth, viewPortHeight]);
+    view.fit(extent);
     // Also: if this map is part of a group and the srs has changed => change group view
     var mapSyncGroup = getGroupForMap(mapId, listenerApi.getState());
     if (!mapSyncGroup) {
@@ -8625,7 +8642,8 @@ var mockStateMapWithLayer = function mockStateMapWithLayer(layer, mapId) {
       layerType: layer.layerType,
       mapId: mapId,
       service: layer.service,
-      dimensions: layer.dimensions
+      dimensions: layer.dimensions,
+      status: layer.status
     }),
     syncGroups: _objectSpread2(_objectSpread2({}, initialState$2), {}, {
       viewState: {
@@ -8920,9 +8938,6 @@ var createMockStore = function createMockStore(mockState) {
     }
   });
 };
-var getDefaultEnhancers = function getDefaultEnhancers() {
-  return new EnhancerArray();
-};
 /**
  * This creates an OpenGeoWeb redux store for redux connected components
  *
@@ -8937,12 +8952,12 @@ var configureOpenGeoWebStore = function configureOpenGeoWebStore() {
   var preloadedState = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var extraReducers = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var extraMiddleWares = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
-  var extraEnhancers = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : getDefaultEnhancers();
+  var extraEnhancers = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
   var enableDevTools = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
   var allReducers = unifyReducerMaps([storeReducerMap, extraReducers]);
   var openGeoWebReducers = combineReducers(allReducers);
   // Combine middlewares
-  var middlewares = [mapListener.middleware, serviceListener.middleware, layersListener.middleware, genericListener.middleware].concat(_toConsumableArray(extraMiddleWares));
+  var middlewares = [mapListener.middleware, serviceListener.middleware, layersListener.middleware, genericListener.middleware, openlayersListener.middleware].concat(_toConsumableArray(extraMiddleWares));
   // Ensure we do not add middlewares twice
   var uniqueMiddlewares = Array.from(new Set(middlewares.map(function (obj) {
     return obj;
@@ -8950,19 +8965,19 @@ var configureOpenGeoWebStore = function configureOpenGeoWebStore() {
   return configureStore({
     reducer: openGeoWebReducers,
     preloadedState: preloadedState,
-    enhancers: function enhancers(defaultEnhancers) {
-      return [compose.apply(void 0, [].concat(_toConsumableArray(defaultEnhancers), _toConsumableArray(extraEnhancers)))];
+    enhancers: function enhancers(getDefaultEnhancers) {
+      return getDefaultEnhancers().concat(extraEnhancers);
     },
     devTools: enableDevTools,
     middleware: function middleware(getDefaultMiddleware) {
-      return _toConsumableArray(getDefaultMiddleware({
+      return getDefaultMiddleware({
         serializableCheck: {
           warnAfter: 128
         },
         immutableCheck: {
           warnAfter: 128
         }
-      })).concat(uniqueMiddlewares);
+      }).concat(uniqueMiddlewares);
     }
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/store",
-  "version": "12.1.2",
+  "version": "12.3.0",
   "description": "GeoWeb Store library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,15 +8,15 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/shared": "12.1.2",
-    "react-redux": "^8.1.3",
-    "@reduxjs/toolkit": "^1.9.7",
-    "@opengeoweb/webmap-react": "12.1.2",
-    "@opengeoweb/webmap": "12.1.2",
+    "@opengeoweb/shared": "12.3.0",
+    "react-redux": "^9.2.0",
+    "@reduxjs/toolkit": "^2.6.1",
+    "@opengeoweb/webmap-react": "12.3.0",
+    "@opengeoweb/webmap": "12.3.0",
     "immer": "^10.0.3",
     "lodash": "^4.17.21",
-    "@opengeoweb/metronome": "12.1.2",
-    "@opengeoweb/timeslider": "12.1.2",
+    "@opengeoweb/metronome": "12.3.0",
+    "@opengeoweb/timeslider": "12.3.0",
     "react-router-dom": "^6.23.1",
     "ol": "^10.4.0",
     "@turf/turf": "^7.2.0"

package/src/store/drawingTool/listener.d.ts

@@ -1,3 +1,3 @@
 import { DrawtoolModuleStore } from './reducer';
 import { WebMapStateModuleState } from '../map';
-export declare const drawingToolListener: import("@reduxjs/toolkit").ListenerMiddlewareInstance<DrawtoolModuleStore & WebMapStateModuleState, import("@reduxjs/toolkit").ThunkDispatch<DrawtoolModuleStore & WebMapStateModuleState, unknown, import("redux").AnyAction>, unknown>;
+export declare const drawingToolListener: import("@reduxjs/toolkit").ListenerMiddlewareInstance<DrawtoolModuleStore & WebMapStateModuleState, import("redux-thunk").ThunkDispatch<DrawtoolModuleStore & WebMapStateModuleState, unknown, import("redux").UnknownAction>, unknown>;

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

@@ -9,11 +9,11 @@ export interface DrawToolItem {
     geoJSONIntersectionLayerId?: string;
     geoJSONIntersectionBoundsLayerId?: string;
 }
-export type DrawingToolState = EntityState<DrawToolItem>;
+export type DrawingToolState = EntityState<DrawToolItem, string>;
 export interface DrawtoolModuleStore {
     drawingtools?: DrawingToolState;
 }
-export declare const drawAdapter: import("@reduxjs/toolkit").EntityAdapter<DrawToolItem>;
+export declare const drawAdapter: import("@reduxjs/toolkit").EntityAdapter<DrawToolItem, string>;
 export declare const initialState: DrawingToolState;
 export declare const drawingToolReducer: import("redux").Reducer<DrawingToolState>, drawingToolActions: import("@reduxjs/toolkit").CaseReducerActions<{
     registerDrawTool: (draft: Draft<DrawingToolState>, action: PayloadAction<MapDrawToolOptions & {