@opengeoweb/core 2.1.4 → 2.2.0

package/lib/store/mapStore/service/selectors.d.ts

@@ -1,5 +1,4 @@
 import { Style } from '@opengeoweb/webmap';
-import { AppStore } from '../../../types/types';
 import { ServiceState, ServiceLayer, Service } from './types';
 /**
  * Retrieves all serviceIds
@@ -8,7 +7,19 @@ import { ServiceState, ServiceLayer, Service } from './types';
  * @param {object} store store: object - object from which the service state will be extracted
  * @returns {array} returnType: array - an array of all serviceIds
  */
-export declare const getServiceIds: import("reselect").OutputSelector<AppStore, string[], (res: ServiceState) => string[]>;
+export declare const getServiceIds: ((state: {
+    advancedLayerStore?: import("../../advancedLayerStore/types").AdvancedLayerStoreState;
+    syncronizationGroupStore?: import("../../generic/synchronizationGroups/types").SynchronizationGroupState;
+    ui?: import("../../ui/types").UIStoreType;
+    webmap?: import("../types").WebMapState;
+    services?: ServiceState;
+    layers?: import("../types").LayerState;
+    layerSelect?: import("../../layerSelect/types").LayerSelectStoreType;
+}) => string[]) & import("reselect").OutputSelectorFields<(args_0: ServiceState) => string[] & {
+    clearCache: () => void;
+}> & {
+    clearCache: () => void;
+};
 /**
  * Gets map services
  *
@@ -16,7 +27,19 @@ export declare const getServiceIds: import("reselect").OutputSelector<AppStore,
  * @param {object} store store: object - Store object
  * @returns {object} returnType: ServiceState
  */
-export declare const getServices: import("reselect").OutputSelector<AppStore, import("./types").Services, (res: ServiceState) => import("./types").Services>;
+export declare const getServices: ((state: {
+    advancedLayerStore?: import("../../advancedLayerStore/types").AdvancedLayerStoreState;
+    syncronizationGroupStore?: import("../../generic/synchronizationGroups/types").SynchronizationGroupState;
+    ui?: import("../../ui/types").UIStoreType;
+    webmap?: import("../types").WebMapState;
+    services?: ServiceState;
+    layers?: import("../types").LayerState;
+    layerSelect?: import("../../layerSelect/types").LayerSelectStoreType;
+}) => import("./types").Services) & import("reselect").OutputSelectorFields<(args_0: ServiceState) => import("./types").Services & {
+    clearCache: () => void;
+}> & {
+    clearCache: () => void;
+};
 /**
  * Gets the service object by its url
  *
@@ -24,7 +47,19 @@ export declare const getServices: import("reselect").OutputSelector<AppStore, im
  * @param {object} store store: object - Store object
  * @returns {Service} returnType: Service
  */
-export declare const getServiceByName: import("reselect").OutputParametricSelector<any, any, Service, (res1: ServiceState, res2: string) => Service>;
+export declare const getServiceByName: ((state: {
+    advancedLayerStore?: import("../../advancedLayerStore/types").AdvancedLayerStoreState;
+    syncronizationGroupStore?: import("../../generic/synchronizationGroups/types").SynchronizationGroupState;
+    ui?: import("../../ui/types").UIStoreType;
+    webmap?: import("../types").WebMapState;
+    services?: ServiceState;
+    layers?: import("../types").LayerState;
+    layerSelect?: import("../../layerSelect/types").LayerSelectStoreType;
+}, params_0: string) => Service) & import("reselect").OutputSelectorFields<(args_0: ServiceState, args_1: string) => Service & {
+    clearCache: () => void;
+}> & {
+    clearCache: () => void;
+};
 /**
  * Gets the layer from the store using the serviceUrl and layerName
  *
@@ -33,7 +68,19 @@ export declare const getServiceByName: import("reselect").OutputParametricSelect
  * @param {string}  serviceUrl serviceUrl: string - Url of the service where the layer belongs to
  * @returns {arrayr} returnType: ServiceLayer[] - All layers within the service object.
  */
