@opengeoweb/core 11.1.0 → 12.0.0

package/index.esm.js

@@ -1,26 +1,29 @@
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import * as React from 'react';
-import React__default, { useState, useCallback, useEffect, useMemo } from 'react';
+import React__default, { useState, useCallback, useEffect, useContext, useMemo } from 'react';
 import { Grid2, Box, MenuItem, Typography, useTheme, Popper, Fade, Tooltip, styled, LinearProgress, FormControl, InputLabel, Paper, List, ListItemButton, ListItemText, CircularProgress, ListSubheader, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, InputAdornment, DialogActions, Button, Autocomplete, ListItemIcon, Checkbox, Switch, Select } from '@mui/material';
 import { SHARED_NAMESPACE, sharedTranslations, CustomIconButton, CustomTooltip, TooltipSelect, AlertIcon, sliderHeaderStyle, CustomSlider, ToggleMenu, tooltipContainerStyles, renderCounter, AlertBanner, CustomAccordion, PROJECTION, calculateStartSize, useWheelStopPropagation, ToolContainerDraggable, useDebounce, dateUtils, ErrorBoundary } from '@opengeoweb/shared';
 import { CollapseSmall, CollapseMedium, CollapseLarge, CollapseWindow, ExpandWindow, LayersAdd, CloudLoading, ColumnCollapsed, ColumnCollapse, Copy, None, FastForward, AutoUpdateActive, Both, Visibility, VisibilityOff, Delete, DragHandle as DragHandle$1, Cached, Add, MapAdd, WorldMapProjection, Layers, Search, Exclamation, MyLocation, Close, ExitDomain, Info, ThemeWrapper, lightTheme, FlagBritain, FlagNetherlands, FlagFinland, FlagNorway } from '@opengeoweb/theme';
 import i18n from 'i18next';
 import { initReactI18next, useTranslation, I18nextProvider } from 'react-i18next';
 import { TIMESLIDER_NAMESPACE, timesliderTranslations, defaultTimeSpan, TIME_SLIDER_LEGEND_HEIGHT, SpeedButton, TimeStepButton, AnimationLengthButton, AnimationLength, TimeSpanButton, secondsPerPxFromCanvasWidth, getNewCenterOfFixedPointZoom, OptionsMenuButton, PlayButton, defaultTimeStep, BackwardForwardStepButton, AutoUpdateButton, NowButton, handleSetNowEvent, TimeSliderButtons, TimeSliderCurrentTimeBox, TimeSliderLegend, onsetNewDateDebounced, defaultSecondsPerPx, moveSelectedTimePx, TimeSlider, getFilteredTime, ControlButtons, OptionsMenu, TimeSliderClock } from '@opengeoweb/timeslider';
-import { WEBMAP_REACT_NAMESPACE, webmapReactTranslations, WEBMAP_NAMESPACE, webmapTranslations, LayerInfoButton, LayerInfoDialog, MapControlButton, MapDimensionSelect, dimensionConfig, DimensionSelectDialog, DimensionSelectButton, emptyGeoJSON, registerDrawFunction, ZoomControls, LegendDialog, LegendButton, MapView, MapViewLayer, MapControls, publicLayers } from '@opengeoweb/webmap-react';
+import { WEBMAP_REACT_NAMESPACE, webmapReactTranslations, WEBMAP_NAMESPACE, webmapTranslations, LayerInfoButton, LayerInfoDialog, MapControlButton, MapDimensionSelect, dimensionConfig, DimensionSelectDialog, DimensionSelectButton, MapContext, emptyGeoJSON, registerDrawFunction, MapFeatureClass, setMapCenter, ZoomControls, LegendDialog, LegendButton, MapView, MapViewLayer, MapControls, OpenLayersFeatureLayer, OpenLayersMapDraw, getIsInsideAcceptanceTime, OpenLayersLayer, useSetIntervalWhenVisible, openLayersGetMapImageStore, TimeContext, OpenLayersMapView, WMSLayer, genericOpenLayersFeatureStyle, OpenLayersGetFeatureInfo, OpenLayersZoomControl, getLayerUpdateInfo, isOpenLayersEnabled, publicLayers } from '@opengeoweb/webmap-react';
 import { useDispatch, useSelector, connect, useStore, Provider } from 'react-redux';
 import { ReactSortable } from 'react-sortablejs';
 import Sortable from 'sortablejs';
-import { layerTypes, layerUtils, mapSelectors, layerActions, layerSelectors, serviceSelectors, serviceActions, mapActions, mapEnums, uiSelectors, uiTypes, useSetupDialog, filterLayers, getUserAddedServices, uiActions, genericSelectors, genericActions, drawingToolSelectors, syncConstants, loadingIndicatorActions, syncGroupsSelectors, defaultLayers, getSingularDrawtoolDrawLayerId, syncGroupsSelector, syncGroupsActions, routerUtils } from '@opengeoweb/store';
+import { layerTypes, layerUtils, mapSelectors, layerActions, layerSelectors, serviceSelectors, serviceActions, mapActions, mapEnums, uiSelectors, uiTypes, useSetupDialog, filterLayers, getUserAddedServices, uiActions, genericSelectors, genericActions, drawingToolSelectors, syncConstants, loadingIndicatorActions, syncGroupsSelectors, getViewObjectForSyncGroup, getViewObjectForMapId, defaultLayers, getSingularDrawtoolDrawLayerId, syncGroupsSelector, syncGroupsActions, routerUtils } from '@opengeoweb/store';
 import _, { isArray, isEqual, debounce, range } from 'lodash';
