@opengeoweb/core 12.1.1 → 12.2.0

package/index.esm.js

@@ -1,18 +1,18 @@
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import * as React 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 { Grid2, Box, MenuItem, Typography, useTheme, Popper, Fade, Tooltip, styled, LinearProgress, FormControl, InputLabel, Paper, List, ListItemButton, ListItemText, CircularProgress, ListSubheader, DialogContentText, TextField, InputAdornment, Button, Autocomplete, ListItemIcon, Checkbox, Switch, Select } from '@mui/material';
+import { safelyInitI18nForTestsAndStories, sharedTranslations, SHARED_NAMESPACE, CustomIconButton, CustomTooltip, TooltipSelect, AlertIcon, sliderHeaderStyle, CustomSlider, ToggleMenu, tooltipContainerStyles, renderCounter, AlertBanner, CustomAccordion, CustomDialog, PROJECTION, calculateStartSize, useWheelStopPropagation, ToolContainerDraggable, useDebounce, dateUtils, usePrevious, ErrorBoundary } from '@opengeoweb/shared';
+import { CollapseSmall, CollapseMedium, CollapseLarge, CollapseWindow, ExpandWindow, LayersAdd, CloudLoading, ColumnCollapsed, ColumnCollapse, Copy, None, FastForward, AutoUpdateActive, Both, Delete, Visibility, VisibilityOff, 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 { 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, 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 { webmapReactTranslations, WEBMAP_REACT_NAMESPACE, webmapTranslations, WEBMAP_NAMESPACE, 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, getViewObjectForSyncGroup, getViewObjectForMapId, defaultLayers, getSingularDrawtoolDrawLayerId, syncGroupsSelector, syncGroupsActions, routerUtils } from '@opengeoweb/store';
-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 { webmapUtils, queryWMSServiceInfo, queryWMSLayers, queryWMSLayersTree, invalidateWMSGetCapabilities, LayerType, getWMSServiceId, generateLayerId, getWMJSMapById, getWMSGetFeatureInfoRequestURL, getMapDimURL, wmServiceListener, EVENT_GETCAPABILITIES_START, EVENT_GETCAPABILITIES_READY, handleDateUtilsISOString, WMJSDimension, getWMLayerById, WMLayer } from '@opengeoweb/webmap';
 import _, { isArray, isEqual, debounce, range } from 'lodash';
 import { Box as Box$1, styled as styled$1 } from '@mui/system';
 import { LayerSelectButtonConnect, LayerSelectConnect } from '@opengeoweb/layer-select';
@@ -372,14 +372,14 @@ function _asyncToGenerator(n) {
 function _createForOfIteratorHelperLoose(r, e) {
   var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
   if (t) return (t = t.call(r)).next.bind(t);
-  if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e  ) {
+  if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e) {
     t && (r = t);
     var o = 0;
     return function () {
       return o >= r.length ? {
-        done: !0
+        done: true
       } : {
-        done: !1,
+        done: false,
         value: r[o++]
       };
     };
@@ -390,7 +390,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;
@@ -413,9 +413,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 {
@@ -508,7 +508,7 @@ function _regeneratorRuntime() {
         if ("throw" === i) throw a;
         return {
           value: t,
-          done: !0
+          done: true
         };
       }
       for (n.method = i, n.arg = a;;) {
@@ -559,7 +559,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) {
@@ -569,8 +569,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;
       }
@@ -579,10 +579,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));
@@ -611,17 +611,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;
@@ -640,10 +640,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);
@@ -723,21 +723,22 @@ function _unsupportedIterableToArray(r, a) {
  * */
 var CORE_NAMESPACE = 'core';
 var initCoreReactI18n = function initCoreReactI18n() {
-  var _en, _fi, _no, _nl;
-  void i18n.use(initReactI18next).init({
-    lng: 'en',
-    fallbackLng: 'en',
+  safelyInitI18nForTestsAndStories(i18n, CORE_NAMESPACE, [{
     ns: CORE_NAMESPACE,
-    interpolation: {
-      escapeValue: false
-    },
-    resources: {
-      en: (_en = {}, _en[CORE_NAMESPACE] = coreTranslations.en, _en[WEBMAP_REACT_NAMESPACE] = webmapReactTranslations.en, _en[WEBMAP_NAMESPACE] = webmapTranslations.en, _en[SHARED_NAMESPACE] = sharedTranslations.en, _en[TIMESLIDER_NAMESPACE] = timesliderTranslations.en, _en),
-      fi: (_fi = {}, _fi[CORE_NAMESPACE] = coreTranslations.fi, _fi[WEBMAP_REACT_NAMESPACE] = webmapReactTranslations.fi, _fi[WEBMAP_NAMESPACE] = webmapTranslations.fi, _fi[SHARED_NAMESPACE] = sharedTranslations.fi, _fi[TIMESLIDER_NAMESPACE] = timesliderTranslations.fi, _fi),
-      no: (_no = {}, _no[CORE_NAMESPACE] = coreTranslations.no, _no[WEBMAP_REACT_NAMESPACE] = webmapReactTranslations.no, _no[WEBMAP_NAMESPACE] = webmapTranslations.no, _no[SHARED_NAMESPACE] = sharedTranslations.no, _no[TIMESLIDER_NAMESPACE] = timesliderTranslations.no, _no),
-      nl: (_nl = {}, _nl[CORE_NAMESPACE] = coreTranslations.nl, _nl[WEBMAP_REACT_NAMESPACE] = webmapReactTranslations.nl, _nl[WEBMAP_NAMESPACE] = webmapTranslations.nl, _nl[SHARED_NAMESPACE] = sharedTranslations.nl, _nl[TIMESLIDER_NAMESPACE] = timesliderTranslations.nl, _nl)
-    }
-  });
+    translations: coreTranslations
+  }, {
+    ns: WEBMAP_REACT_NAMESPACE,
+    translations: webmapReactTranslations
+  }, {
+    ns: WEBMAP_NAMESPACE,
+    translations: webmapTranslations
+  }, {
+    ns: SHARED_NAMESPACE,
+    translations: sharedTranslations
+  }, {
+    ns: TIMESLIDER_NAMESPACE,
+    translations: timesliderTranslations
+  }]);
 };
 var ns = [CORE_NAMESPACE, TIMESLIDER_NAMESPACE];
 var useCoreTranslation = function useCoreTranslation() {
@@ -852,9 +853,7 @@ var columnClasses = {
   acceptanceTime: 'column-acceptanceTime',
   loadDuration: 'column-loadDuration',
   columnHeader: 'columnHeader',
-  baseLayer: 'baseLayer',
-  columnTarget: 'columnTarget'
-};
+  baseLayer: 'baseLayer'};
 var DRAG_VISIBILITY_LEADING_BUTTONS = 3;
 var DELETE_MORE_BUTTONS = 3;
 var MISSING = 4;
@@ -3208,7 +3207,10 @@ var MissingDataConnect = function MissingDataConnect(_ref) {
   var serviceLayer = useSelector(function (store) {
     return serviceSelectors.getLayerFromService(store, layerService, layerName);
   });
-  var layerIsMissingOnServer = !serviceLayer;
+  var layerStatus = useSelector(function (store) {
+    return layerSelectors.getLayerStatus(store, layerId);
+  });
+  var layerIsMissingOnServer = !serviceLayer || layerStatus === layerTypes.LayerStatus.error;
   return jsx(MissingData, {
     layerIsInsideAcceptanceTime: layerIsMissingOnServer ? 'outside' : layerIsInsideAcceptanceTime
   });
@@ -3341,6 +3343,9 @@ var LayerRowConnect = /*#__PURE__*/React.memo(function (_ref) {
   var serviceLayer = useSelector(function (store) {
     return serviceSelectors.getLayerFromService(store, layerServiceUrl, layerName);
   });
+  var layerStatus = useSelector(function (store) {
+    return layerSelectors.getLayerStatus(store, layerId);
+  });
   var currentlySelectedLayer = useSelector(function (store) {
     return layerSelectors.getLayerByIdWithoutTimeDimension(store, layerId);
   });
@@ -3356,7 +3361,7 @@ var LayerRowConnect = /*#__PURE__*/React.memo(function (_ref) {
     isEnabled: isEnabled,
     mapId: mapId,
     layerId: layerId,
-    isLayerMissing: !serviceLayer,
+    isLayerMissing: !serviceLayer || layerStatus === layerTypes.LayerStatus.error,
     layerName: fullLayerName || layerName,
     layerEnableLayout: jsx(EnableLayerConnect, {
       layerId: layerId,
@@ -3837,6 +3842,9 @@ var WMSLayerTreeHeader = function WMSLayerTreeHeader(_ref) {
         tooltipTitle: t('add-layer-popup-reload-layers'),
         "data-testid": "reloadLayers",
         onClick: onClickReload,
+        style: {
+          top: -6
+        },
         children: jsx(Cached, {})
       })
     })]
@@ -4115,7 +4123,8 @@ var filterMapPresets = function filterMapPresets(initialAppPreset) {
   var layers = preset.layers,
     services = preset.services,
     baseServices = preset.baseServices,
-    timeSeriesServices = preset.timeSeriesServices;
+    timeSeriesServices = preset.timeSeriesServices,
+    soundingsCollections = preset.soundingsCollections;
   var _ref = layers ? filterLayers.filterLayers(layers, filterLayers.parseLayer) : filterLayers.createEmtpyFilteredList(undefined),
     baseLayers = _ref.baseLayers,
     mapLayers = _ref.mapLayers;
@@ -4126,6 +4135,7 @@ var filterMapPresets = function filterMapPresets(initialAppPreset) {
     services: filterredServices,
     baseServices: filteredBaseServices,
     timeSeriesServices: filteredTimeSeriesServices,
+    soundingsCollections: soundingsCollections,
     baseLayers: baseLayers,
     mapLayers: mapLayers
   };
@@ -4375,115 +4385,106 @@ var AddLayersPopup = function AddLayersPopup(_ref) {
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [preloadedServices]);
-  return jsxs(Dialog, {
+  return jsx(CustomDialog, {
     fullWidth: true,
     maxWidth: "md",
     open: open,
-    onClose: handleClose,
+    onClose: function onClose() {
+      return handleClose && handleClose();
+    },
     "aria-labelledby": "form-dialog-title",
     "data-testid": "addLayersPopup",
-    children: [jsx(DialogTitle, {
-      id: "form-dialog-title",
-      children: t('add-layer-popup-title')
-    }), jsxs(DialogContent, {
+    title: t('add-layer-popup-title'),
+    actions: jsx(Button, {
+      onClick: handleClose,
+      variant: "tertiary",
+      sx: {
+        width: {
+          xs: '100%',
+          sm: 'auto'
+        }
+      },
+      children: t('actions-close')
+    }),
+    children: jsxs(Fragment, {
       children: [jsx(DialogContentText, {
         children: t('wms-loader-description')
-      }), jsx(Box, {
-        m: 2,
+      }), jsx(Grid2, {
+        container: true,
+        direction: "row",
+        alignItems: "center",
+        mb: 1,
         children: jsx(Grid2, {
-          container: true,
-          direction: "row",
-          alignItems: "center",
-          children: jsx(Grid2, {
-            size: 12,
-            children: jsx(TextField, {
-              margin: "dense",
-              id: "serviceurl",
-              label: t('add-layer-popup-service-url'),
-              value: serviceURL,
-              type: "url",
-              onChange: function onChange(event) {
-                var url = event.target.value.trim();
-                setServiceURL(url);
-                // No error message until new check
-                setUrlError('');
-              },
-              onKeyPress: function onKeyPress(event) {
-                if (event.key === 'Enter') {
-                  handleAddServiceURL();
-                }
-              },
-              fullWidth: true,
-              disabled: loading,
-              error: urlError !== '',
-              helperText: urlError,
-              variant: "filled",
-              slotProps: {
-                input: {
-                  endAdornment: jsx(InputAdornment, {
-                    position: "end",
-                    children: loading ? jsx(CircularProgress, {
-                      size: 24,
-                      sx: {
-                        zIndex: 1
-                      }
-                    }) : jsx(CustomIconButton, {
-                      "data-testid": "add-service",
-                      onClick: handleAddServiceURL,
-                      disabled: loading,
-                      size: "large",
-                      children: jsx(Add, {})
-                    })
+          size: 12,
+          children: jsx(TextField, {
+            margin: "dense",
+            id: "serviceurl",
+            label: t('add-layer-popup-service-url'),
+            value: serviceURL,
+            type: "url",
+            onChange: function onChange(event) {
+              var url = event.target.value.trim();
+              setServiceURL(url);
+              // No error message until new check
+              setUrlError('');
+            },
+            onKeyPress: function onKeyPress(event) {
+              if (event.key === 'Enter') {
+                handleAddServiceURL();
+              }
+            },
+            fullWidth: true,
+            disabled: loading,
+            error: urlError !== '',
+            helperText: urlError,
+            variant: "filled",
+            slotProps: {
+              input: {
+                endAdornment: jsx(InputAdornment, {
+                  position: "end",
+                  children: loading ? jsx(CircularProgress, {
+                    size: 24,
+                    sx: {
+                      zIndex: 1
+                    }
+                  }) : jsx(CustomIconButton, {
+                    "data-testid": "add-service",
+                    onClick: handleAddServiceURL,
+                    disabled: loading,
+                    size: "large",
+                    children: jsx(Add, {})
                   })
-                }
+                })
               }
-            })
+            }
           })
         })
-      }), jsx(Box, {
-        m: 2,
-        children: jsxs(Grid2, {
-          container: true,
-          direction: "row",
-          alignItems: "center",
-          spacing: 3,
-          children: [jsx(Grid2, {
-            size: 4,
-            children: jsx(WMSServerList, {
-              availableServices: services,
-              service: activeService,
-              handleChangeService: handleChangeService
-            })
-          }), jsx(Grid2, {
-            size: 8,
-            children: onRenderTree ? onRenderTree(activeService) : jsx(WMSLayerTreeConnect, {
-              mapId: "",
-              service: activeService,
-              layerType: layerType
-            })
-          })]
-        })
+      }), jsxs(Grid2, {
+        container: true,
+        direction: "row",
+        alignItems: "center",
+        spacing: 3,
+        children: [jsx(Grid2, {
+          size: 4,
+          children: jsx(WMSServerList, {
+            availableServices: services,
+            service: activeService,
+            handleChangeService: handleChangeService
+          })
+        }), jsx(Grid2, {
+          size: 8,
+          children: onRenderTree ? onRenderTree(activeService) : jsx(WMSLayerTreeConnect, {
+            mapId: "",
+            service: activeService,
+            layerType: layerType
+          })
+        })]
       })]
-    }), jsx(DialogActions, {
-      children: jsx(Button, {
-        onClick: handleClose,
-        color: "primary",
-        children: t('actions-close')
-      })
-    })]
+    })
   });
 };
 
 var styles$2 = {
-  buttonDiv: {
-    position: 'relative'
-  },
-  loadingButton: {
-    position: 'absolute',
-    top: 7,
-    left: 7,
-    zIndex: 1
-  },
   button: {
     margin: 'auto 0px auto 32px'
   }
@@ -4671,7 +4672,7 @@ var availableProjections = [Object.assign({}, PROJECTION.EPSG_3857, {
   }
 }), Object.assign({}, PROJECTION.EPSG_3067, {
   bbox: {
-    left: -1197402.0,
+    left: -1197402,
     bottom: 6439686.0,
     right: 2090705,
     top: 7975202
@@ -4783,14 +4784,7 @@ var styles$1 = {
     height: 'calc(100% - 59px)',
     display: 'inline-block',
     padding: '0 6px'
-  },
-  layerManagerContainer: {
-    position: 'absolute',
-    height: '100%',
-    width: '100%',
-    boxSizing: 'border-box'
-  }
-};
+  }};
 var getLayerManagerSizeValue = function getLayerManagerSizeValue(size) {
   if (!size.width || typeof size.width !== 'number') {
     return 'sizeLarge';
@@ -5805,7 +5799,7 @@ var useLocationDetail = function useLocationDetail(id, source) {
   });
 };
 
-var SearchDialog = function SearchDialog(_ref) {
+var LocationSearch = function LocationSearch(_ref) {
   var isOpen = _ref.isOpen,
     _ref$mapId = _ref.mapId,
     mapId = _ref$mapId === void 0 ? '' : _ref$mapId,
@@ -5998,25 +5992,29 @@ var geometryStyling = {
   'stroke-opacity': 1,
   'stroke-width': 4
 };
-var makeGeoJSONFeatureFromLocation = function makeGeoJSONFeatureFromLocation(location, drawFunctionId, hoverDrawFunctionId, mapFeatureClass) {
+var makeGeoJSONFeatureFromLocation = function makeGeoJSONFeatureFromLocation(location, drawFunctionId, hoverDrawFunctionId, mapFeatureClass, t) {
   var _location$geometry;
   var collection = {
     type: 'FeatureCollection',
     features: []
   };
+  var name = mapFeatureClass === MapFeatureClass.MyLocation ? t('my-location') : location.name;
   var geometry = Object.assign({}, location.geometry, {
     properties: Object.assign({}, geometryStyling, {
-      name: location.name,
-      hoverDrawFunctionId: hoverDrawFunctionId
+      name: name,
+      hoverDrawFunctionId: hoverDrawFunctionId,
+      mapFeatureClass: mapFeatureClass,
+      showNameOnHover: true
     })
   });
   var marker = {
     type: 'Feature',
     properties: {
-      name: location.name,
+      name: name,
       drawFunctionId: drawFunctionId,
       hoverDrawFunctionId: hoverDrawFunctionId,
-      mapFeatureClass: mapFeatureClass
+      mapFeatureClass: mapFeatureClass,
+      showNameOnHover: true
     },
     geometry: {
       type: 'Point',
@@ -6025,7 +6023,6 @@ var makeGeoJSONFeatureFromLocation = function makeGeoJSONFeatureFromLocation(loc
   };
   switch ((_location$geometry = location.geometry) == null ? void 0 : _location$geometry.geometry.type) {
     case 'Point':
-    case 'MultiLineString':
     case undefined:
       collection.features.push(marker);
       break;
@@ -6082,6 +6079,8 @@ var hoverDrawFunction = function hoverDrawFunction(args) {
 };
 var useDrawOnMap = function useDrawOnMap(mapId, drawFunction) {
   var dispatch = useDispatch();
+  var _useCoreTranslation = useCoreTranslation(),
+    t = _useCoreTranslation.t;
   var _useContext = useContext(MapContext),
     map = _useContext.map;
   var layerIdRef = React__default.useRef();
@@ -6105,7 +6104,7 @@ var useDrawOnMap = function useDrawOnMap(mapId, drawFunction) {
           geojson: emptyGeoJSON,
           layerType: LayerType.featureLayer
         },
-        origin: 'SearchDialogConnect'
+        origin: 'LocationSearchConnect'
       }));
     }
   }, [dispatch, layerId, mapId, shouldAddLayer]);
@@ -6113,12 +6112,12 @@ var useDrawOnMap = function useDrawOnMap(mapId, drawFunction) {
   var hoverDrawFunctionId = React__default.useRef(registerDrawFunction(hoverDrawFunction)).current;
   var updateGeoJSON = React__default.useCallback(function (location) {
     var mapFeatureClass = (location == null ? void 0 : location.source) === 'MyMapLocation' ? MapFeatureClass.MyLocation : MapFeatureClass.GenericMarker;
-    var geojson = location ? makeGeoJSONFeatureFromLocation(location, drawFunctionId, hoverDrawFunctionId, mapFeatureClass) : emptyGeoJSON;
+    var geojson = location ? makeGeoJSONFeatureFromLocation(location, drawFunctionId, hoverDrawFunctionId, mapFeatureClass, t) : emptyGeoJSON;
     dispatch(layerActions.updateFeature({
       layerId: layerId,
       geojson: geojson
     }));
-  }, [dispatch, drawFunctionId, hoverDrawFunctionId, layerId]);
+  }, [dispatch, drawFunctionId, hoverDrawFunctionId, layerId, t]);
   var zoomToFeature = React__default.useCallback(function (location) {
     var webMap = getWMJSMapById(mapId);
     if (webMap) {
@@ -6136,7 +6135,7 @@ var useDrawOnMap = function useDrawOnMap(mapId, drawFunction) {
   return [onUpdateLocation];
 };
 
-var SearchDialogConnect = function SearchDialogConnect(_ref) {
+var LocationSearchConnect = function LocationSearchConnect(_ref) {
   var _ref$mapId = _ref.mapId,
     mapId = _ref$mapId === void 0 ? '' : _ref$mapId;
   var dialogType = uiTypes.DialogTypes.Search + "-" + mapId;
@@ -6159,7 +6158,7 @@ var SearchDialogConnect = function SearchDialogConnect(_ref) {
     return false;
   });
   var isMyLocationSelected = !!myLocationLayer;
-  return jsx(SearchDialog, {
+  return jsx(LocationSearch, {
     isOpen: isDialogOpen,
     mapId: mapId,
     onSelectLocation: updateMapPin,
@@ -7089,7 +7088,7 @@ var MapViewConnect = function MapViewConnect(_ref) {
       showMapId: true,
       mapId: mapId,
       multiLegend: controls == null ? void 0 : controls.multiLegend
-    }), (controls == null ? void 0 : controls.search) && jsx(SearchDialogConnect, {
+    }), (controls == null ? void 0 : controls.search) && jsx(LocationSearchConnect, {
       mapId: mapId
     }), (controls == null ? void 0 : controls.getFeatureInfo) && jsx(GetFeatureInfoConnect, {
       showMapId: true,
@@ -7102,58 +7101,59 @@ 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]);
+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;
     }
-    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
-  };
+    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
+    })]
+  });
 };
 
 /* *
@@ -7204,10 +7204,10 @@ var makePrefetchTimeSpan = function makePrefetchTimeSpan(timeSliderStartCenterEn
 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',
+    origin: 'onInitializeLayer in OlMapViewLayerConnect',
     layerDimensions: {
       layerId: payload.layerId,
-      origin: 'OnInitializeLayerProps in MapViewConnect',
+      origin: 'onInitializeLayer in OlMapViewLayerConnect',
       dimensions: (payload.dimensions || []).map(function (layerDim) {
         var _find;
         var currentMapDim = ((_find = (mapDimensions || []).find(function (mapDim) {
@@ -7221,7 +7221,7 @@ var makeLayerInfoPayload = function makeLayerInfoPayload(payload, mapDimensions,
     },
     mapDimensions: {
       mapId: mapId,
-      origin: 'OnInitializeLayerProps in MapViewConnect',
+      origin: 'onInitializeLayer in OlMapViewLayerConnect',
       dimensions: (payload.dimensions || []).map(function (layerDim) {
         var _find2;
         var currentMapDim = ((_find2 = (mapDimensions || []).find(function (mapDim) {
@@ -7254,61 +7254,6 @@ var getCenterOfLinkedFeature = function getCenterOfLinkedFeature(feature, srs) {
   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,
@@ -7339,6 +7284,60 @@ var OlMapViewLayerConnect = function OlMapViewLayerConnect(layerProps) {
   }), "layer-" + (layer == null ? void 0 : layer.id));
 };
 
+/* *
+ * 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
+  };
+};
+
 /**
  * Connected component used to display the map and selected layers.
  * Includes options to disable the map controls and legend.
@@ -7346,20 +7345,17 @@ var OlMapViewLayerConnect = function OlMapViewLayerConnect(layerProps) {
  * 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 _featureProperties$va;
   var mapId = _ref.mapId,
+    children = _ref.children,
     _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);
@@ -7387,14 +7383,32 @@ var OlMapViewConnect = function OlMapViewConnect(_ref) {
     var _store$syncGroups;
     return genericSelectors.selectLinkedFeatures((_store$syncGroups = store.syncGroups) == null ? void 0 : _store$syncGroups.linkedState, mapId);
   });
+  var linkedFormFeaturesFromState = useSelector(function (store) {
+    var _store$syncGroups2;
+    return genericSelectors.selectLinkedFormFeatures((_store$syncGroups2 = store.syncGroups) == null ? void 0 : _store$syncGroups2.linkedState, mapId);
+  });
   var linkedFeatures = React.useMemo(function () {
     return {
       type: 'FeatureCollection',
       features: linkedFeaturesFromState.flatMap(function (feature) {
-        return feature.geoJSON.features;
+        return feature.geoJSON.features.map(function (geoFeature) {
+          return Object.assign({}, geoFeature, {
+            properties: Object.assign({}, geoFeature.properties, {
+              originalId: feature.originalId
+            })
+          });
+        });
       })
     };
   }, [linkedFeaturesFromState]);
+  var linkedFormFeatures = React.useMemo(function () {
+    return {
+      type: 'FeatureCollection',
+      features: linkedFormFeaturesFromState.flatMap(function (feature) {
+        return feature.geoJSON.features;
+      })
+    };
+  }, [linkedFormFeaturesFromState]);
   var srs = useSelector(function (store) {
     return mapSelectors.getSrs(store, mapId);
   });
@@ -7415,10 +7429,10 @@ var OlMapViewConnect = function OlMapViewConnect(_ref) {
   var updateLayerInformation = React.useCallback(function (payload) {
     var _payload$layerDimensi, _payload$layerDimensi2;
     var updatedPayLoad = Object.assign({}, payload, {
-      origin: 'OnInitializeLayerProps in MapViewConnect',
+      origin: 'updateLayerInformation in OlMapViewConnect',
       layerDimensions: {
         layerId: ((_payload$layerDimensi = payload.layerDimensions) == null ? void 0 : _payload$layerDimensi.layerId) || '',
-        origin: 'OnInitializeLayerProps in MapViewConnect',
+        origin: 'updateLayerInformation in OlMapViewConnect',
         dimensions: (((_payload$layerDimensi2 = payload.layerDimensions) == null ? void 0 : _payload$layerDimensi2.dimensions) || []).map(function (layerDim) {
           return Object.assign({}, layerDim);
         })
@@ -7527,13 +7541,44 @@ var OlMapViewConnect = function OlMapViewConnect(_ref) {
           top: extent[3]
         },
         sourceId: mapId,
-        srs: srs
+        srs: srs,
+        mapId: mapId,
+        origin: mapEnums.MapActionOrigin.map
       }));
     });
     return function () {
       unByKey(eventKey);
     };
   }, [view, mapId, srs, dispatch]);
+  var featureProperties = hoverLinkedFeature == null || hoverLinkedFeature.getProperties == null ? void 0 : hoverLinkedFeature.getProperties();
+  var hoverId = (featureProperties == null || (_featureProperties$va = featureProperties.values_) == null ? void 0 : _featureProperties$va.originalId) || (featureProperties == null ? void 0 : featureProperties.originalId);
+  var previousHoverId = usePrevious(hoverId);
+  React.useEffect(function () {
+    var _featureProperties$st;
+    if (!linkedPanelId || hoverId === previousHoverId) {
+      return;
+    }
+    if (!hoverLinkedFeature) {
+      dispatch(genericActions.addSharedData({
+        panelId: linkedPanelId,
+        data: {
+          hoverId: undefined
+        }
+      }));
+      return;
+    }
+    var currentOpacity = (_featureProperties$st = featureProperties == null ? void 0 : featureProperties['stroke-width']) != null ? _featureProperties$st : 1;
+    var increasedOpacity = Math.min(currentOpacity + 0.2, 1);
+    hoverLinkedFeature.setProperties(Object.assign({}, featureProperties, {
+      'stroke-opacity': increasedOpacity
+    }));
+    dispatch(genericActions.addSharedData({
+      panelId: linkedPanelId,
+      data: {
+        hoverId: hoverId
+      }
+    }));
+  }, [hoverId, previousHoverId, hoverLinkedFeature, featureProperties, linkedPanelId, dispatch]);
   var prefetchTimespan = makePrefetchTimeSpan(timeSliderStartCenterEndTime, animationStartTime, animationEndTime, isAnimating);
   var layerIds = mapLayerIds.join();
   var refetchLayers = React.useCallback(function () {
@@ -7544,35 +7589,38 @@ var OlMapViewConnect = function OlMapViewConnect(_ref) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               if (!layerId) {
-                _context.next = 15;
+                _context.next = 17;
                 break;
               }
-              _context.prev = 1;
               wmLayer = getWMLayerById(layerId);
               if (!wmLayer) {
                 console.warn('No wmLayer exists for layer id', layerId);
               }
+              _context.prev = 3;
               _context.next = 6;
               return wmLayer.parseLayer(true);
             case 6:
-              layerInfo = getLayerUpdateInfo(wmLayer, mapId);
-              updateLayerInformation && updateLayerInformation(layerInfo);
-              _context.next = 13;
+              _context.next = 11;
               break;
-            case 10:
-              _context.prev = 10;
-              _context.t0 = _context["catch"](1);
+            case 8:
+              _context.prev = 8;
+              _context.t0 = _context["catch"](3);
               window.console.error(_context.t0);
-            case 13:
-              _context.next = 16;
-              break;
+            case 11:
+              _context.prev = 11;
+              layerInfo = getLayerUpdateInfo(wmLayer, mapId);
+              updateLayerInformation && updateLayerInformation(layerInfo);
+              return _context.finish(11);
             case 15:
+              _context.next = 18;
+              break;
+            case 17:
               console.warn('Not updating layer, something is wrong.', layerId);
-            case 16:
+            case 18:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[1, 10]]);
+        }, _callee, null, [[3, 8, 11, 15]]);
       }));
       return function (_x) {
         return _ref2.apply(this, arguments);
@@ -7631,6 +7679,12 @@ var OlMapViewConnect = function OlMapViewConnect(_ref) {
     }
     return style;
   }, [isSearchDialogOpen]);
+  var combinedLinkedFeatures = React.useMemo(function () {
+    return {
+      type: 'FeatureCollection',
+      features: [].concat(linkedFeatures.features, linkedFormFeatures.features)
+    };
+  }, [linkedFeatures, linkedFormFeatures]);
   return jsx(TimeContext.Provider, {
     value: prefetchTimespan,
     children: jsxs(OpenLayersMapView, {
@@ -7673,7 +7727,7 @@ var OlMapViewConnect = function OlMapViewConnect(_ref) {
           }, "featurelayer-" + (layer == null ? void 0 : layer.id));
         }), jsx(OpenLayersFeatureLayer, {
           style: genericOpenLayersFeatureStyle,
-          featureCollection: linkedFeatures,
+          featureCollection: combinedLinkedFeatures,
           zIndex: 4000,
           hoverSelect: hoverSelect
         }), jsx(OpenLayersGetFeatureInfo, {
@@ -7706,7 +7760,7 @@ var OlMapViewConnect = function OlMapViewConnect(_ref) {
         showMapId: true,
         mapId: mapId,
         multiLegend: controls == null ? void 0 : controls.multiLegend
-      }), (controls == null ? void 0 : controls.search) && jsx(SearchDialogConnect, {
+      }), (controls == null ? void 0 : controls.search) && jsx(LocationSearchConnect, {
         mapId: mapId
       }), (controls == null ? void 0 : controls.getFeatureInfo) && jsx(GetFeatureInfoConnect, {
         showMapId: true,
@@ -10063,4 +10117,4 @@ var LanguageSelect = function LanguageSelect(_ref) {
   });
 };
 
-export { CORE_NAMESPACE, ConfigurableMapConnect, CoreI18nProvider, CoreStoreProvider, 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, getCenterOfLinkedFeature, getLanguageFromLocalStorage, languageLocalStorageKey, makeLayerInfoPayload, makePrefetchTimeSpan, saveLanguageToLocalStorage, testLayers, useFetchServices, useUpdateTimeSpan, useUpdateTimestep };
+export { CORE_NAMESPACE, ConfigurableMapConnect, CoreI18nProvider, CoreStoreProvider, 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, LocationSearch, LocationSearchConnect, MapViewConnect, MultiDimensionSelectMapButtonsConnect, MultiMapMultiDimensionSelectConnect as MultiMapDimensionSelectConnect, MultiMapViewConnect, MyMapLocation, OlMapViewConnect, RouterWrapperConnect, SearchControlButtonConnect, SentryRecordButton, SyncGroupViewerConnect, TimeSliderConnect, ZoomControlConnect, componentsLookUp, coreTranslations, defaultBbox, defaultConfigurations, filterMapPresets, filterServices, filterTimeSeriesServices, getCenterOfLinkedFeature, getLanguageFromLocalStorage, languageLocalStorageKey, makeLayerInfoPayload, makePrefetchTimeSpan, saveLanguageToLocalStorage, testLayers, useFetchServices, useUpdateTimeSpan, useUpdateTimestep };