-export declare const getLayersFromService: import("reselect").OutputParametricSelector<any, any, ServiceLayer[], (res: Service) => ServiceLayer[]>;
+export declare const getLayersFromService: ((state: {
+    advancedLayerStore?: import("../../advancedLayerStore/types").AdvancedLayerStoreState;
+    syncronizationGroupStore?: import("../../generic/synchronizationGroups/types").SynchronizationGroupState;
+    ui?: import("../../ui/types").UIStoreType;
+    webmap?: import("../types").WebMapState;
+    services?: ServiceState;
+    layers?: import("../types").LayerState;
+    layerSelect?: import("../../layerSelect/types").LayerSelectStoreType;
+}, params_0: string) => ServiceLayer[]) & import("reselect").OutputSelectorFields<(args_0: Service) => ServiceLayer[] & {
+    clearCache: () => void;
+}> & {
+    clearCache: () => void;
+};
 /**
  * Gets the layer from the store using the serviceUrl and layerName
  *
@@ -43,7 +90,19 @@ export declare const getLayersFromService: import("reselect").OutputParametricSe
  * @param {string}  layerName layerName: string - Name of the layer in the service
  * @returns {ServiceLayer} returnType: ServiceLayer - The layer from the service object.
  */
-export declare const getLayerFromService: import("reselect").OutputParametricSelector<AppStore, string, ServiceLayer, (res1: ServiceLayer[], res2: string, res3: string) => ServiceLayer>;
+export declare const getLayerFromService: ((state: {
+    advancedLayerStore?: import("../../advancedLayerStore/types").AdvancedLayerStoreState;
+    syncronizationGroupStore?: import("../../generic/synchronizationGroups/types").SynchronizationGroupState;
+    ui?: import("../../ui/types").UIStoreType;
+    webmap?: import("../types").WebMapState;
+    services?: ServiceState;
+    layers?: import("../types").LayerState;
+    layerSelect?: import("../../layerSelect/types").LayerSelectStoreType;
+}, params_0: string, params_1: string) => ServiceLayer) & import("reselect").OutputSelectorFields<(args_0: ServiceLayer[], args_1: string, args_2: string) => ServiceLayer & {
+    clearCache: () => void;
+}> & {
+    clearCache: () => void;
+};
 /**
  * Gets the layers stylelist from the servicestore using the serviceUrl and layerName
  *
@@ -53,4 +112,16 @@ export declare const getLayerFromService: import("reselect").OutputParametricSel
  * @param {string}  layerName layerName: string - Name of the layer in the service
  * @returns {array} returnType: Style[] - array containing layer styles
  */
-export declare const getLayerStyles: import("reselect").OutputParametricSelector<AppStore, string, Style[], (res: ServiceLayer) => Style[]>;
+export declare const getLayerStyles: ((state: {
+    advancedLayerStore?: import("../../advancedLayerStore/types").AdvancedLayerStoreState;
+    syncronizationGroupStore?: import("../../generic/synchronizationGroups/types").SynchronizationGroupState;
+    ui?: import("../../ui/types").UIStoreType;
+    webmap?: import("../types").WebMapState;
+    services?: ServiceState;
+    layers?: import("../types").LayerState;
+    layerSelect?: import("../../layerSelect/types").LayerSelectStoreType;
+}, params_0: string, params_1: string) => Style[]) & import("reselect").OutputSelectorFields<(args_0: ServiceLayer) => Style[] & {
+    clearCache: () => void;
+}> & {
+    clearCache: () => void;
+};

package/lib/store/mapStore/service/types.d.ts

