@opengeoweb/core 9.35.0 → 9.35.1-spike-oltanstack.0

package/index.esm.js

@@ -12,7 +12,7 @@ import { useDispatch, useSelector, connect, useStore, Provider } from 'react-red
 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, drawtoolSelectors, syncConstants, loadingIndicatorActions, syncGroupsSelectors, defaultLayers, mapStoreActions, getSingularDrawtoolDrawLayerId, syncGroupsSelector, syncGroupsActions, coreModuleConfig, routerUtils, routerModuleConfig } from '@opengeoweb/store';
-import { webmapUtils, WMGetServiceFromStore, getCapabilities, LayerType, handleDateUtilsISOString, wmServiceListener, EVENT_GETCAPABILITIES_START, EVENT_GETCAPABILITIES_READY, getWMSGetFeatureInfoRequestURL, WMLayer } from '@opengeoweb/webmap';
+import { webmapUtils, queryWMSServiceInfo, queryWMSLayers, queryWMSLayersTree, invalidateWMSGetCapabilities, LayerType, getWMSServiceId, handleDateUtilsISOString, wmServiceListener, EVENT_GETCAPABILITIES_START, EVENT_GETCAPABILITIES_READY, getWMSGetFeatureInfoRequestURL, WMLayer } from '@opengeoweb/webmap';
 import { Box as Box$1, styled as styled$1 } from '@mui/system';
 import _, { isEqual, range } from 'lodash';
 import { LayerSelectButtonConnect, LayerSelectConnect, layerSelectConfig } from '@opengeoweb/layer-select';
