@opengeoweb/core 12.8.0 → 12.10.0

package/index.esm.js

@@ -3,7 +3,7 @@ import * as React from 'react';
 import React__default, { useState, useCallback, useEffect, useContext, useMemo } from 'react';
 import { Grid, 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, useScrollingInIsolation, sliderHeaderStyle, CustomSlider, ToggleMenu, tooltipContainerStyles, renderCounter, AlertBanner, CustomAccordion, CustomDialog, PROJECTION, calculateStartSize, useWheelStopPropagation, ToolContainerDraggable, dateUtils, useDebounce, sessionStorageProvider, 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, ExitDomain, Info, Search, Exclamation, MyLocation, Close, ThemeWrapper, lightTheme, FlagBritain, FlagNetherlands, FlagFinland, FlagNorway } from '@opengeoweb/theme';
+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, Overlayers, Layers, ExitDomain, Info, Search, Exclamation, MyLocation, Close, ThemeWrapper, lightTheme, FlagBritain, FlagNetherlands, FlagFinland, FlagNorway } from '@opengeoweb/theme';
 import i18n from 'i18next';
 import { useTranslation, I18nextProvider } from 'react-i18next';
 import { TIMESLIDER_NAMESPACE, timesliderTranslations, defaultTimeSpan, 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';
@@ -46,6 +46,8 @@ var en = {
 	"layermanager-title": "Layer Manager",
 	"layermanager-baselayers-title": "Base layer",
 	"layermanager-baselayers-no-available": "No service available",
+	"layermanager-overlayers-title": "Select overlayer",
+	"layermanager-overlayers-overlayer": "Overlayer",
 	"layermanager-acceptance-time": "Acc Time",
 	"layermanager-dimensions-total-values": "Dimension value ({{total_dimensions}} options)",
 	"layermanager-dimensions-title": "Dimensions",
@@ -122,6 +124,8 @@ var fi = {
 	"layermanager-title": "Karttatasot",
 	"layermanager-baselayers-title": "Pohjakartta",
 	"layermanager-baselayers-no-available": "Palvelu ei käytettävissä",
+	"layermanager-overlayers-title": "Valitse päällystaso",
+	"layermanager-overlayers-overlayer": "Päällystaso",
 	"layermanager-acceptance-time": "Hyväksymisaika",
 	"layermanager-dimensions-total-values": "Dimension arvon ({{total_dimensions}} valinnat)",
 	"layermanager-dimensions-title": "Dimensiot",
@@ -198,6 +202,8 @@ var no = {
 	"layermanager-title": "Kartlag",
 	"layermanager-baselayers-title": "Basislag",
 	"layermanager-baselayers-no-available": "Ingen tjenester tilgjengelig",
+	"layermanager-overlayers-title": "ikke oversatt",
+	"layermanager-overlayers-overlayer": "ikke oversatt",
 	"layermanager-acceptance-time": "Aksep.tid",
 	"layermanager-dimensions-total-values": "Dimensjonsverdi ({{total_dimensions}} valg)",
 	"layermanager-dimensions-title": "Dimensjoner",
@@ -274,6 +280,8 @@ var nl = {
 	"layermanager-title": "Lagen Manager",
 	"layermanager-baselayers-title": "Basislaag",
 	"layermanager-baselayers-no-available": "Geen service beschikbaar",
+	"layermanager-overlayers-title": "Selecteer een overlayer",
+	"layermanager-overlayers-overlayer": "Overlayer",
 	"layermanager-acceptance-time": "Acc Tijd",
 	"layermanager-dimensions-total-values": "Opties voor dimensie ({{total_dimensions}})",
 	"layermanager-dimensions-title": "Dimensies",
@@ -909,7 +917,7 @@ var layerManagerStyle = {
   '.is-dragging header+.MuiBox-root': {
     overflow: 'hidden'
   },
-  // baselayer & projection
+  // baselayer, overlayer & projection
   '.baseLayer': {
     width: "calc(" + flexibleAreaWidth + " * 0.25)"
   },
@@ -972,7 +980,7 @@ var layerManagerStyle = {
       '.activateLayer-btn, .enable-btn, .column-2, .column-3, .column-4, .column-5, .column-6, .column-7, .column-acceptanceTime, .column-loadDuration': {
         display: 'none'
       },
-      '.addLayer-column, .setProjection-column': {
+      '.addLayer-column, .setProjection-column, .overlayers-column': {
         display: 'none'
       },
       '.descriptionRow': {
@@ -4740,6 +4748,100 @@ var ProjectionSelectConnect = function ProjectionSelectConnect(_ref) {
   });
 };
 
+var availableOverlayers = [{
+  name: 'Default Overlayer',
+  value: 'Default Overlayer'
+},
+// TODO: rename to 'None' when implemented: https://gitlab.com/opengeoweb/opengeoweb/-/issues/6095
+{
+  name: 'None (not implemented)',
+  value: 'None'
+}];
+var OverlayersSelect = function OverlayersSelect(_ref) {
+  var _availableOverlayers$;
+  var selectedOverlayer = _ref.selectedOverlayer,
+    onChangeOverlayer = _ref.onChangeOverlayer;
+  var _useCoreTranslation = useCoreTranslation(),
+    t = _useCoreTranslation.t;
+  var index = availableOverlayers.findIndex(function (layer) {
+    return layer.value === selectedOverlayer;
+  });
+  var selectedOverlayerName = (_availableOverlayers$ = availableOverlayers.find(function (layer) {
+    return layer.value === selectedOverlayer;
+  })) == null ? void 0 : _availableOverlayers$.name;
+  return jsxs(Grid, {
+    container: true,
+    className: "overlayers-column",
+    sx: {
+      width: '100%',
+      height: '36px'
+    },
+    children: [jsx(Grid, {
+      sx: [{
+        marginTop: '-2px'
+      }, leftButtonsStyle],
+      children: jsx(CustomIconButton, {
+        sx: {
+          margin: 'auto 0px auto 32px'
+        },
+        disabled: true,
+        children: jsx(Overlayers, {})
+      })
+    }), jsx(Grid, {
+      className: columnClasses.baseLayer,
+      children: jsx(FormControl, {
+        style: {
+          width: '100%'
+        },
+        children: jsxs(TooltipSelect, {
+          disableUnderline: true,
+          SelectDisplayProps: {
+            'aria-label': 'overlayerSelect'
+          },
+          tooltip: t('layermanager-overlayers-overlayer') + ": " + selectedOverlayerName,
+          isEnabled: true,
+          style: {
+            maxWidth: '100%'
+          },
+          value: selectedOverlayer,
+          list: availableOverlayers,
+          currentIndex: index,
+          onChange: function onChange(event) {
+            event.stopPropagation();
+            onChangeOverlayer(event.target.value);
+          },
+          onChangeMouseWheel: function onChangeMouseWheel(e) {
+            onChangeOverlayer(e.value);
+          },
+          children: [jsx(MenuItem, {
+            disabled: true,
+            children: t('layermanager-overlayers-title')
+          }), availableOverlayers.map(function (_ref2) {
+            var name = _ref2.name,
+              value = _ref2.value;
+            return jsx(MenuItem, {
+              value: value,
+              children: name
+            }, name);
+          })]
+        })
+      })
+    })]
+  });
+};
+
+var OverlayersSelectConnect = function OverlayersSelectConnect() {
+  var _React$useState = React__default.useState('Default Overlayer'),
+    selectedOverlayer = _React$useState[0],
+    setSelectedOverlayer = _React$useState[1];
+  return jsx(OverlayersSelect, {
+    selectedOverlayer: selectedOverlayer,
+    onChangeOverlayer: function onChangeOverlayer(selection) {
+      setSelectedOverlayer(selection);
+    }
+  });
+};
+
 var styles$1 = {
   layerRowContainer: {
     position: 'relative',
@@ -4896,7 +4998,7 @@ var LayerManager = function LayerManager(_ref) {
             mapId: mapId,
             settings: settings == null ? void 0 : settings.content,
             collapsedColumns: collapsedColumns
-          }), jsx(BaseLayerRow, {
+          }), jsx(OverlayersSelectConnect, {}), jsx(BaseLayerRow, {
             mapId: mapId,
             tooltip: t('layermanager-baselayers-tooltip'),
             preloadedAvailableBaseLayers: preloadedAvailableBaseLayers,
@@ -6365,6 +6467,12 @@ var getFeatureInfoUrl = function getFeatureInfoUrl(layer, mapPinLocation) {
         LAYERS: wmjsLayer.getLayerName()
       }
     });
+    layer.dimensions && layer.dimensions.forEach(function (dim) {
+      var wmDim = wmjsLayer.getDimension(dim.name);
+      if (wmDim && wmDim.getValue() !== dim.currentValue) {
+        wmDim.setValue(dim.currentValue);
+      }
+    });
     return source.getFeatureInfoUrl([mapPinLocation.projectionX, mapPinLocation.projectionY], mapPinLocation.resolution, mapPinLocation.srs, {
       INFO_FORMAT: 'text/html'
     }) + "&" + getMapDimURL(wmjsLayer).toString();
@@ -6435,15 +6543,10 @@ var GetFeatureInfoDialog = function GetFeatureInfoDialog(_ref) {
     mapPinLocation = _ref.mapPinLocation;
   var _useCoreTranslation = useCoreTranslation(),
     t = _useCoreTranslation.t;
-  /* Ref and state for maplocation */
-  var mapLocationWasChanged = React__default.useRef(false);
-  var _React$useState = React__default.useState(false),
-    isInitialMapLocationChanged = _React$useState[0],
-    setInitialMapLocationIsChanged = _React$useState[1];
   /* Ref, state and update function for results per layer map */
   var gfiResultMap = React__default.useRef(new Map()).current;
-  var _React$useState2 = React__default.useState(),
-    triggerRerender = _React$useState2[1];
+  var _React$useState = React__default.useState(),
+    triggerRerender = _React$useState[1];
   var updateLayerResult = function updateLayerResult(_ref2) {
     var layerId = _ref2.layerId,
       data = _ref2.data,
@@ -6507,16 +6610,9 @@ var GetFeatureInfoDialog = function GetFeatureInfoDialog(_ref) {
       return _ref3.apply(this, arguments);
     };
   }();
-  /*  Wait till the user has clicked the map. */
-  React__default.useEffect(function () {
-    if (mapLocationWasChanged.current !== false) {
-      setInitialMapLocationIsChanged(true);
-    }
-    mapLocationWasChanged.current = true;
-  }, [mapPinLocation]);
   /* For each changed getfeature url string, load new data using WMS GetFeatureInfo */
   React__default.useEffect(function () {
-    if (isInitialMapLocationChanged && isOpen) {
+    if (mapPinLocation && isOpen) {
       layerToUpdateList.forEach(function (_ref4) {
         var url = _ref4.url,
           layerId = _ref4.layerId;
@@ -6546,7 +6642,7 @@ var GetFeatureInfoDialog = function GetFeatureInfoDialog(_ref) {
       sx: {
         padding: 0
       },
-      children: [isOpen && hasLayers && isInitialMapLocationChanged && jsx(Box, {
+      children: [isOpen && hasLayers && mapPinLocation && jsx(Box, {
         "data-testid": "GetFeatureInfoList",
         ref: stopWheelEventPropagationRef,
         children: layerToUpdateList.map(function (layer) {
@@ -6599,7 +6695,7 @@ var GetFeatureInfoDialog = function GetFeatureInfoDialog(_ref) {
             })]
           }, layerId);
         })
-      }), hasLayers && !isInitialMapLocationChanged && jsx(Typography, {
+      }), hasLayers && !mapPinLocation && jsx(Typography, {
         "data-testid": "click-on-map-for-info",
         variant: "subtitle1",
         sx: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/core",
-  "version": "12.8.0",
+  "version": "12.10.0",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,22 +8,22 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/shared": "12.8.0",
+    "@opengeoweb/shared": "12.10.0",
     "react-redux": "^9.2.0",
-    "@opengeoweb/store": "12.8.0",
-    "@opengeoweb/timeslider": "12.8.0",
+    "@opengeoweb/store": "12.10.0",
+    "@opengeoweb/timeslider": "12.10.0",
     "@reduxjs/toolkit": "^2.6.1",
-    "@opengeoweb/webmap-react": "12.8.0",
-    "@opengeoweb/webmap": "12.8.0",
-    "@opengeoweb/theme": "12.8.0",
+    "@opengeoweb/webmap-react": "12.10.0",
+    "@opengeoweb/webmap": "12.10.0",
+    "@opengeoweb/theme": "12.10.0",
     "axios": "^1.7.7",
-    "@opengeoweb/layer-select": "12.8.0",
+    "@opengeoweb/layer-select": "12.10.0",
     "lodash": "^4.17.21",
     "ol": "^10.4.0",
     "react-sortablejs": "^6.1.4",
     "sortablejs": "^1.15.1",
     "@mui/system": "^7.0.1",
-    "@opengeoweb/snackbar": "12.8.0",
+    "@opengeoweb/snackbar": "12.10.0",
     "react-router-dom": "^6.21.0",
     "react-draggable": "^4.4.6",
     "i18next": "^25.0.1",
@@ -32,7 +32,7 @@
     "@mui/material": "^7.0.1",
     "@sentry/react": "^8.34.0",
     "@tanstack/react-query": "^5.69.2",
-    "@opengeoweb/api": "12.8.0",
+    "@opengeoweb/api": "12.10.0",
     "@types/geojson": "^7946.0.14"
   },
   "peerDependencies": {

package/src/lib/components/LayerManager/LayerManagerUtils.d.ts

@@ -142,7 +142,7 @@ export declare const layerManagerStyle: {
             '.activateLayer-btn, .enable-btn, .column-2, .column-3, .column-4, .column-5, .column-6, .column-7, .column-acceptanceTime, .column-loadDuration': {
                 display: string;
             };
-            '.addLayer-column, .setProjection-column': {
+            '.addLayer-column, .setProjection-column, .overlayers-column': {
                 display: string;
             };
             '.descriptionRow': {

package/src/lib/components/LayerManager/OverlayersRow/OverlayersSelect.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+interface OverlayersSelectProps {
+    selectedOverlayer: string;
+    onChangeOverlayer: (overlayer: string) => void;
+}
+declare const OverlayersSelect: React.FC<OverlayersSelectProps>;
+export default OverlayersSelect;

package/src/lib/components/LayerManager/OverlayersRow/OverlayersSelectConnect.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const OverlayersSelectConnect: React.FC;
+export default OverlayersSelectConnect;

package/src/lib/components/LayerManager/OverlayersRow/OverlayersSelectConnect.integration.spec.d.ts

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