@@ -19,7 +19,7 @@ export interface ServiceLayer {
     name: string;
     text: string;
     leaf: boolean;
-    path: string;
+    path: string[];
     abstract?: string;
     keywords?: string[];
     styles?: Style[];

package/lib/store/mapStore/utils/helpers.d.ts

@@ -4,7 +4,6 @@ export declare const dateFormat = "YYYY-MM-DDTHH:mm:ss[Z]";
 export declare const generateLayerId: () => string;
 export declare const generateMapId: () => string;
 export declare const generateTimesliderId: () => string;
-export declare const generateScreenId: () => string;
 /**
  * Registers a WMJSLayer in a lookuptable with a layerId
  * @param {WMLayer} wmLayer

package/lib/store/ui/selectors.d.ts

@@ -16,7 +16,19 @@ export declare const getDialogDetailsByType: (store: AppStore, dialogType: strin
  * @param {string} dialogType type of the dialog 'legend' | 'layerManager' | 'dimensionSelect-elevation'
  * @returns {array} [string, boolean] first element gives the active map id, second element whether the dialog is open
  */
-export declare const getisDialogOpen: import("reselect").OutputParametricSelector<AppStore, string, boolean, (res: UIType) => boolean>;
+export declare const getisDialogOpen: ((state: {
+    advancedLayerStore?: import("../advancedLayerStore/types").AdvancedLayerStoreState;
+    syncronizationGroupStore?: import("../generic/synchronizationGroups/types").SynchronizationGroupState;
+    ui?: import("./types").UIStoreType;
+    webmap?: import("../mapStore/types").WebMapState;
+    services?: import("../mapStore/types").ServiceState;
+    layers?: import("../mapStore/types").LayerState;
+    layerSelect?: import("../layerSelect/types").LayerSelectStoreType;
+}, params_0: string) => boolean) & import("reselect").OutputSelectorFields<(args_0: UIType) => boolean & {
+    clearCache: () => void;
+}> & {
+    clearCache: () => void;
+};
 /**
  *For a given ui component: gets the active map Id
  *
@@ -24,7 +36,19 @@ export declare const getisDialogOpen: import("reselect").OutputParametricSelecto
  * @param {string} dialogType type of the dialog 'legend' | 'layerManager' | 'dimensionSelect-elevation'
  * @returns {array} [string, boolean] first element gives the active map id, second element whether the dialog is open
  */
-export declare const getDialogMapId: import("reselect").OutputParametricSelector<AppStore, string, string, (res: UIType) => string>;
+export declare const getDialogMapId: ((state: {
+    advancedLayerStore?: import("../advancedLayerStore/types").AdvancedLayerStoreState;
+    syncronizationGroupStore?: import("../generic/synchronizationGroups/types").SynchronizationGroupState;
+    ui?: import("./types").UIStoreType;
+    webmap?: import("../mapStore/types").WebMapState;
+    services?: import("../mapStore/types").ServiceState;
+    layers?: import("../mapStore/types").LayerState;
+    layerSelect?: import("../layerSelect/types").LayerSelectStoreType;
+}, params_0: string) => string) & import("reselect").OutputSelectorFields<(args_0: UIType) => string & {
+    clearCache: () => void;
+}> & {
+    clearCache: () => void;
+};
 /**
  *For a given ui component: gets the order of visible dialog
  *
@@ -32,7 +56,19 @@ export declare const getDialogMapId: import("reselect").OutputParametricSelector
  * @param {DialogType} dialogType type of the dialog 'legend' | 'layerManager' | 'dimensionSelect-elevation' | dimensionSelect-ensemble_member
  * @returns {number} the higher the order number the higher the zIndex
  */
-export declare const getDialogOrder: import("reselect").OutputParametricSelector<AppStore, DialogType, number, (res: number) => number>;
+export declare const getDialogOrder: ((state: {
+    advancedLayerStore?: import("../advancedLayerStore/types").AdvancedLayerStoreState;
+    syncronizationGroupStore?: import("../generic/synchronizationGroups/types").SynchronizationGroupState;
+    ui?: import("./types").UIStoreType;
+    webmap?: import("../mapStore/types").WebMapState;
+    services?: import("../mapStore/types").ServiceState;
+    layers?: import("../mapStore/types").LayerState;
+    layerSelect?: import("../layerSelect/types").LayerSelectStoreType;
+}, params_0: DialogType) => number) & import("reselect").OutputSelectorFields<(args_0: number) => number & {
+    clearCache: () => void;
+}> & {
+    clearCache: () => void;
+};
 /**
  *For a given ui component: returns if ordered on top
  *
@@ -40,5 +76,29 @@ export declare const getDialogOrder: import("reselect").OutputParametricSelector
  * @param {DialogType} dialogType type of the dialog 'legend' | 'layerManager' | 'dimensionSelect-elevation' | dimensionSelect-ensemble_member
  * @returns {boolean}
  */
-export declare const getDialogIsOrderedOnTop: import("reselect").OutputParametricSelector<AppStore, DialogType, boolean, (res: boolean) => boolean>;
-export declare const getDialogSource: import("reselect").OutputParametricSelector<AppStore, string, import("./types").Source, (res: UIType) => import("./types").Source>;
+export declare const getDialogIsOrderedOnTop: ((state: {
+    advancedLayerStore?: import("../advancedLayerStore/types").AdvancedLayerStoreState;
+    syncronizationGroupStore?: import("../generic/synchronizationGroups/types").SynchronizationGroupState;
+    ui?: import("./types").UIStoreType;
+    webmap?: import("../mapStore/types").WebMapState;
+    services?: import("../mapStore/types").ServiceState;
+    layers?: import("../mapStore/types").LayerState;
+    layerSelect?: import("../layerSelect/types").LayerSelectStoreType;
+}, params_0: DialogType) => boolean) & import("reselect").OutputSelectorFields<(args_0: boolean) => boolean & {
+    clearCache: () => void;
+}> & {
+    clearCache: () => void;
+};
+export declare const getDialogSource: ((state: {
+    advancedLayerStore?: import("../advancedLayerStore/types").AdvancedLayerStoreState;
+    syncronizationGroupStore?: import("../generic/synchronizationGroups/types").SynchronizationGroupState;
+    ui?: import("./types").UIStoreType;
+    webmap?: import("../mapStore/types").WebMapState;
+    services?: import("../mapStore/types").ServiceState;
+    layers?: import("../mapStore/types").LayerState;
+    layerSelect?: import("../layerSelect/types").LayerSelectStoreType;
+}, params_0: string) => import("./types").Source) & import("reselect").OutputSelectorFields<(args_0: UIType) => import("./types").Source & {
+    clearCache: () => void;
+}> & {
+    clearCache: () => void;
+};

package/lib/utils/defaultTestSettings.d.ts

@@ -52,23 +52,23 @@ export declare const defaultReduxServices: {
             name: string;
             text: string;
             leaf: boolean;
-            path: string;
-            keywords: any[];
+            path: any[];
+            keywords: string[];
             abstract: string;
             styles?: undefined;
         } | {
             name: string;
             text: string;
             leaf: boolean;
-            path: string;
-            keywords: any[];
+            path: any[];
+            keywords: string[];
             abstract: string;
             styles: Style[];
         } | {
             name: string;
             text: string;
             leaf: boolean;
-            path: string;
+            path: any[];
             keywords: any[];
             abstract?: undefined;
             styles?: undefined;
@@ -189,7 +189,7 @@ export declare const WmMultiDimensionServices: {
             name: string;
             text: string;
             leaf: boolean;
-            path: string;
+            path: any[];
         }[];
     };
     'https://testservice': {
@@ -200,7 +200,7 @@ export declare const WmMultiDimensionServices: {
             name: string;
             text: string;
             leaf: boolean;
-            path: string;
+            path: any[];
         }[];
     };
 };

