@opengeoweb/core 9.36.0 → 10.0.0

package/README.md

@@ -76,6 +76,6 @@ const ConnectedMapWithTimeSlider = ({ mapId }) => {
 export default ConnectedMapWithTimeSlider;
 ```
 
-## Documentation
+### TypeScript Documentation
 
-https://opengeoweb.gitlab.io/opengeoweb/docs/core/
+- [TypeScript Docs](https://opengeoweb.gitlab.io/opengeoweb/typescript-docs/core/)

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, routerUtils } 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, debounce, range } from 'lodash';
 import { LayerSelectButtonConnect, LayerSelectConnect } from '@opengeoweb/layer-select';
@@ -900,9 +900,7 @@ var layerManagerStyle = {
   // opacity
   '.column-4': Object.assign({
     width: "calc(" + flexibleAreaWidth + " * 0.15)"
-  }, columnCollapseStyle, {
-    flexGrow: 0
-  }),
+  }, columnCollapseStyle),
   // dimensions
   '.column-5': Object.assign({
     width: "calc(" + flexibleAreaWidth + " * 0.35)"
@@ -1070,30 +1068,39 @@ var RowItemCollapse$1 = function RowItemCollapse(_ref) {
   var _useCoreTranslation = useCoreTranslation(),
     t = _useCoreTranslation.t;
   var hoverId = columnClasses.columnHeader + "-" + className;
-  return jsx(CustomTooltip, {
-    title: collapsedColumns != null && collapsedColumns[className] ? t('column-expand', {
-      title: title
-    }) : t('column-collapse'),
-    children: jsx(Grid2, {
-      id: hoverId,
-      className: columnClasses.columnHeader + " " + className,
-      style: Object.assign({}, (collapsedColumns == null ? void 0 : collapsedColumns[className]) && {
-        width: '24px',
-        flexGrow: 0
-      }),
-      onClick: function onClick() {
-        onToggleCollapsed(className);
-      },
-      children: collapsedColumns != null && collapsedColumns[className] ? jsx(ColumnCollapsed, {}) : jsxs(Fragment, {
-        children: [jsx(Box, {
-          sx: styles$3.text,
-          children: title
-        }), jsx(ColumnCollapse, {
-          className: "column-hover-icon"
-        })]
+  return jsx(Box, {
+    id: hoverId,
+    style: Object.assign({}, (collapsedColumns == null ? void 0 : collapsedColumns[className]) && {
+      width: '24px',
+      flexGrow: 0
+    }),
+    className: columnClasses.columnHeader + " " + className,
+    children: jsx(CustomTooltip, {
+      title: collapsedColumns != null && collapsedColumns[className] ? t('column-expand', {
+        title: title
+      }) : t('column-collapse'),
+      children: jsx(Grid2, {
+        className: columnClasses.columnHeader + " " + className,
+        style: Object.assign({}, (collapsedColumns == null ? void 0 : collapsedColumns[className]) && {
+          width: '24px',
+          flexGrow: 0
+        }),
+        onClick: function onClick() {
+          var _document$getElementB;
+          onToggleCollapsed(className);
+          (_document$getElementB = document.getElementById(hoverId)) == null || _document$getElementB.dispatchEvent(new Event('mouseleave'));
+        },
+        children: collapsedColumns != null && collapsedColumns[className] ? jsx(ColumnCollapsed, {}) : jsxs(Fragment, {
+          children: [jsx(Box, {
+            sx: styles$3.text,
+            children: title
+          }), jsx(ColumnCollapse, {
+            className: "column-hover-icon"
+          })]
+        })
       })
-    })
-  }, collapsedColumns != null && collapsedColumns[className] ? 'Expand' : 'Collapse');
+    }, collapsedColumns != null && collapsedColumns[className] ? 'Expand' : 'Collapse')
+  });
 };
 var styles$3 = {
   text: function text(theme) {
@@ -2834,10 +2841,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 +2856,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 +3849,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 +4328,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 +4928,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 +4989,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]);
@@ -5601,6 +5643,7 @@ var ORIGIN_REACTMAPVIEWCONNECT_ONMAPCHANGEDIMENSION = 'ORIGIN_REACTMAPVIEWCONNEC
  * ```<MapViewConnect mapId={mapId} controls={{ zoomControls: false }} displayTimeInMap={false} showScaleBar={false}/>```
  */
 var MapViewConnect = function MapViewConnect(_ref) {
+  var _linkedFeatures$conca;
   var mapId = _ref.mapId,
     children = _ref.children,
     props = _objectWithoutPropertiesLoose(_ref, _excluded$2);
@@ -5625,6 +5668,10 @@ var MapViewConnect = function MapViewConnect(_ref) {
     var _store$syncronization;
     return genericSelectors.selectLinkedFeatures((_store$syncronization = store.syncronizationGroupStore) == null ? void 0 : _store$syncronization.linkedState, mapId);
   });
+  var linkedFormFeatures = useSelector(function (store) {
+    var _store$syncronization2;
+    return genericSelectors.selectLinkedFormFeatures((_store$syncronization2 = store.syncronizationGroupStore) == null ? void 0 : _store$syncronization2.linkedState, mapId);
+  });
   var bbox = useSelector(function (store) {
     return mapSelectors.getBbox(store, mapId);
   });
@@ -5884,7 +5931,7 @@ var MapViewConnect = function MapViewConnect(_ref) {
             });
           }
         }, layer), layer.id);
-      }), linkedFeatures == null ? void 0 : linkedFeatures.map(function (feature) {
+      }), (_linkedFeatures$conca = linkedFeatures.concat(linkedFormFeatures)) == null ? void 0 : _linkedFeatures$conca.map(function (feature) {
         return jsx(MapViewLayer, {
           id: feature.id,
           geojson: feature == null ? void 0 : feature.geoJSON,
@@ -7964,7 +8011,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);
@@ -8071,7 +8118,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). */
@@ -8857,6 +8904,13 @@ var languages = [{
   code: 'no',
   flag: jsx(FlagNorway, {})
 }];
+var languageLocalStorageKey = 'language';
+var getLanguageFromLocalStorage = function getLanguageFromLocalStorage() {
+  return window.localStorage.getItem(languageLocalStorageKey);
+};
+var saveLanguageToLocalStorage = function saveLanguageToLocalStorage(languageKey) {
+  window.localStorage.setItem(languageLocalStorageKey, languageKey);
+};
 var LanguageSelect = function LanguageSelect(_ref) {
   var _languages$find;
   var onChangeLanguage = _ref.onChangeLanguage,
@@ -8940,4 +8994,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, SearchControlConnect, SearchDialog, SentryRecordButton, SyncGroupViewerConnect, ThemeWrapperWithModules, TimeSliderConnect, ZoomControlConnect, componentsLookUp, coreTranslations, defaultBbox, defaultConfigurations, filterMapPresets, filterServices, filterTimeSeriesServices, 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, RouterWrapperConnect, SearchControlButtonConnect, SearchControlConnect, SearchDialog, SentryRecordButton, SyncGroupViewerConnect, ThemeWrapperWithModules, 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": "9.36.0",
+  "version": "10.0.0",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {

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

@@ -4,6 +4,9 @@ export declare const languages: {
     code: string;
     flag: React.ReactElement;
 }[];
+export declare const languageLocalStorageKey = "language";
+export declare const getLanguageFromLocalStorage: () => string | null;
+export declare const saveLanguageToLocalStorage: (languageKey: string) => void;
 declare const LanguageSelect: React.FC<{
     onChangeLanguage: (currentLanguage: string) => void;
     isOpen?: boolean;

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

@@ -1 +1 @@
-export { default as LanguageSelect } from './LanguageSelect';
+export { default as LanguageSelect, getLanguageFromLocalStorage, saveLanguageToLocalStorage, languageLocalStorageKey, } from './LanguageSelect';

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

@@ -71,7 +71,6 @@ export declare const layerManagerStyle: {
         width: string;
     };
     '.column-4': {
-        flexGrow: number;
         height: string;
         alignContent: string;
         alignItems: string;
@@ -80,6 +79,7 @@ export declare const layerManagerStyle: {
         whiteSpace: string;
         overflow: string;
         color: string;
+        flexGrow: number;
         width: string;
     };
     '.column-5': {

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;