@opengeoweb/core 9.30.0 → 9.31.0

package/index.esm.js

@@ -9575,11 +9575,15 @@ const ConfigurableMapConnect = _a => {
     props = __rest(_a, ["id", "dockedLayerManagerSize", "title", "layers", "dimensions", "shouldAutoUpdate", "shouldAnimate", "shouldAutoFetch", "bbox", "srs", "shouldShowZoomControls", "displayMapPin", "showTimeSlider", "disableTimeSlider", "displayTimeInMap", "displayLayerManagerAndLegendButtonInMap", "displayDimensionSelectButtonInMap", "multiLegend", "shouldShowLayerManager", "shouldShowDockedLayerManager", "showClock", "displayGetFeatureInfoButtonInMap", "shouldDisplayDrawControls", "displaySearchButtonInMap", "mapControls", "children", "shouldDisablePrefetching"]);
   const dispatch = useDispatch();
   const mapId = React__default.useRef(id || webmapUtils.generateMapId()).current;
+  const customLayers = useSelector(store => mapSelectors.getdefaultMapSettingsLayers(store));
   React__default.useEffect(() => {
-    const layersWithDefaultBaseLayer = layers.find(layer => layer.layerType === LayerType.baseLayer) ? layers : [...layers, defaultLayers.baseLayerGrey];
-    const layersWithDefaultOverLayer = layersWithDefaultBaseLayer.find(layer => layer.layerType === LayerType.overLayer) ? layersWithDefaultBaseLayer : [...layersWithDefaultBaseLayer, defaultLayers.overLayer];
+    const addBaselayer = !(layers === null || layers === void 0 ? void 0 : layers.find(layer => layer.layerType === LayerType.baseLayer));
+    const defaultBaseLayer = (customLayers === null || customLayers === void 0 ? void 0 : customLayers.find(layer => layer.layerType === LayerType.baseLayer)) || defaultLayers.baseLayerGrey;
+    const addOverlayer = !(layers === null || layers === void 0 ? void 0 : layers.find(layer => layer.layerType === LayerType.overLayer));
+    const defaultOverLayer = (customLayers === null || customLayers === void 0 ? void 0 : customLayers.find(layer => layer.layerType === LayerType.overLayer)) || defaultLayers.overLayer;
+    const updatedLayers = [...(layers || []), ...(addBaselayer ? [defaultBaseLayer] : []), ...(addOverlayer ? [defaultOverLayer] : [])];
     const mapPreset = Object.assign({
-      layers: layersWithDefaultOverLayer,
+      layers: updatedLayers,
       proj: {
         bbox,
         srs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/core",
-  "version": "9.30.0",
+  "version": "9.31.0",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -16,7 +16,7 @@
     "@opengeoweb/webmap-react": "*",
     "@opengeoweb/webmap": "*",
     "@opengeoweb/theme": "*",
-    "axios": "1.5.0",
+    "axios": "^1.7.7",
     "@opengeoweb/layer-select": "*",
     "lodash": "^4.17.21",
     "react-sortablejs": "^6.1.4",

package/src/lib/utils/jsonPresetFilter.d.ts

@@ -4,7 +4,7 @@ interface FilteredMapPresets extends filterLayers.FilteredLayerList {
     services?: serviceTypes.InitialService[];
     baseServices?: serviceTypes.InitialService[];
     timeSeriesServices?: TimeSeriesService[];
-    initialViewMapPreset?: MapPreset;
+    defaultMapSettings?: MapPreset;
 }
 export interface InitialAppPresetProps {
     presetType?: string;
@@ -15,7 +15,7 @@ export interface InitialAppPresetProps {
     baseServices?: serviceTypes.InitialService[];
     layers?: layerTypes.Layer[];
     baseLayers?: layerTypes.Layer[];
-    initialViewMapPreset?: MapPreset;
+    defaultMapSettings?: MapPreset;
 }
 export interface InitialAppPreset {
     preset: InitialAppPresetProps;

package/src/lib/utils/testUtils.d.ts

@@ -1,3 +1,6 @@
-import { WebMapStateModuleState } from '@opengeoweb/store';
+import { snackbarTypes } from '@opengeoweb/snackbar';
+import { WebMapStateModuleState, syncGroupsTypes, uiTypes } from '@opengeoweb/store';
+import { Store } from '@reduxjs/toolkit';
 export declare const mockStateMapWithDimensions: (layer: import("dist/libs/store/src/store/mapStore/types").Layer, mapId: string) => WebMapStateModuleState;
 export declare const mockStateMapWithDimensionsWithoutLayers: (mapId: string) => WebMapStateModuleState;
+export declare const createMockStore: (mockState: WebMapStateModuleState & snackbarTypes.SnackbarModuleStore & syncGroupsTypes.SynchronizationGroupModuleState & uiTypes.UIModuleState) => Store;