package/lib/utils/getCapabilities.d.ts

@@ -23,8 +23,8 @@ export declare const recurseNodes: (nodesToRecur: LayerTree) => LayerTree;
  */
 export declare const getLayersFromService: (serviceUrl: string, forceReload?: boolean) => Promise<LayerTree>;
 /**
- * Returns a promise with a webmapjs node structure layers from the WMS GetCapabilities document.
+ * Returns a promise with an array of flattened layerobjects from the WMS GetCapabilities document.
  * @param serviceUrl The URL of the WMS service
  * @param {boolean} forceReload **optional** forceReload: boolean, true will force the layers to be reloaded from the service, defaults to false
  */
-export declare const getLayerNodesFromService: (serviceUrl: string, forceReload?: boolean) => Promise<[]>;
+export declare const getLayersFlattenedFromService: (serviceUrl: string, forceReload?: boolean) => Promise<[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/core",
-  "version": "2.1.4",
+  "version": "2.2.0",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -13,22 +13,22 @@
   "dependencies": {},
   "peerDependencies": {
     "react": "^17.0.2",
-    "@opengeoweb/theme": "2.1.4",
+    "@opengeoweb/theme": "2.2.0",
     "@mui/material": "^5.2.8",
     "@mui/styles": "^5.2.3",
     "@mui/icons-material": "^5.2.5",
     "react-redux": "7.2.2",
     "moment": "^2.29.0",
     "react-intl": "^5.17.5",
-    "@opengeoweb/webmap": "2.1.4",
+    "@opengeoweb/webmap": "2.2.0",
     "throttle-debounce": "^3.0.1",
     "proj4": "^2.6.2",
     "react-sortablejs": "^6.0.0",
-    "@opengeoweb/shared": "2.1.4",
+    "@opengeoweb/shared": "2.2.0",
     "react-draggable": "^4.4.3",
     "re-resizable": "^6.9.0",
     "lodash": "^4.17.20",
-    "@opengeoweb/form-fields": "2.1.4",
+    "@opengeoweb/form-fields": "2.2.0",
     "react-hook-form": "^6.12.1",
     "moment-timezone": "^0.5.31",
     "@mui/lab": "^5.0.0-alpha.64",
@@ -37,7 +37,7 @@
     "redux": "^4.0.4",
     "lodash.clonedeep": "^4.5.0",
     "immer": "^9.0.6",
-    "reselect": "^4.0.0",
+    "reselect": "^4.1.5",
     "redux-dynamic-modules-saga": "^5.2.0",
     "redux-saga": "^1.1.3"
   }