-import { webmapUtils, queryWMSServiceInfo, queryWMSLayers, queryWMSLayersTree, invalidateWMSGetCapabilities, LayerType, getWMSServiceId, generateLayerId, getWMJSMapById, getWMSGetFeatureInfoRequestURL, handleDateUtilsISOString, wmServiceListener, EVENT_GETCAPABILITIES_START, EVENT_GETCAPABILITIES_READY, WMLayer } from '@opengeoweb/webmap';
+import { webmapUtils, queryWMSServiceInfo, queryWMSLayers, queryWMSLayersTree, invalidateWMSGetCapabilities, LayerType, getWMSServiceId, generateLayerId, getWMJSMapById, getWMSGetFeatureInfoRequestURL, getMapDimURL, handleDateUtilsISOString, wmServiceListener, EVENT_GETCAPABILITIES_START, EVENT_GETCAPABILITIES_READY, WMJSDimension, getWMLayerById, WMLayer } from '@opengeoweb/webmap';
 import { Box as Box$1, styled as styled$1 } from '@mui/system';
 import { LayerSelectButtonConnect, LayerSelectConnect } from '@opengeoweb/layer-select';
 import { useQuery, QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { getConfig } from '@opengeoweb/authentication';
 import { handleResponse } from '@opengeoweb/api';
 import axios from 'axios';
+import { ImageWMS } from 'ol/source';
 import DOMPurify from 'dompurify';
+import { unByKey } from 'ol/Observable';
+import { toLonLat } from 'ol/proj';
 import { snackbarTypes, snackbarActions, SnackbarWrapperConnect } from '@opengeoweb/snackbar';
 import { useNavigate } from 'react-router-dom';
 import * as Sentry from '@sentry/react';
@@ -5987,7 +5990,7 @@ var geometryStyling = {
   'stroke-opacity': 1,
   'stroke-width': 4
 };
-var makeGeoJSONFeatureFromLocation = function makeGeoJSONFeatureFromLocation(location, drawFunctionId, hoverDrawFunctionId) {
+var makeGeoJSONFeatureFromLocation = function makeGeoJSONFeatureFromLocation(location, drawFunctionId, hoverDrawFunctionId, mapFeatureClass) {
   var _location$geometry;
   var collection = {
     type: 'FeatureCollection',
@@ -6004,7 +6007,8 @@ var makeGeoJSONFeatureFromLocation = function makeGeoJSONFeatureFromLocation(loc
     properties: {
       name: location.name,
       drawFunctionId: drawFunctionId,
-      hoverDrawFunctionId: hoverDrawFunctionId
+      hoverDrawFunctionId: hoverDrawFunctionId,
+      mapFeatureClass: mapFeatureClass
     },
     geometry: {
       type: 'Point',
@@ -6070,14 +6074,20 @@ var hoverDrawFunction = function hoverDrawFunction(args) {
 };
 var useDrawOnMap = function useDrawOnMap(mapId, drawFunction) {
   var dispatch = useDispatch();
-  var layerId = React__default.useRef(generateLayerId()).current;
+  var _useContext = useContext(MapContext),
+    map = _useContext.map;
+  var layerIdRef = React__default.useRef();
+  React__default.useEffect(function () {
+    layerIdRef.current = generateLayerId();
+  }, []);
+  var layerId = layerIdRef.current;
   var isMapPresent = useSelector(function (store) {
     return mapSelectors.getIsMapPresent(store, mapId);
   });
   var isLayerPresent = useSelector(function (store) {
-    return layerSelectors.getIsLayerPresent(store, layerId);
+    return layerSelectors.getIsLayerPresent(store, layerIdRef.current);
   });
-  var shouldAddLayer = isMapPresent && !isLayerPresent;
+  var shouldAddLayer = isMapPresent && !isLayerPresent && layerId;
   React__default.useEffect(function () {
     if (shouldAddLayer) {
       dispatch(layerActions.addLayer({
@@ -6094,7 +6104,8 @@ var useDrawOnMap = function useDrawOnMap(mapId, drawFunction) {
   var drawFunctionId = React__default.useRef(registerDrawFunction(drawFunction)).current;
   var hoverDrawFunctionId = React__default.useRef(registerDrawFunction(hoverDrawFunction)).current;
   var updateGeoJSON = React__default.useCallback(function (location) {
-    var geojson = location ? makeGeoJSONFeatureFromLocation(location, drawFunctionId, hoverDrawFunctionId) : emptyGeoJSON;
+    var mapFeatureClass = (location == null ? void 0 : location.source) === 'MyMapLocation' ? MapFeatureClass.MyLocation : MapFeatureClass.GenericMarker;
+    var geojson = location ? makeGeoJSONFeatureFromLocation(location, drawFunctionId, hoverDrawFunctionId, mapFeatureClass) : emptyGeoJSON;
     dispatch(layerActions.updateFeature({
       layerId: layerId,
       geojson: geojson
@@ -6104,8 +6115,10 @@ var useDrawOnMap = function useDrawOnMap(mapId, drawFunction) {
     var webMap = getWMJSMapById(mapId);
     if (webMap) {
       webMap.calculateBoundingBoxAndZoom(location.lat, location.lon);
+    } else if (map) {
+      setMapCenter(map, location.lon, location.lat);
     }
-  }, [mapId]);
+  }, [mapId, map]);
   var onUpdateLocation = React__default.useCallback(function (location) {
     updateGeoJSON(location);
     if (location) {
@@ -6295,30 +6308,50 @@ var getTitle = function getTitle(layerId) {
   var wmjsLayer = webmapUtils.getWMLayerById(layerId);
   return wmjsLayer ? wmjsLayer.title || wmjsLayer.name : layerId;
 };
+var getFeatureInfoUrl = function getFeatureInfoUrl(layer, wmjsMap, mapPinLocation) {
+  /*
+    We need a wmjsLayer to build the getfeatureinfo url (getWMSGetFeatureInfoRequestURL function).
+    But it seems that its dimension are lazely updated (by ReactMapView).
+    Therefore make a clone of this layer and set its dimensions based on the layer object.
+    Otherwise we risk making a getfeatureinfo call with outdated dimension values.
+  */
+  var wmjsLayer = webmapUtils.getWMLayerById(layer.id).cloneLayer();
+  if (wmjsMap) {
+    // WebMapJS version
+    return getWMSGetFeatureInfoRequestURL(wmjsLayer, wmjsMap.getMapPin().getXY().x, wmjsMap.getMapPin().getXY().y, 'text/html');
+  }
+  if (mapPinLocation) {
+    // OpenLayers WMS version
+    var source = new ImageWMS({
+      url: wmjsLayer.getmapURL,
+      params: {
+        LAYERS: wmjsLayer.getLayerName()
+      }
+    });
+    return source.getFeatureInfoUrl([mapPinLocation.projectionX, mapPinLocation.projectionY], mapPinLocation.resolution, mapPinLocation.srs, {
+      INFO_FORMAT: 'text/html'
+    }) + "&" + getMapDimURL(wmjsLayer).toString();
+  }
+  return undefined;
+};
 /**
  * Make a list of GFI Layers to display.
  * @param layers
  * @param mapId
  * @returns
  */
-var getLayersToUpdate = function getLayersToUpdate(layers, mapId) {
+var getLayersToUpdate = function getLayersToUpdate(mapPinLocation, layers, mapId) {
   var wmjsMap = webmapUtils.getWMJSMapById(mapId);
-  if (!wmjsMap || !layers || layers.length === 0) {
+  if (!layers || layers.length === 0 || !wmjsMap && !mapPinLocation) {
     return [];
   }
   return layers.filter(function (layer) {
     return layer && layer.enabled && !!webmapUtils.getWMLayerById(layer.id);
   }).map(function (layer) {
-    /*
-      We need a wmjsLayer to build the getfeatureinfo url (getWMSGetFeatureInfoRequestURL function).
-      But it seems that its dimension are lazely updated (by ReactMapView).
-      Therefore make a clone of this layer and set its dimensions based on the layer object.
-      Otherwise we risk making a getfeatureinfo call with outdated dimension values.
-    */
-    var wmjsLayer = webmapUtils.getWMLayerById(layer.id).cloneLayer();
+    var url = getFeatureInfoUrl(layer, wmjsMap, mapPinLocation);
     return {
       layerId: layer.id,
-      url: getWMSGetFeatureInfoRequestURL(wmjsLayer, wmjsMap.getMapPin().getXY().x, wmjsMap.getMapPin().getXY().y, 'text/html'),
+      url: url,
       title: getTitle(layer.id)
     };
   });
@@ -6386,7 +6419,7 @@ var GetFeatureInfoDialog = function GetFeatureInfoDialog(_ref) {
     triggerRerender("" + layerId + isLoading);
   };
   /* Build a layerlist array with a set of arguments per layer to do the query for */
-  var layerToUpdateList = isOpen ? getLayersToUpdate(layers, mapId) : [];
+  var layerToUpdateList = isOpen && mapPinLocation ? getLayersToUpdate(mapPinLocation, layers, mapId) : [];
   /*
     Build a string based on the GFI urls. If this changes for whatever reason we need to update.
     These strings can change very often, therefore they need to be debounced and only use the most recent result  must be used.
@@ -6629,7 +6662,7 @@ var GetFeatureInfoButtonConnect = function GetFeatureInfoButtonConnect(_ref) {
   });
 };
 
-var _excluded$1 = ["mapId", "children", "controls"];
+var _excluded$1 = ["mapId", "children", "controls", "initialBbox"];
 var ORIGIN_REACTMAPVIEWCONNECT_ONMAPCHANGEDIMENSION = 'ORIGIN_REACTMAPVIEWCONNECT_ONMAPCHANGEDIMENSION';
 /**
  * Connected component used to display the map and selected layers.
@@ -6651,8 +6684,9 @@ var MapViewConnect = function MapViewConnect(_ref) {
     controls = _ref$controls === void 0 ? {
       mapControlsPositionTop: 0,
       zoomControls: true
-    } : _ref$controls,
-    props = _objectWithoutPropertiesLoose(_ref, _excluded$1);
+    } : _ref$controls;
+    _ref.initialBbox;
+    var props = _objectWithoutPropertiesLoose(_ref, _excluded$1);
   var mapRef = React.useRef(null);
   var store = useStore();
   var mapDimensions = useSelector(function (store) {
@@ -6894,10 +6928,10 @@ var MapViewConnect = function MapViewConnect(_ref) {
       },
       onUpdateLayerInformation: updateLayerInformation,
       onMapPinChangeLocation: mapPinChangeLocation,
-      onMapZoomEnd: function onMapZoomEnd(a) {
+      onMapZoomEnd: function onMapZoomEnd(onZoomedCRS) {
         genericSetBbox({
-          bbox: a.bbox,
-          srs: a.srs,
+          bbox: onZoomedCRS.bbox,
+          srs: onZoomedCRS.srs,
           sourceId: mapId,
           origin: mapEnums.MapActionOrigin.map,
           mapId: mapId
@@ -7060,6 +7094,610 @@ var MapViewConnect = function MapViewConnect(_ref) {
   });
 };
 
+/* *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2024 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2024 - Finnish Meteorological Institute (FMI)
+ * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
+ * */
+var useGetOpenLayersView = function useGetOpenLayersView(mapId, store) {
+  var _useState = useState(),
+    view = _useState[0],
+    setView = _useState[1];
+  var _useState2 = useState(),
+    name = _useState2[0],
+    setName = _useState2[1];
+  var syncGroupState = syncGroupsSelectors.getSynchronizationGroupState(store.getState());
+  var syncGroupView = useMemo(function () {
+    var thisAreaSyncGroupId = syncGroupState.groups.allIds.find(function (id) {
+      var group = syncGroupState.groups.byId[id];
+      return group.type === syncConstants.SYNCGROUPS_TYPE_SETBBOX && group.targets.allIds.indexOf(mapId) !== -1;
+    });
+    return thisAreaSyncGroupId ? getViewObjectForSyncGroup(thisAreaSyncGroupId) : null;
+  }, [mapId, syncGroupState.groups]);
+  useEffect(function () {
+    var mapBbox = mapSelectors.getBbox(store.getState(), mapId);
+    var storedView = syncGroupView || getViewObjectForMapId(mapId);
+    if (storedView.view.getCenter() === undefined && mapBbox.left !== undefined) {
+      storedView.view.fit([mapBbox.left, mapBbox.bottom, mapBbox.right, mapBbox.top]);
+    }
+    setName(storedView.name);
+    var setViewFromStoredView = function setViewFromStoredView() {
+      setView(storedView.view);
+    };
+    setViewFromStoredView();
+    var eventKey = storedView.on('change', setViewFromStoredView);
+    return function () {
+      unByKey(eventKey);
+    };
+  }, [syncGroupView, mapId, store]);
+  return {
+    view: view,
+    name: name
+  };
+};
+
+/* *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2025 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
+ * Copyright 2025 - Finnish Meteorological Institute (FMI)
+ * Copyright 2025 - The Norwegian Meteorological Institute (MET Norway)
+ * */
+var makePrefetchTimeSpan = function makePrefetchTimeSpan(timeSliderStartCenterEndTime, animationStartTime, animationEndTime, isAnimating) {
+  var timeSliderTimeStepInS = timeSliderStartCenterEndTime.step * 60;
+  var animationTimeStartInS = dateUtils.parseISO(animationStartTime).getTime() / 1000;
+  var animationTimeEndInS = dateUtils.parseISO(animationEndTime).getTime() / 1000;
+  var prefetchStart = isAnimating ? animationTimeStartInS : timeSliderStartCenterEndTime.start;
+  var prefetchEnd = isAnimating ? animationTimeEndInS : timeSliderStartCenterEndTime.end;
+  if (!prefetchStart || !prefetchEnd) {
+    return {
+      timespan: {
+        start: 0,
+        end: 0,
+        step: 0
+      },
+      isAnimating: isAnimating
+    };
+  }
+  var roundStart = Math.round(prefetchStart / timeSliderTimeStepInS) * timeSliderTimeStepInS;
+  var roundEnd = Math.round(prefetchEnd / timeSliderTimeStepInS) * timeSliderTimeStepInS;
+  // eslint-disable-next-line no-constant-condition
+  return {
+    timespan: {
+      start: roundStart * 1000,
+      end: roundEnd * 1000,
+      step: timeSliderTimeStepInS * 1000
+    },
+    isAnimating: isAnimating
+  };
+};
+var makeLayerInfoPayload = function makeLayerInfoPayload(payload, mapDimensions, mapId) {
+  // During intialization, try to base the layer dimension on the current map dimension value.
+  var updatedPayLoad = {
+    origin: 'OnInitializeLayerProps in MapViewConnect',
+    layerDimensions: {
+      layerId: payload.layerId,
+      origin: 'OnInitializeLayerProps in MapViewConnect',
+      dimensions: (payload.dimensions || []).map(function (layerDim) {
+        var _find;
+        var currentMapDim = ((_find = (mapDimensions || []).find(function (mapDim) {
+          return mapDim.name === layerDim.name;
+        })) == null ? void 0 : _find.currentValue) || layerDim.currentValue;
+        var wmDim = new WMJSDimension(layerDim);
+        return Object.assign({}, layerDim, {
+          currentValue: wmDim.getClosestValue(currentMapDim)
+        });
+      })
+    },
+    mapDimensions: {
+      mapId: mapId,
+      origin: 'OnInitializeLayerProps in MapViewConnect',
+      dimensions: (payload.dimensions || []).map(function (layerDim) {
+        var _find2;
+        var currentMapDim = ((_find2 = (mapDimensions || []).find(function (mapDim) {
+          return mapDim.name === layerDim.name;
+        })) == null ? void 0 : _find2.currentValue) || layerDim.currentValue;
+        var wmDim = new WMJSDimension(layerDim);
+        return Object.assign({}, layerDim, {
+          currentValue: wmDim.getClosestValue(currentMapDim)
+        });
+      })
+    }
+  };
+  return updatedPayLoad;
+};
+var getCenterOfLinkedFeature = function getCenterOfLinkedFeature(feature, srs) {
+  var _feature$getGeometry;
+  if (feature && ((_feature$getGeometry = feature.getGeometry()) == null ? void 0 : _feature$getGeometry.getType()) === 'Point') {
+    var _feature$getId;
+    var projectionCoords = feature.getGeometry().getCoordinates();
+    var coords = toLonLat(projectionCoords, srs);
+    var id = (feature == null || (_feature$getId = feature.getId()) == null ? void 0 : _feature$getId.toString()) || '';
+    return {
+      lon: coords[0],
+      lat: coords[1],
+      id: id,
+      serviceId: feature.getProperties().serviceId,
+      collectionId: feature.getProperties().collectionId
+    };
+  }
+  return null;
+};
+
+var OpenLayersFeatureLayerConnect = function OpenLayersFeatureLayerConnect(_ref) {
+  var layer = _ref.layer,
+    layerId = _ref.layerId,
+    zIndex = _ref.zIndex,
+    style = _ref.style,
+    hoverSelect = _ref.hoverSelect;
+  var store = useStore();
+  var dispatch = useDispatch();
+  var updateFeature = React__default.useCallback(function (geojson, reason) {
+    if (!layerId) {
+      window.console.error('updateFeature without layerId');
+      return;
+    }
+    var activeDrawToolId = drawingToolSelectors.getActiveDrawToolId(store.getState());
+    var activeDrawMode = drawingToolSelectors.getActiveDrawMode(store.getState(), activeDrawToolId);
+    dispatch(layerActions.updateFeature({
+      geojson: geojson,
+      reason: reason,
+      layerId: layerId,
+      shouldAllowMultipleShapes: drawingToolSelectors.getShouldAllowMultipleShapes(store.getState(), activeDrawToolId),
+      geoJSONIntersectionLayerId: drawingToolSelectors.getGeoJSONIntersectionLayerId(store.getState(), activeDrawToolId),
+      geoJSONIntersectionBoundsLayerId: drawingToolSelectors.getGeoJSONIntersectionBoundsLayerId(store.getState(), activeDrawToolId),
+      selectionType: activeDrawMode == null ? void 0 : activeDrawMode.selectionType
+    }));
+  }, [dispatch, store, layerId]);
+  var exitFeatureDrawMode = React__default.useCallback(function (reason) {
+    if (!layerId) {
+      window.console.error('exitFeatureDrawMode without layerId');
+      return;
+    }
+    var activeDrawToolId = drawingToolSelectors.getActiveDrawToolId(store.getState());
+    dispatch(layerActions.exitFeatureDrawMode({
+      reason: reason,
+      layerId: layerId,
+      shouldAllowMultipleShapes: drawingToolSelectors.getShouldAllowMultipleShapes(store.getState(), activeDrawToolId)
+    }));
+  }, [dispatch, store, layerId]);
+  return jsxs(Fragment, {
+    children: [jsx(OpenLayersFeatureLayer, {
+      featureCollection: !layer.isInEditMode ? layer.geojson : undefined,
+      zIndex: zIndex,
+      style: style,
+      hoverSelect: hoverSelect
+    }), jsx(OpenLayersMapDraw, {
+      drawMode: layer.drawMode,
+      viewOnlyStyle: style,
+      exitDrawModeCallback: exitFeatureDrawMode,
+      geojson: layer.geojson,
+      isInEditMode: layer.isInEditMode || false,
+      selectedFeatureIndex: layer.selectedFeatureIndex || 0,
+      updateGeojson: updateFeature
+    })]
+  });
+};
+
+var OlMapViewLayerConnect = function OlMapViewLayerConnect(layerProps) {
+  var layerId = layerProps.layerId,
+    mapId = layerProps.mapId,
+    zIndex = layerProps.zIndex,
+    debugMode = layerProps.debugMode;
+  var layer = useSelector(function (store) {
+    return layerSelectors.getLayerById(store, layerId);
+  });
+  var mapDimensions = useSelector(function (store) {
+    return mapSelectors.getMapDimensions(store, mapId);
+  });
+  var dispatch = useDispatch();
+  var onInitializeLayer = useCallback(function (initProps) {
+    var updatedPayLoad = makeLayerInfoPayload(initProps, mapDimensions || [], mapId);
+    dispatch(layerActions.onUpdateLayerInformation(updatedPayLoad));
+  }, [dispatch, mapDimensions, mapId]);
+  if (!layerId || !layer) {
+    return null;
+  }
+  var isInsideAcceptanceTime = getIsInsideAcceptanceTime(layer.acceptanceTimeInMinutes, mapDimensions, layer.dimensions);
+  return jsx(OpenLayersLayer, Object.assign({
+    id: "layer-" + (layer == null ? void 0 : layer.id),
+    zIndex: zIndex
+  }, layer, {
+    enabled: isInsideAcceptanceTime && layer.enabled,
+    onInitializeLayer: onInitializeLayer,
+    debugMode: debugMode
+  }), "layer-" + (layer == null ? void 0 : layer.id));
+};
+
+/**
+ * Connected component used to display the map and selected layers.
+ * Includes options to disable the map controls and legend.
+ *
+ * Expects the following props:
+ * @param {string} mapId mapId: string - Id of the map
+ * @param {object} [controls.zoomControls] **optional** controls: object - toggle the map controls, zoomControls defaults to true
+ * @param {boolean} [displayTimeInMap] **optional** displayTimeInMap: boolean, toggles the mapTime, defaults to true
+ * @param {boolean} [showScaleBar] **optional** showScaleBar: boolean, toggles the scaleBar, defaults to true
+ * @example
+ * ```<MapViewConnect mapId={mapId} controls={{ zoomControls: false }} displayTimeInMap={false} showScaleBar={false}/>```
+ */
+var OlMapViewConnect = function OlMapViewConnect(_ref) {
+  var mapId = _ref.mapId,
+    _ref$controls = _ref.controls,
+    controls = _ref$controls === void 0 ? {
+      mapControlsPositionTop: 0,
+      zoomControls: true
+    } : _ref$controls,
+    initialBbox = _ref.initialBbox,
+    children = _ref.children,
+    holdShiftToScroll = _ref.holdShiftToScroll;
+  var store = useStore();
+  var mapRef = React.useRef(null);
+  var _useGetOpenLayersView = useGetOpenLayersView(mapId, store),
+    view = _useGetOpenLayersView.view;
+  var _React$useState = React.useState(),
+    hoverLinkedFeature = _React$useState[0],
+    setHoverLinkedFeature = _React$useState[1];
+  var linkedPanelId = useSelector(function (store) {
+    return genericSelectors.selectLinkedPanelId(store, mapId);
+  });
+  var mapLayerIds = useSelector(function (store) {
+    return mapSelectors.getMapLayerIdsEnabled(store, mapId);
+  });
+  var baseLayers = useSelector(function (store) {
+    return mapSelectors.getMapBaseLayers(store, mapId);
+  });
+  var overLayers = useSelector(function (store) {
+    return mapSelectors.getMapOverLayers(store, mapId);
+  });
+  var featureLayers = useSelector(function (store) {
+    return mapSelectors.getMapFeatureLayers(store, mapId);
+  });
+  var linkedFeaturesFromState = useSelector(function (store) {
+    var _store$syncGroups;
+    return genericSelectors.selectLinkedFeatures((_store$syncGroups = store.syncGroups) == null ? void 0 : _store$syncGroups.linkedState, mapId);
+  });
+  var linkedFeatures = React.useMemo(function () {
+    return {
+      type: 'FeatureCollection',
+      features: linkedFeaturesFromState.flatMap(function (feature) {
+        return feature.geoJSON.features;
+      })
+    };
+  }, [linkedFeaturesFromState]);
+  var srs = useSelector(function (store) {
+    return mapSelectors.getSrs(store, mapId);
+  });
+  var timeSliderStartCenterEndTime = useSelector(function (store) {
+    return mapSelectors.getMapTimeSliderStartCenterEndAndStep(store, mapId);
+  });
+  var animationStartTime = useSelector(function (store) {
+    return mapSelectors.getAnimationStartTime(store, mapId);
+  });
+  var animationEndTime = useSelector(function (store) {
+    return mapSelectors.getAnimationEndTime(store, mapId);
+  });
+  var isTimeScrollingEnabled = useSelector(syncGroupsSelectors.isTimeScrollingEnabled);
+  var isAnimating = useSelector(function (store) {
+    return mapSelectors.isAnimating(store, mapId);
+  });
+  var dispatch = useDispatch();
+  var updateLayerInformation = React.useCallback(function (payload) {
+    var _payload$layerDimensi, _payload$layerDimensi2;
+    var updatedPayLoad = Object.assign({}, payload, {
+      origin: 'OnInitializeLayerProps in MapViewConnect',
+      layerDimensions: {
+        layerId: ((_payload$layerDimensi = payload.layerDimensions) == null ? void 0 : _payload$layerDimensi.layerId) || '',
+        origin: 'OnInitializeLayerProps in MapViewConnect',
+        dimensions: (((_payload$layerDimensi2 = payload.layerDimensions) == null ? void 0 : _payload$layerDimensi2.dimensions) || []).map(function (layerDim) {
+          return Object.assign({}, layerDim);
+        })
+      }
+    });
+    dispatch(layerActions.onUpdateLayerInformation(updatedPayLoad));
+  }, [dispatch]);
+  var registerMap = React.useCallback(function (payload) {
+    dispatch(mapActions.registerMap(payload));
+  }, [dispatch]);
+  var syncGroupsAddSource = React.useCallback(function (payload) {
+    dispatch(genericActions.syncGroupAddSource(payload));
+  }, [dispatch]);
+  var hoverSelect = React.useMemo(function () {
+    return {
+      active: true,
+      onHover: setHoverLinkedFeature
+    };
+  }, []);
+  var displayMapPin = useSelector(function (store) {
+    return mapSelectors.getDisplayMapPin(store, mapId);
+  });
+  var mapPinLocation = useSelector(function (store) {
+    return mapSelectors.getPinLocation(store, mapId);
+  });
+  var mapPinChangeLocation = React.useCallback(function (clickedLocation) {
+    var _hoverLinkedFeature$g;
+    var mapPinLocation = getCenterOfLinkedFeature(hoverLinkedFeature, srs) || clickedLocation;
+    var selectedFeatureId = (hoverLinkedFeature == null || (_hoverLinkedFeature$g = hoverLinkedFeature.getId()) == null ? void 0 : _hoverLinkedFeature$g.toString()) || '';
+    if (hoverLinkedFeature) {
+      var selectedFeatureIndex = linkedFeatures.features.findIndex(function (feature) {
+        return feature.id === selectedFeatureId;
+      });
+      dispatch(layerActions.setSelectedFeature({
+        layerId: "drawlayer-" + mapId,
+        selectedFeatureIndex: selectedFeatureIndex
+      }));
+    }
+    dispatch(genericActions.addSharedData({
+      panelId: linkedPanelId,
+      data: {
+        selectedFeatureId: selectedFeatureId
+      }
+    }));
+    dispatch(mapActions.setMapPinLocation({
+      mapId: mapId,
+      mapPinLocation: mapPinLocation
+    }));
+  }, [dispatch, hoverLinkedFeature, linkedFeatures.features, linkedPanelId, mapId, srs]);
+  var isActiveWindowId = useSelector(function (store) {
+    return uiSelectors.getIsActiveWindowId(store, mapId);
+  });
+  useKeyboardZoomAndPan(isActiveWindowId, mapId, mapRef.current);
+  useTouchZoomPan(isActiveWindowId, mapId);
+  React.useEffect(function () {
+    registerMap({
+      mapId: mapId
+    });
+    syncGroupsAddSource({
+      id: mapId,
+      type: [syncConstants.SYNCGROUPS_TYPE_SETTIME, syncConstants.SYNCGROUPS_TYPE_SETBBOX]
+    });
+    dispatch(loadingIndicatorActions.setGetMapIsLoading({
+      id: mapId,
+      isGetMapLoading: false
+    }));
+  }, [dispatch, mapId, registerMap, syncGroupsAddSource]);
+  var onGetMapLoadStart = React.useCallback(function () {
+    dispatch(loadingIndicatorActions.setGetMapIsLoading({
+      id: mapId,
+      isGetMapLoading: true
+    }));
+  }, [dispatch, mapId]);
+  var onGetMapLoadReady = React.useCallback(function () {
+    dispatch(loadingIndicatorActions.setGetMapIsLoading({
+      id: mapId,
+      isGetMapLoading: false
+    }));
+  }, [dispatch, mapId]);
+  React.useEffect(function () {
+    if (!view) {
+      return function () {};
+    }
+    var eventKey = view.on('change', function () {
+      var _view$getViewStateAnd = view.getViewStateAndExtent(),
+        extent = _view$getViewStateAnd.extent;
+      dispatch(genericActions.setBbox({
+        bbox: {
+          left: extent[0],
+          bottom: extent[1],
+          right: extent[2],
+          top: extent[3]
+        },
+        sourceId: mapId,
+        srs: srs
+      }));
+    });
+    return function () {
+      unByKey(eventKey);
+    };
+  }, [view, mapId, srs, dispatch]);
+  var prefetchTimespan = makePrefetchTimeSpan(timeSliderStartCenterEndTime, animationStartTime, animationEndTime, isAnimating);
+  var layerIds = mapLayerIds.join();
+  var refetchLayers = React.useCallback(function () {
+    mapLayerIds == null || mapLayerIds.forEach( /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(layerId) {
+        var wmLayer, layerInfo;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (!layerId) {
+                _context.next = 15;
+                break;
+              }
+              _context.prev = 1;
+              wmLayer = getWMLayerById(layerId);
+              if (!wmLayer) {
+                console.warn('No wmLayer exists for layer id', layerId);
+              }
+              _context.next = 6;
+              return wmLayer.parseLayer(true);
+            case 6:
+              layerInfo = getLayerUpdateInfo(wmLayer, mapId);
+              updateLayerInformation && updateLayerInformation(layerInfo);
+              _context.next = 13;
+              break;
+            case 10:
+              _context.prev = 10;
+              _context.t0 = _context["catch"](1);
+              window.console.error(_context.t0);
+            case 13:
+              _context.next = 16;
+              break;
+            case 15:
+              console.warn('Not updating layer, something is wrong.', layerId);
+            case 16:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, null, [[1, 10]]);
+      }));
+      return function (_x) {
+        return _ref2.apply(this, arguments);
+      };
+    }());
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [mapId, updateLayerInformation, layerIds]);
+  useSetIntervalWhenVisible(refetchLayers, 60000);
+  var isLoading = React.useRef(false);
+  // UseEffect for loading indicator
+  React.useEffect(function () {
+    openLayersGetMapImageStore.addImageEventCallback(function () {
+      var checkLoading = !!(openLayersGetMapImageStore.getNumImagesLoading() > 0);
+      if (checkLoading !== isLoading.current) {
+        if (checkLoading === true) {
+          onGetMapLoadStart && onGetMapLoadStart();
+        } else {
+          onGetMapLoadReady && onGetMapLoadReady();
+        }
+        isLoading.current = checkLoading;
+      }
+    }, mapId);
+    return function () {
+      openLayersGetMapImageStore.removeEventCallback(mapId);
+    };
+  }, [mapId, onGetMapLoadReady, onGetMapLoadStart]);
+  var _React$useState2 = React.useState(false),
+    debugMode = _React$useState2[0],
+    setDebugMode = _React$useState2[1];
+  React.useEffect(function () {
+    var handleKeyPress = function handleKeyPress(event) {
+      if (event.isTrusted && event.key === 'd' && document.activeElement === document.body) {
+        setDebugMode(function (prev) {
+          return !prev;
+        });
+      }
+    };
+    document.addEventListener('keyup', handleKeyPress);
+    return function () {
+      document.removeEventListener('keyup', handleKeyPress);
+    };
+  }, [debugMode]);
+  var homeExtent = React.useMemo(function () {
+    return initialBbox && [initialBbox.left, initialBbox.bottom, initialBbox.right, initialBbox.top];
+  }, [initialBbox]);
+  var dialogType = uiTypes.DialogTypes.Search + "-" + mapId;
+  var _useSetupDialog = useSetupDialog(dialogType),
+    isSearchDialogOpen = _useSetupDialog.isDialogOpen;
+  var layerDivStyle = React.useMemo(function () {
+    var style = {
+      position: 'absolute',
+      zIndex: 1
+    };
+    if (isSearchDialogOpen) {
+      style.top = 8 + 40 + "px";
+    }
+    return style;
+  }, [isSearchDialogOpen]);
+  return jsx(TimeContext.Provider, {
+    value: prefetchTimespan,
+    children: jsxs(OpenLayersMapView, {
+      view: view,
+      isFocused: isActiveWindowId,
+      isMouseWheelZoomEnabled: !isTimeScrollingEnabled,
+      holdShiftToScroll: holdShiftToScroll,
+      children: [jsxs("div", {
+        style: layerDivStyle,
+        children: [baseLayers.map(function (layer, zIndex) {
+          return jsx(OpenLayersLayer, Object.assign({
+            id: "baselayer-" + (layer == null ? void 0 : layer.id),
+            zIndex: baseLayers.length - zIndex + 10
+          }, layer), "baselayer-" + (layer == null ? void 0 : layer.id));
+        }), mapLayerIds.map(function (layerId, zIndex) {
+          return jsx(OlMapViewLayerConnect, {
+            layerId: layerId,
+            zIndex: mapLayerIds.length - zIndex + 1000,
+            debugMode: debugMode,
+            mapId: mapId
+          }, "layer-" + layerId);
+        }), overLayers.map(function (layer, zIndex) {
+          return jsx(WMSLayer, {
+            url: layer.service,
+            layerName: layer.name,
+            styleName: layer.style,
+            layerOptions: {
+              zIndex: overLayers.length - zIndex + 2000
+            }
+          }, "overlayer-" + (layer == null ? void 0 : layer.id));
+        }), featureLayers.map(function (layer, zIndex) {
+          return jsx(OpenLayersFeatureLayerConnect, {
+            layerId: layer == null ? void 0 : layer.id,
+            layer: layer,
+            zIndex: featureLayers.length - zIndex + 3000,
+            style: genericOpenLayersFeatureStyle,
+            hoverSelect: {
+              active: true
+            }
+          }, "featurelayer-" + (layer == null ? void 0 : layer.id));
+        }), jsx(OpenLayersFeatureLayer, {
+          style: genericOpenLayersFeatureStyle,
+          featureCollection: linkedFeatures,
+          zIndex: 4000,
+          hoverSelect: hoverSelect
+        }), jsx(OpenLayersGetFeatureInfo, {
+          mapPinLocation: mapPinLocation,
+          displayMapPin: displayMapPin,
+          selectLocation: mapPinChangeLocation
+        })]
+      }), jsxs(MapControls, {
+        "data-testid": "mapControls",
+        style: {
+          top: controls == null ? void 0 : controls.mapControlsPositionTop
+        },
+        children: [(controls == null ? void 0 : controls.search) && jsx(SearchControlButtonConnect, {
+          mapId: mapId
+        }), (controls == null ? void 0 : controls.zoomControls) && jsx(OpenLayersZoomControl, {
+          homeExtent: homeExtent
+        }), (controls == null ? void 0 : controls.layerManagerAndLegend) && jsxs(Fragment, {
+          children: [jsx(LayerManagerMapButtonConnect, {
+            mapId: mapId
+          }), jsx(LegendMapButtonConnect, {
+            mapId: mapId,
+            multiLegend: controls == null ? void 0 : controls.multiLegend
+          })]
+        }), (controls == null ? void 0 : controls.dimensionSelect) && jsx(MultiDimensionSelectMapButtonsConnect, {
+          mapId: mapId
+        }), (controls == null ? void 0 : controls.getFeatureInfo) && jsx(GetFeatureInfoButtonConnect, {
+          mapId: mapId
+        }), controls == null ? void 0 : controls.additionalMapControls]
+      }), (controls == null ? void 0 : controls.multiLegend) && jsx(LegendConnect, {
+        showMapId: true,
+        mapId: mapId,
+        multiLegend: controls == null ? void 0 : controls.multiLegend
+      }), (controls == null ? void 0 : controls.search) && jsx(SearchDialogConnect, {
+        mapId: mapId
+      }), (controls == null ? void 0 : controls.getFeatureInfo) && jsx(GetFeatureInfoConnect, {
+        showMapId: true,
+        mapId: mapId
+      }), jsx(LayerManagerConnect, {
+        mapId: mapId,
+        bounds: "parent",
+        isDocked: true
+      }), children]
+    })
+  });
+};
+
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -8042,7 +8680,7 @@ var TimeSliderClockConnect = function TimeSliderClockConnect(_ref) {
   });
 };
 
-var _excluded = ["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", "tileServerSettings"];
+var _excluded = ["id", "dockedLayerManagerSize", "title", "layers", "dimensions", "shouldAutoUpdate", "shouldAnimate", "shouldAutoFetch", "initialBbox", "srs", "shouldShowZoomControls", "displayMapPin", "showTimeSlider", "disableTimeSlider", "displayTimeInMap", "displayLayerManagerAndLegendButtonInMap", "displayDimensionSelectButtonInMap", "multiLegend", "shouldShowLayerManager", "shouldShowDockedLayerManager", "showClock", "displayGetFeatureInfoButtonInMap", "shouldDisplayDrawControls", "displaySearchButtonInMap", "useOl", "mapControls", "children", "shouldDisablePrefetching", "tileServerSettings"];
 var titleStyle = function titleStyle(theme) {
   return {
     position: 'absolute',
@@ -8077,8 +8715,8 @@ var ConfigurableMapConnect = function ConfigurableMapConnect(_ref) {
     shouldAnimate = _ref$shouldAnimate === void 0 ? false : _ref$shouldAnimate,
     _ref$shouldAutoFetch = _ref.shouldAutoFetch,
     shouldAutoFetch = _ref$shouldAutoFetch === void 0 ? true : _ref$shouldAutoFetch,
-    _ref$bbox = _ref.bbox,
-    bbox = _ref$bbox === void 0 ? defaultBbox.bbox : _ref$bbox,
+    _ref$initialBbox = _ref.initialBbox,
+    initialBbox = _ref$initialBbox === void 0 ? defaultBbox.bbox : _ref$initialBbox,
     _ref$srs = _ref.srs,
     srs = _ref$srs === void 0 ? defaultBbox.srs : _ref$srs,
     _ref$shouldShowZoomCo = _ref.shouldShowZoomControls,
@@ -8107,6 +8745,8 @@ var ConfigurableMapConnect = function ConfigurableMapConnect(_ref) {
     shouldDisplayDrawControls = _ref$shouldDisplayDra === void 0 ? false : _ref$shouldDisplayDra,
     _ref$displaySearchBut = _ref.displaySearchButtonInMap,
     displaySearchButtonInMap = _ref$displaySearchBut === void 0 ? false : _ref$displaySearchBut,
+    _ref$useOl = _ref.useOl,
+    useOl = _ref$useOl === void 0 ? isOpenLayersEnabled() : _ref$useOl,
     mapControls = _ref.mapControls,
     children = _ref.children,
     shouldDisablePrefetching = _ref.shouldDisablePrefetching,
@@ -8135,7 +8775,7 @@ var ConfigurableMapConnect = function ConfigurableMapConnect(_ref) {
     var mapPreset = Object.assign({
       layers: updatedLayers,
       proj: {
-        bbox: bbox,
+        bbox: initialBbox,
         srs: srs
       },
       dimensions: dimensions,
@@ -8184,6 +8824,13 @@ var ConfigurableMapConnect = function ConfigurableMapConnect(_ref) {
         origin: 'ConfigurableMapConnect'
       }));
     }
+    if (initialBbox) {
+      dispatch(genericActions.setBbox({
+        bbox: initialBbox,
+        sourceId: mapId,
+        srs: srs
+      }));
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   var mapControlConfig = useMemo(function () {
@@ -8226,7 +8873,17 @@ var ConfigurableMapConnect = function ConfigurableMapConnect(_ref) {
           sourceId: id,
           mapWindowRef: mapWindowRef
         })
-      }), jsx(MapViewConnect, {
+      }), useOl ? jsx(OlMapViewConnect, {
+        controls: mapControlConfig,
+        displayTimeInMap: displayTimeInMap,
+        showScaleBar: false,
+        shouldAutoFetch: shouldAutoFetch,
+        mapId: mapId,
+        initialBbox: initialBbox,
+        shouldDisablePrefetching: shouldDisablePrefetching,
+        tileServerSettings: tileServerSettings,
+        children: children
+      }) : jsx(MapViewConnect, {
         controls: mapControlConfig,
         displayTimeInMap: displayTimeInMap,
         showScaleBar: false,
@@ -8239,7 +8896,7 @@ var ConfigurableMapConnect = function ConfigurableMapConnect(_ref) {
         mapId: mapId
       })]
     });
-  }, [mapId, title, id, mapControlConfig, tileServerSettings, disableTimeSlider, displayTimeInMap, shouldAutoFetch, shouldDisablePrefetching, children, showClock]);
+  }, [mapId, title, id, useOl, initialBbox, mapControlConfig, tileServerSettings, disableTimeSlider, displayTimeInMap, shouldAutoFetch, shouldDisablePrefetching, children, showClock]);
 };
 
 var mapBoxStyle = function mapBoxStyle(theme) {
@@ -8335,7 +8992,7 @@ var MultiMapViewConnect = function MultiMapViewConnect(_ref) {
           layers: map.layers || [],
           autoTimeStepLayerId: map.autoTimeStepLayerId,
           autoUpdateLayerId: map.autoUpdateLayerId,
-          bbox: map.bbox,
+          initialBbox: map.bbox,
           srs: map.srs,
           dimensions: map.dimensions || [],
           displayTimeInMap: map.displayTimeInMap || false,
@@ -8567,11 +9224,13 @@ var componentsLookUp = function componentsLookUp(_ref) {
   switch (componentType) {
     case 'Map':
       {
+        var _mapPreset$proj;
         var mapPreset = initialProps.mapPreset,
           mapControls = initialProps.mapControls,
           shouldDisplayDrawControls = initialProps.shouldDisplayDrawControls,
           displaySearchButtonInMap = initialProps.displaySearchButtonInMap;
         return jsx(ConfigurableMapConnect, Object.assign({}, mapPreset, {
+          initialBbox: mapPreset == null || (_mapPreset$proj = mapPreset.proj) == null ? void 0 : _mapPreset$proj.bbox,
           id: id,
           "data-testid": "coreConfigurableMapConnect",
           displayGetFeatureInfoButtonInMap: true,
@@ -8768,7 +9427,7 @@ var SyncGroupViewer = function SyncGroupViewer(_ref) {
   React.useEffect(function () {
     var handleKeyDown = function handleKeyDown(event) {
       var target = event.target;
-      if (target.tagName !== 'INPUT' && target.tagName !== 'TEXTAREA' && event.key === 's') {
+      if (target.tagName !== 'INPUT' && target.tagName !== 'TEXTAREA' && (event.key === 's' || event.key === 'S') && !event.getModifierState('Control') && !event.getModifierState('Alt') && !event.getModifierState('AltGraph') && !event.getModifierState('Meta')) {
         toggleTimeScroll({
           isTimeScrollingEnabled: !isTimeScrollingEnabled
         });
@@ -9362,4 +10021,4 @@ var LanguageSelect = function LanguageSelect(_ref) {
   });
 };
 
-export { CORE_NAMESPACE, ConfigurableMapConnect, CoreI18nProvider, CoreThemeProvider, CoreThemeStoreProvider, DemoWrapper, DemoWrapperConnect, HarmonieTempAndPrecipPreset, LanguageSelect, LayerInfoButtonConnect, LayerInfoDialogConnect, LayerManager, BaseLayerRow as LayerManagerBaseLayerRow, LayerManagerConnect, DescriptionRow as LayerManagerDescriptionRow, HeaderOptions as LayerManagerHeaderOptions, LayerContainerRow as LayerManagerLayerContainerRow, LayerManagerMapButtonConnect, LegendConnect, LegendMapButtonConnect, MapViewConnect, MultiDimensionSelectMapButtonsConnect, MultiMapMultiDimensionSelectConnect as MultiMapDimensionSelectConnect, MultiMapViewConnect, MyMapLocation, RouterWrapperConnect, SearchControlButtonConnect, SearchDialog, SearchDialogConnect, SentryRecordButton, SyncGroupViewerConnect, TimeSliderConnect, ZoomControlConnect, componentsLookUp, coreTranslations, defaultBbox, defaultConfigurations, filterMapPresets, filterServices, filterTimeSeriesServices, getLanguageFromLocalStorage, languageLocalStorageKey, saveLanguageToLocalStorage, testLayers, useFetchServices, useUpdateTimeSpan, useUpdateTimestep };
+export { CORE_NAMESPACE, ConfigurableMapConnect, CoreI18nProvider, CoreThemeProvider, CoreThemeStoreProvider, DemoWrapper, DemoWrapperConnect, HarmonieTempAndPrecipPreset, LanguageSelect, LayerInfoButtonConnect, LayerInfoDialogConnect, LayerManager, BaseLayerRow as LayerManagerBaseLayerRow, LayerManagerConnect, DescriptionRow as LayerManagerDescriptionRow, HeaderOptions as LayerManagerHeaderOptions, LayerContainerRow as LayerManagerLayerContainerRow, LayerManagerMapButtonConnect, LegendConnect, LegendMapButtonConnect, MapViewConnect, MultiDimensionSelectMapButtonsConnect, MultiMapMultiDimensionSelectConnect as MultiMapDimensionSelectConnect, MultiMapViewConnect, MyMapLocation, OlMapViewConnect, RouterWrapperConnect, SearchControlButtonConnect, SearchDialog, SearchDialogConnect, SentryRecordButton, SyncGroupViewerConnect, TimeSliderConnect, ZoomControlConnect, componentsLookUp, coreTranslations, defaultBbox, defaultConfigurations, filterMapPresets, filterServices, filterTimeSeriesServices, getLanguageFromLocalStorage, languageLocalStorageKey, saveLanguageToLocalStorage, testLayers, useFetchServices, useUpdateTimeSpan, useUpdateTimestep };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/core",
-  "version": "11.1.0",
+  "version": "12.0.0",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,36 +8,44 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/shared": "*",
-    "react-redux": "^8.1.3",
-    "@opengeoweb/store": "*",
-    "@opengeoweb/timeslider": "*",
+    "@emotion/react": "11.14.0",
+    "@emotion/styled": "11.14.0",
+    "@mui/material": "^6.1.1",
+    "@mui/system": "^6.1.1",
+    "@mui/x-date-pickers": "7.27.1",
     "@reduxjs/toolkit": "^1.9.7",
-    "@opengeoweb/webmap-react": "*",
-    "@opengeoweb/webmap": "*",
-    "@opengeoweb/theme": "*",
+    "@sentry/react": "^8.34.0",
+    "@storybook/core-events": "8.4.2",
+    "@storybook/preview-api": "8.4.2",
+    "@storybook/react": "8.4.2",
+    "@tanstack/query-core": "5.67.1",
+    "@tanstack/react-query": "^5.62.7",
+    "@testing-library/react": "16.0.1",
+    "@testing-library/user-event": "14.5.2",
+    "@turf/turf": "7.2.0",
     "axios": "^1.7.7",
-    "@opengeoweb/layer-select": "*",
+    "date-fns": "4.1.0",
+    "dompurify": "^3.0.6",
+    "i18next": "^23.11.5",
+    "immer": "10.1.1",
+    "jest-canvas-mock": "2.5.2",
+    "jest-date-mock": "1.0.10",
     "lodash": "^4.17.21",
-    "react-sortablejs": "^6.1.4",
-    "sortablejs": "^1.15.1",
-    "@mui/system": "^6.1.1",
-    "@opengeoweb/snackbar": "*",
-    "react-router-dom": "^6.21.0",
+    "msw": "2.7.3",
+    "msw-storybook-addon": "2.0.4",
+    "ol": "^10.4.0",
+    "proj4": "2.15.0",
+    "re-resizable": "6.11.2",
+    "react": "18.3.1",
     "react-draggable": "^4.4.6",
-    "i18next": "^23.11.5",
+    "react-hook-form": "7.50.1",
     "react-i18next": "^15.1.1",
-    "dompurify": "^3.0.6",
-    "@mui/material": "^6.1.1",
-    "@sentry/react": "^8.34.0",
-    "@opengeoweb/authentication": "*",
-    "@tanstack/react-query": "^5.62.7",
-    "@opengeoweb/api": "*"
-  },
-  "peerDependencies": {
-    "react": "18",
-    "@emotion/react": "*",
-    "@emotion/styled": "*"
+    "react-redux": "^8.1.3",
+    "react-resize-detector": "9.1.1",
+    "react-router-dom": "^6.21.0",
+    "react-sortablejs": "^6.1.4",
+    "react-window": "1.8.10",
+    "sortablejs": "^1.15.1"
   },
   "module": "./index.esm.js",
   "type": "module",

package/src/lib/components/ConfigurableMapConnect/ConfigurableMapConnect.d.ts

@@ -21,7 +21,7 @@ export interface ConfigurableMapConnectProps {
     tileServerSettings?: TileServerSettings;
     autoUpdateLayerId?: string;
     autoTimeStepLayerId?: string;
-    bbox?: mapTypes.Bbox;
+    initialBbox?: mapTypes.Bbox;
     srs?: string;
     dimensions?: mapTypes.Dimension[];
     animationPayload?: mapTypes.AnimationPayloadType;
@@ -43,5 +43,6 @@ export interface ConfigurableMapConnectProps {
     children?: React.ReactNode;
     mapControls?: React.ReactNode;
     shouldDisablePrefetching?: boolean;
+    useOl?: boolean;
 }
 export declare const ConfigurableMapConnect: React.FC<ConfigurableMapConnectProps>;

package/src/lib/components/FeatureInfo/utils.d.ts

@@ -1,4 +1,6 @@
 import { layerTypes } from '@opengeoweb/store';
+import { IWMJSMap } from '@opengeoweb/webmap';
+import { MapLocation } from '@opengeoweb/webmap-react';
 export interface GFIResult {
     data: string;
     isLoading: boolean;
@@ -8,10 +10,11 @@ export interface GFILayer {
     url: string;
     title: string;
 }
+export declare const getFeatureInfoUrl: (layer: layerTypes.Layer, wmjsMap: IWMJSMap | undefined, mapPinLocation: MapLocation | null) => string | undefined;
 /**
  * Make a list of GFI Layers to display.
  * @param layers
  * @param mapId
  * @returns
  */
-export declare const getLayersToUpdate: (layers: layerTypes.Layer[], mapId: string) => GFILayer[];
+export declare const getLayersToUpdate: (mapPinLocation: MapLocation | null, layers: layerTypes.Layer[], mapId: string) => GFILayer[];

package/src/lib/components/MapDrawToolRedux/OpenLayersFeatureLayerConnect.d.ts

@@ -0,0 +1,13 @@
+import React from 'react';
+import { layerTypes } from '@opengeoweb/store';
+import { StyleLike } from 'ol/style/Style';
+import { HoverSelect } from '@opengeoweb/webmap-react';
+interface OpenLayersFeatureLayerConnectProps {
+    layer: layerTypes.FeatureLayer;
+    layerId?: string;
+    zIndex: number;
+    style: StyleLike;
+    hoverSelect?: HoverSelect;
+}
+export declare const OpenLayersFeatureLayerConnect: React.FC<OpenLayersFeatureLayerConnectProps>;
+export {};

package/src/lib/components/MapViewConnect/MapViewConnect.d.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
+import { Bbox } from '@opengeoweb/webmap';
 import { MapViewProps } from '@opengeoweb/webmap-react';
-export interface MapControls {
+export interface MapControlsProps {
     mapControlsPositionTop?: number;
     search?: boolean;
     zoomControls?: boolean;
@@ -13,11 +14,12 @@ export interface MapControls {
 export interface MapViewConnectProps extends MapViewProps {
     mapId: string;
     displayTimeInMap?: boolean;
-    controls?: MapControls;
+    controls?: MapControlsProps;
     showScaleBar?: boolean;
     children?: React.ReactNode;
     showLayerInfo?: boolean;
     passiveMap?: boolean;
+    initialBbox?: Bbox;
 }
 export declare const ORIGIN_REACTMAPVIEWCONNECT_ONMAPCHANGEDIMENSION = "ORIGIN_REACTMAPVIEWCONNECT_ONMAPCHANGEDIMENSION";
 export declare const ORIGIN_REACTMAPVIEWCONNECT_ONUPDATELAYERINFO = "ORIGIN_REACTMAPVIEWCONNECT_ONUPDATELAYERINFO";

package/src/lib/components/MapViewConnect/OlMapViewConnect.d.ts

@@ -0,0 +1,16 @@
+import * as React from 'react';
+import { MapViewConnectProps } from './MapViewConnect';
+/**
+ * Connected component used to display the map and selected layers.
+ * Includes options to disable the map controls and legend.
+ *
+ * Expects the following props:
+ * @param {string} mapId mapId: string - Id of the map
+ * @param {object} [controls.zoomControls] **optional** controls: object - toggle the map controls, zoomControls defaults to true
+ * @param {boolean} [displayTimeInMap] **optional** displayTimeInMap: boolean, toggles the mapTime, defaults to true
+ * @param {boolean} [showScaleBar] **optional** showScaleBar: boolean, toggles the scaleBar, defaults to true
+ * @example
+ * ```<MapViewConnect mapId={mapId} controls={{ zoomControls: false }} displayTimeInMap={false} showScaleBar={false}/>```
+ */
+declare const OlMapViewConnect: React.FC<MapViewConnectProps>;
+export default OlMapViewConnect;

package/src/lib/components/MapViewConnect/OlMapViewLayerConnect.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+export interface OlMapViewLayerConnectProps {
+    layerId: string | undefined;
+    mapId: string;
+    zIndex: number;
+    debugMode: boolean;
+}
+export declare const OlMapViewLayerConnect: (layerProps: OlMapViewLayerConnectProps) => React.ReactElement | null;

package/src/lib/components/MapViewConnect/index.d.ts

@@ -1 +1,2 @@
 export { default as MapViewConnect } from './MapViewConnect';
+export { default as OlMapViewConnect } from './OlMapViewConnect';

package/src/lib/components/MapViewConnect/olMapUtils.d.ts

@@ -0,0 +1,7 @@
+import { TimeSliderStartCenterEndTime } from '@opengeoweb/store';
+import { Dimension } from '@opengeoweb/webmap';
+import { MapLocation, OnInitializeLayerProps, TimeContextType, UpdateLayerInfoPayload } from '@opengeoweb/webmap-react';
+import { Feature } from 'ol';
+export declare const makePrefetchTimeSpan: (timeSliderStartCenterEndTime: TimeSliderStartCenterEndTime, animationStartTime: string | undefined, animationEndTime: string | undefined, isAnimating: boolean) => TimeContextType;
+export declare const makeLayerInfoPayload: (payload: OnInitializeLayerProps, mapDimensions: Dimension[], mapId: string) => UpdateLayerInfoPayload;
+export declare const getCenterOfLinkedFeature: (feature: Feature | undefined, srs: string) => MapLocation | null;

package/src/lib/components/MapViewConnect/olMapUtils.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/src/lib/components/MapViewConnect/useGetOpenLayersView.d.ts

@@ -0,0 +1,9 @@
+import { CoreAppStore } from '@opengeoweb/store';
+import { Store } from '@reduxjs/toolkit';
+import { View } from 'ol';
+interface UseGetOpenLayersViewValue {
+    view?: View;
+    name?: string;
+}
+export declare const useGetOpenLayersView: (mapId: string, store: Store<CoreAppStore>) => UseGetOpenLayersViewValue;
+export {};