@@ -2834,10 +2834,13 @@ var RenderLayersConnect = function RenderLayersConnect(_ref) {
           case 0:
             _context.prev = 0;
             _context.next = 3;
-            return getCapabilities.getLayersFlattenedFromService(serviceUrl);
+            return queryWMSLayers(serviceUrl);
           case 3:
             _layers = _context.sent;
-            wmService = WMGetServiceFromStore(serviceUrl);
+            _context.next = 6;
+            return queryWMSServiceInfo(serviceUrl);
+          case 6:
+            wmService = _context.sent;
             serviceSetLayers({
               id: wmService.id,
               name: wmService.title,
@@ -2846,17 +2849,17 @@ var RenderLayersConnect = function RenderLayersConnect(_ref) {
               scope: 'user',
               "abstract": wmService["abstract"]
             });
-            _context.next = 11;
+            _context.next = 13;
             break;
-          case 8:
-            _context.prev = 8;
+          case 10:
+            _context.prev = 10;
             _context.t0 = _context["catch"](0);
             console.warn(_context.t0.message);
-          case 11:
+          case 13:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 8]]);
+      }, _callee, null, [[0, 10]]);
     }));
     return function addService(_x) {
       return _ref2.apply(this, arguments);
@@ -3839,17 +3842,40 @@ var WMSLayerTree = function WMSLayerTree(_ref) {
   React.useEffect(function () {
     var isMounted = true;
     setIsLoading(true);
-    getCapabilities.getLayersFromService(service.url, forceReload).then(function (layerTreeFromPromise) {
-      if (isMounted) {
-        setLayerTree(layerTreeFromPromise);
-        setIsLoading(false);
-      }
-    })["catch"](function (error) {
-      if (isMounted) {
-        setLayerTree(error.toString());
-        setIsLoading(false);
-      }
-    });
+    var makeServiceQuery = /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (!forceReload) {
+                _context.next = 3;
+                break;
+              }
+              _context.next = 3;
+              return invalidateWMSGetCapabilities(service.url);
+            case 3:
+              queryWMSLayersTree(service.url).then(function (layerTreeFromPromise) {
+                if (isMounted) {
+                  setLayerTree(layerTreeFromPromise);
+                  setIsLoading(false);
+                }
+              })["catch"](function (error) {
+                if (isMounted) {
+                  setLayerTree(error.toString());
+                  setIsLoading(false);
+                }
+              });
+            case 4:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function makeServiceQuery() {
+        return _ref2.apply(this, arguments);
+      };
+    }();
+    void makeServiceQuery();
     return function () {
       isMounted = false;
       setForceReload(false);
@@ -4295,7 +4321,7 @@ var AddLayersPopup = function AddLayersPopup(_ref) {
       // Check if valid URL was passed
     } else if (validateServiceUrl(serviceURL)) {
       // Check if service is WMS server
-      getCapabilities.getLayersFromService(serviceURL).then(function (layerTreeFromPromise) {
+      queryWMSLayersTree(serviceURL).then(function (layerTreeFromPromise) {
         // Shorten URL as a naming backup
         var shortenedURL = serviceURL.substring(serviceURL.indexOf('//') + 2, serviceURL.indexOf('?'));
         handleAddToList(layerTreeFromPromise.title || layerTreeFromPromise.name || shortenedURL);
@@ -4895,36 +4921,45 @@ var LayerManager = function LayerManager(_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 2023 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
- * Copyright 2023 - Finnish Meteorological Institute (FMI)
- * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
- * */
-var getServicesToLoad = function getServicesToLoad(services) {
-  return services.map(function (service) {
-    var wmService = WMGetServiceFromStore(service.url);
-    var scope = service.scope ? service.scope : 'system';
-    return {
-      id: wmService.id,
-      name: service.name,
-      url: service.url,
-      scope: scope,
-      "abstract": service["abstract"] || wmService["abstract"]
-    };
-  });
-};
+var getServicesToLoad = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(services) {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          return _context2.abrupt("return", Promise.all(services.map( /*#__PURE__*/function () {
+            var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(service) {
+              var scope;
+              return _regeneratorRuntime().wrap(function _callee$(_context) {
+                while (1) switch (_context.prev = _context.next) {
+                  case 0:
+                    scope = service.scope ? service.scope : 'system';
+                    return _context.abrupt("return", {
+                      id: getWMSServiceId(service.url),
+                      name: service.name,
+                      url: service.url,
+                      scope: scope,
+                      "abstract": service["abstract"]
+                    });
+                  case 2:
+                  case "end":
+                    return _context.stop();
+                }
+              }, _callee);
+            }));
+            return function (_x2) {
+              return _ref2.apply(this, arguments);
+            };
+          }())));
+        case 1:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function getServicesToLoad(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
 var useFetchServices = function useFetchServices(dialogType, preloadedServices, shouldDisableFetch) {
   if (preloadedServices === void 0) {
     preloadedServices = preloadedDefaultMapServices;
@@ -4947,7 +4982,7 @@ var useFetchServices = function useFetchServices(dialogType, preloadedServices,
   React.useEffect(function () {
     if (!shouldDisableFetch && isOpenInStore && preloadedServices && preloadedServices.length > 0 && !services.length) {
       var allServicesToLoad = mergePresetsAndUserAddedServices(preloadedServices, getUserAddedServices());
-      fetchInitialServices(getServicesToLoad(allServicesToLoad));
+      void getServicesToLoad(allServicesToLoad).then(fetchInitialServices);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isOpenInStore, services]);
@@ -5640,6 +5675,12 @@ var MapViewConnect = function MapViewConnect(_ref) {
   var mapPinLocation = useSelector(function (store) {
     return mapSelectors.getPinLocation(store, mapId);
   });
+  var linkedPanelId = useSelector(function (store) {
+    return genericSelectors.selectLinkedPanelId(store, mapId);
+  });
+  var selectedFeatureCoordinates = useSelector(function (store) {
+    return genericSelectors.getSelectedFeature(store.syncronizationGroupStore, linkedPanelId);
+  });
   var disableMapPin = useSelector(function (store) {
     return mapSelectors.getDisableMapPin(store, mapId);
   });
@@ -5699,6 +5740,12 @@ var MapViewConnect = function MapViewConnect(_ref) {
   var setSelectedFeature = React.useCallback(function (payload) {
     dispatch(layerActions.setSelectedFeature(payload));
   }, [dispatch]);
+  var handleFeatureSelect = function handleFeatureSelect(mapId, featureId) {
+    dispatch(genericActions.setFeatureSelected({
+      mapId: mapId,
+      featureId: featureId
+    }));
+  };
   var updateFeature = React.useCallback(function (_ref2) {
     var geojson = _ref2.geojson,
       reason = _ref2.reason,
@@ -5786,7 +5833,7 @@ var MapViewConnect = function MapViewConnect(_ref) {
       isTimeScrollingEnabled: isTimeScrollingEnabled,
       srs: srs,
       bbox: bbox,
-      mapPinLocation: displayMapPin ? mapPinLocation : undefined,
+      mapPinLocation: displayMapPin ? selectedFeatureCoordinates || mapPinLocation : undefined,
       dimensions: mapDimensions,
       activeLayerId: activeLayerId,
       animationDelay: animationDelay,
@@ -5853,7 +5900,25 @@ var MapViewConnect = function MapViewConnect(_ref) {
       }), linkedFeatures == null ? void 0 : linkedFeatures.map(function (feature) {
         return jsx(MapViewLayer, {
           id: "feature-" + (feature == null ? void 0 : feature.id),
-          geojson: feature == null ? void 0 : feature.geoJSON
+          geojson: feature.geoJSON,
+          onClickFeature: function onClickFeature(event) {
+            var _event$feature;
+            var isClickOutsideFeature = !event;
+            if (isClickOutsideFeature && !event.isInEditMode) {
+              return;
+            }
+            var clickedFeatureName = (_event$feature = event.feature) == null || (_event$feature = _event$feature.properties) == null ? void 0 : _event$feature.name;
+            var features = linkedFeatures[0].geoJSON.features;
+            var clickedFeatureIndex = features.findIndex(function (feature) {
+              var _feature$properties;
+              return ((_feature$properties = feature.properties) == null ? void 0 : _feature$properties.name) === clickedFeatureName;
+            });
+            if (disableMapPin === false) {
+              var _selectedFeature$id;
+              var selectedFeature = features[clickedFeatureIndex];
+              handleFeatureSelect(linkedPanelId, (_selectedFeature$id = selectedFeature.id) == null ? void 0 : _selectedFeature$id.toString());
+            }
+          }
         }, feature == null ? void 0 : feature.id);
       }), featureLayers.map(function (layer) {
         return jsx(MapViewLayer, Object.assign({
@@ -7901,7 +7966,7 @@ var useGetLatestReferenceTime = function useGetLatestReferenceTime(inputLayer) {
     setLatestReferenceTime = _React$useState[1];
   React.useEffect(function () {
     var wmLayer = new WMLayer(Object.assign({}, inputLayer));
-    wmLayer.parseLayerPromise().then(function (layer) {
+    wmLayer.parseLayer().then(function (layer) {
       var refTimeDim = layer.getDimension('reference_time');
       var lastRefTime = refTimeDim.getLastValue();
       setLatestReferenceTime(lastRefTime);
@@ -8008,7 +8073,7 @@ var useGetReferenceTimes = function useGetReferenceTimes(inputLayer) {
   React.useEffect(function () {
     var referenceTimes = [];
     var wmLayer = new WMLayer(Object.assign({}, inputLayer));
-    wmLayer.parseLayerPromise().then(function (layer) {
+    wmLayer.parseLayer().then(function (layer) {
       var refTimeDim = layer.getDimension('reference_time');
       /* Loop through all values of the dimension.
        A map cannot be used for iterating,  as the dimension values are not in an array (it is an API). */
@@ -8289,6 +8354,20 @@ var SyncGroupViewer = function SyncGroupViewer(_ref) {
     toggleTimeScroll = _ref.toggleTimeScroll;
   var _useCoreTranslation = useCoreTranslation(),
     t = _useCoreTranslation.t;
+  React.useEffect(function () {
+    var handleKeyDown = function handleKeyDown(event) {
+      var target = event.target;
+      if (target.tagName !== 'INPUT' && target.tagName !== 'TEXTAREA' && event.key === 's') {
+        toggleTimeScroll({
+          isTimeScrollingEnabled: !isTimeScrollingEnabled
+        });
+      }
+    };
+    window.addEventListener('keydown', handleKeyDown);
+    return function () {
+      window.removeEventListener('keydown', handleKeyDown);
+    };
+  }, [isTimeScrollingEnabled, toggleTimeScroll]);
   var _handleToggle = function handleToggle(groupCategory, groupId, sourceId) {
     var _syncGroupViewState$g = syncGroupViewState[groupCategory].groups.find(function (groupObject) {
         return groupObject.id === groupId;
@@ -8371,10 +8450,14 @@ var SyncGroupViewer = function SyncGroupViewer(_ref) {
         },
         children: t('workspace-time-scroll-off')
       }), jsx(Switch, {
+        inputProps: {
+          'aria-label': 'workspace time scroll toggle'
+        },
         checked: isTimeScrollingEnabled,
         onChange: function onChange() {
           return toggleTimeScroll({
-            isTimeScrollingEnabled: !isTimeScrollingEnabled
+            isTimeScrollingEnabled: !isTimeScrollingEnabled,
+            origin: 'user'
           });
         }
       }), jsx(Typography, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/core",
-  "version": "9.35.0",
+  "version": "9.35.1-spike-oltanstack.0",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {

package/src/lib/components/ComponentsLookUp/componentsLookUp.d.ts

@@ -25,7 +25,7 @@ export interface InitialTimeSeriesProps {
     plotPreset: PlotPreset;
     services: TimeSeriesService[];
 }
-export type InitialProps = InitialMapProps | InitialMultiMapProps | InitialHarmTempAndPrecipProps | ModelRunIntervalProps | mapTypes.MapPresetInitialProps | InitialSliderProps | InitialTimeSeriesProps;
+export type InitialProps = InitialMapProps | InitialMultiMapProps | InitialHarmTempAndPrecipProps | ModelRunIntervalProps | mapTypes.MapPresetInitialProps | InitialSliderProps | InitialTimeSeriesProps | Record<string, unknown>;
 /**
  * The lookup table is for registering your own components with the workspace.
  * @param payload

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

@@ -1,4 +1,4 @@
 import { serviceTypes } from '@opengeoweb/store';
-export declare const getServicesToLoad: (services: serviceTypes.NoIdService[]) => serviceTypes.InitialService[];
+export declare const getServicesToLoad: (services: serviceTypes.NoIdService[]) => Promise<serviceTypes.InitialService[]>;
 export declare const useFetchServices: (dialogType: string, preloadedServices?: serviceTypes.InitialService[] | undefined, shouldDisableFetch?: boolean) => void;
 export declare const mergePresetsAndUserAddedServices: (presets: serviceTypes.InitialService[], userAddedServices: serviceTypes.UserAddedServices) => serviceTypes.NoIdService[];

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

@@ -1,8 +1,24 @@
-import { WMLayer } from '@opengeoweb/webmap';
+import { LayerType, WMLayer } from '@opengeoweb/webmap';
 import { layerTypes, serviceTypes } from '@opengeoweb/store';
-export declare const multiDimensionLayer: import("@opengeoweb/webmap").LayerOptions, WmdefaultReduxLayerRadarKNMI: WMLayer, defaultReduxLayerRadarKNMI: import("@opengeoweb/webmap").LayerFoundation & {
-    styles: import("@opengeoweb/webmap").Style[];
-}, defaultReduxLayerRadarColor: import("@opengeoweb/webmap").LayerOptions, multiDimensionLayer3: import("@opengeoweb/webmap").LayerFoundation;
+export declare const multiDimensionLayer: {
+    service: string;
+    id: string;
+    name: string;
+    title: string;
+    layerType: LayerType;
+    enabled: boolean;
+    dimensions: ({
+        name: string;
+        units: string;
+        currentValue: string;
+        values: string;
+    } | {
+        name: string;
+        units: string;
+        currentValue: string;
+        values?: undefined;
+    })[];
+}, WmdefaultReduxLayerRadarKNMI: WMLayer, defaultReduxLayerRadarKNMI: import("@opengeoweb/webmap").LayerOptions, defaultReduxLayerRadarColor: import("@opengeoweb/webmap").LayerOptions, multiDimensionLayer3: import("@opengeoweb/webmap").LayerFoundation;
 export declare const flDimensionLayer: layerTypes.Layer;
 export declare const layerWithSingleDimensionValue: WMLayer;
 export declare const WmMultiDimensionLayer: WMLayer;