@opengeoweb/core 1.3.0 → 2.1.3

package/lib/utils/defaultTestSettings.d.ts

@@ -10,6 +10,12 @@ export declare const defaultReduxLayerRadarColor: {
     enabled: boolean;
     layerType: LayerType;
     dimensions: any[];
+    styles: {
+        title: string;
+        name: string;
+        legendURL: string;
+        abstract: string;
+    }[];
     id: string;
 };
 export declare const defaultReduxLayerRadarKNMI: {
@@ -25,182 +31,36 @@ export declare const defaultReduxLayerRadarKNMI: {
         units: string;
         currentValue: string;
     }[];
+    styles: {
+        title: string;
+        name: string;
+        legendURL: string;
+        abstract: string;
+    }[];
     id: string;
 };
 export declare const WmdefaultReduxLayerRadarKNMI: WMLayer;
 export declare const makeGeoservicesRadarLayer: () => WMLayer;
 export declare const defaultReduxServices: {
     'https://testservice': {
-        layers: {
+        id: string;
+        name: string;
+        service: string;
+        layers: ({
             name: string;
             text: string;
             leaf: boolean;
             path: string;
-        }[];
-        layer: {
-            RAD_NL25_PCP_CM: {
-                styles: {
-                    attr: {};
-                    Name: {
-                        attr: {};
-                        value: string;
-                    };
-                    Title: {
-                        attr: {};
-                        value: string;
-                    };
-                    LegendURL: {
-                        attr: {
-                            width: string;
-                            height: string;
-                        };
-                        Format: {
-                            attr: {};
-                            value: string;
-                        };
-                        OnlineResource: {
-                            attr: {
-                                'xlink:type': string;
-                                'xlink:href': string;
-                            };
-                        };
-                    };
-                    index: number;
-                    nrOfStyles: number;
-                    title: string;
-                    name: string;
-                    legendURL: string;
-                    abstracttext: string;
-                }[];
-            };
-            RADNL_OPER_R___25PCPRR_L3_KNMI: {
-                styles: {
-                    attr: {};
-                    Name: {
-                        attr: {};
-                        value: string;
-                    };
-                    Title: {
-                        attr: {};
-                        value: string;
-                    };
-                    LegendURL: {
-                        attr: {
-                            width: string;
-                            height: string;
-                        };
-                        Format: {
-                            attr: {};
-                            value: string;
-                        };
-                        OnlineResource: {
-                            attr: {
-                                'xlink:type': string;
-                                'xlink:href': string;
-                            };
-                        };
-                    };
-                    index: number;
-                    nrOfStyles: number;
-                    title: string;
-                    name: string;
-                    legendURL: string;
-                    abstracttext: string;
-                }[];
-                dimensions: {
-                    name: string;
-                    units: string;
-                    currentValue: string;
-                }[];
-            };
-            MULTI_DIMENSION_LAYER: {
-                styles: {
-                    attr: {};
-                    Name: {
-                        attr: {};
-                        value: string;
-                    };
-                    Title: {
-                        attr: {};
-                        value: string;
-                    };
-                    LegendURL: {
-                        attr: {
-                            width: string;
-                            height: string;
-                        };
-                        Format: {
-                            attr: {};
-                            value: string;
-                        };
-                        OnlineResource: {
-                            attr: {
-                                'xlink:type': string;
-                                'xlink:href': string;
-                            };
-                        };
-                    };
-                    index: number;
-                    nrOfStyles: number;
-                    title: string;
-                    name: string;
-                    legendURL: string;
-                    abstracttext: string;
-                }[];
-                dimensions: ({
-                    name: string;
-                    units: string;
-                    currentValue: string;
-                    values?: undefined;
-                } | {
-                    name: string;
-                    units: string;
-                    currentValue: string;
-                    values: string;
-                })[];
-            };
-            LAYER_WITHOUT_TIME: {
-                styles: {
-                    attr: {};
-                    Name: {
-                        attr: {};
-                        value: string;
-                    };
-                    Title: {
-                        attr: {};
-                        value: string;
-                    };
-                    LegendURL: {
-                        attr: {
-                            width: string;
-                            height: string;
-                        };
-                        Format: {
-                            attr: {};
-                            value: string;
-                        };
-                        OnlineResource: {
-                            attr: {
-                                'xlink:type': string;
-                                'xlink:href': string;
-                            };
-                        };
-                    };
-                    index: number;
-                    nrOfStyles: number;
-                    title: string;
-                    name: string;
-                    legendURL: string;
-                    abstracttext: string;
-                }[];
-                dimensions: {
-                    name: string;
-                    units: string;
-                    currentValue: string;
-                    values: string;
-                }[];
-            };
-        };
+            keywords: any[];
+            abstract: string;
+        } | {
+            name: string;
+            text: string;
+            leaf: boolean;
+            path: string;
+            keywords: any[];
+            abstract?: undefined;
+        })[];
     };
 };
 export declare const multiDimensionLayer: {
@@ -221,6 +81,12 @@ export declare const multiDimensionLayer: {
         currentValue: string;
         values?: undefined;
     })[];
+    styles: {
+        title: string;
+        name: string;
+        legendURL: string;
+        abstract: string;
+    }[];
 };
 export declare const flDimensionLayer: {
     service: string;
@@ -258,6 +124,12 @@ export declare const multiDimensionLayer2: {
         currentValue: string;
         values?: undefined;
     })[];
+    styles: {
+        title: string;
+        name: string;
+        legendURL: string;
+        abstract: string;
+    }[];
 };
 export declare const multiDimensionLayer3: {
     service: string;
@@ -287,92 +159,37 @@ export declare const multiDimensionLayer3: {
         };
         values?: undefined;
     })[];
+    styles: {
+        title: string;
+        name: string;
+        legendURL: string;
+        abstract: string;
+    }[];
 };
 export declare const WmMultiDimensionLayer2: WMLayer;
 export declare const WmMultiDimensionLayer3: WMLayer;
 export declare const WmMultiDimensionServices: {
     'https://testservicedimensions': {
+        id: string;
+        name: string;
+        service: string;
         layers: {
             name: string;
             text: string;
             leaf: boolean;
             path: string;
         }[];
-        layer: {
-            netcdf_5dims: {
-                styles: {
-                    attr: {};
-                    Name: {
-                        attr: {};
-                        value: string;
-                    };
-                    Title: {
-                        attr: {};
-                        value: string;
-                    };
-                    LegendURL: {
-                        attr: {
-                            width: string;
-                            height: string;
-                        };
-                        Format: {
-                            attr: {};
-                            value: string;
-                        };
-                        OnlineResource: {
-                            attr: {
-                                'xlink:type': string;
-                                'xlink:href': string;
-                            };
-                        };
-                    };
-                    index: number;
-                    nrOfStyles: number;
-                    title: string;
-                    name: string;
-                    legendURL: string;
-                    abstracttext: string;
-                }[];
-                dimensions: ({
-                    name: string;
-                    units: string;
-                    currentValue: string;
-                    values: string;
-                } | {
-                    name: string;
-                    units: string;
-                    currentValue: string;
-                    values?: undefined;
-                })[];
-            };
-        };
     };
     'https://testservice': {
+        id: string;
+        name: string;
+        service: string;
         layers: {
             name: string;
             text: string;
             leaf: boolean;
             path: string;
         }[];
-        layer: {
-            RADNL_OPER_R___25PCPRR_L3_KNMI: {
-                styles: any[];
-                dimensions: {
-                    name: string;
-                    units: string;
-                    currentValue: string;
-                }[];
-            };
-            LAYER_WITHOUT_TIME: {
-                styles: any[];
-                dimensions: {
-                    name: string;
-                    units: string;
-                    currentValue: string;
-                    values: string;
-                }[];
-            };
-        };
     };
 };
 export declare const layerWithoutTimeDimension: {
@@ -386,6 +203,12 @@ export declare const layerWithoutTimeDimension: {
         currentValue: string;
         values: string;
     }[];
+    styles: {
+        title: string;
+        name: string;
+        legendURL: string;
+        abstract: string;
+    }[];
 };
 export declare const WmLayerWithoutTimeDimension: WMLayer;
 export declare const defaultTestServices: Service[];

package/lib/utils/dimensionUtils.d.ts

@@ -1,5 +1,9 @@
-import { Mark } from '@material-ui/core';
+/// <reference types="react" />
 import { WMJSDimension } from '@opengeoweb/webmap';
+export interface Mark {
+    value: number | string;
+    label?: React.ReactNode;
+}
 export declare const marksByDimension: (dim: WMJSDimension) => Mark[];
 /**
  * Re-formats moment's isoString to the string that is expected by WMJSDimension (for time).

package/lib/utils/getCapabilities.d.ts

@@ -7,6 +7,8 @@ export interface LayerTree {
     path: string | string[];
     title: string;
     children: LayerTree[];
+    keywords?: string[];
+    abstract?: string;
     text?: string;
 }
 /**
@@ -20,3 +22,9 @@ export declare const recurseNodes: (nodesToRecur: LayerTree) => LayerTree;
  * @param {boolean} forceReload **optional** forceReload: boolean, true will force the layers to be reloaded from the service, defaults to false
  */
 export declare const getLayersFromService: (serviceUrl: string, forceReload?: boolean) => Promise<LayerTree>;
+/**
+ * Returns a promise with a webmapjs node structure layers 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<[]>;

package/lib/utils/testUtils.d.ts

@@ -1,11 +1,12 @@
-import { WebMapState, LayerState, Dimension, Layer, WebMapStateModuleState } from '../store/mapStore/types';
+import { WebMapState, LayerState, Dimension, Layer, WebMapStateModuleState, Scale } from '../store/mapStore/types';
 export declare const createWebmapState: (...mapIds: string[]) => WebMapState;
 export declare const createLayersState: (layerId: string, props?: {}) => LayerState;
+export declare const createMultipleLayersState: (layers: Layer[], mapId: string) => LayerState;
 export declare const createMapDimensionsState: (dimensions?: Dimension[], ...mapIds: string[]) => WebMapState;
 export declare const mockStateMapWithLayer: (layer: Layer, mapId: string) => WebMapStateModuleState;
 export declare const mockStateMapWithMultipleLayers: (layers: Layer[], mapId: string) => WebMapStateModuleState;
 export declare const mockStateMapWithDimensions: (layer: Layer, mapId: string) => WebMapStateModuleState;
 export declare const mockStateMapWithDimensionsWithoutLayers: (mapId: string) => WebMapStateModuleState;
-export declare const mockStateMapWithTimeSliderScaleWithoutLayers: (mapId: string, timeSliderScale: number) => WebMapStateModuleState;
+export declare const mockStateMapWithTimeSliderScaleWithoutLayers: (mapId: string, timeSliderScale: Scale) => WebMapStateModuleState;
 export declare const mockStateMapWithTimeStepWithoutLayers: (mapId: string, timeStep: number) => WebMapStateModuleState;
 export declare const mockStateMapWithAnimationDelayWithoutLayers: (mapId: string) => WebMapStateModuleState;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/core",
-  "version": "1.3.0",
+  "version": "2.1.3",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -13,31 +13,31 @@
   "dependencies": {},
   "peerDependencies": {
     "react": "16.14.0",
+    "@opengeoweb/theme": "2.1.3",
     "@material-ui/core": "^4.11.0",
+    "@material-ui/lab": "^4.0.0-alpha.56",
     "@material-ui/icons": "^4.9.1",
-    "react-intl": "^5.17.5",
     "react-redux": "7.2.2",
-    "@opengeoweb/webmap": "1.3.0",
     "moment": "^2.29.0",
+    "react-intl": "^5.17.5",
+    "@opengeoweb/webmap": "2.1.3",
     "throttle-debounce": "^3.0.1",
     "proj4": "^2.6.2",
     "react-sortablejs": "^6.0.0",
-    "@opengeoweb/shared": "1.3.0",
-    "@material-ui/lab": "^4.0.0-alpha.56",
-    "@opengeoweb/theme": "1.3.0",
+    "@opengeoweb/shared": "2.1.3",
     "react-draggable": "^4.4.3",
     "re-resizable": "^6.9.0",
     "lodash": "^4.17.20",
-    "@opengeoweb/form-fields": "1.3.0",
+    "@opengeoweb/form-fields": "2.1.3",
     "react-hook-form": "^6.12.1",
     "@material-ui/pickers": "^3.2.10",
-    "@date-io/moment": "^1.3.13",
     "moment-timezone": "^0.5.31",
+    "@date-io/moment": "^1.3.13",
     "axios": "^0.21.4",
-    "immer": "^9.0.6",
     "redux-dynamic-modules": "^5.2.0",
     "redux": "^4.0.4",
     "lodash.clonedeep": "^4.5.0",
+    "immer": "^9.0.6",
     "reselect": "^4.0.0",
     "redux-dynamic-modules-saga": "^5.2.0",
     "redux-saga": "^1.1.3"

package/lib/components/MultiDimensionSelect/MultiDimensionSelectConfig.d.ts

@@ -1,3 +0,0 @@
-import { DimensionConfig } from './types';
-export declare const dimensionConfig: DimensionConfig[];
-export declare const dimensionIcons: Map<string, import("@material-ui/core/OverridableComponent").OverridableComponent<import("@material-ui/core").SvgIconTypeMap<{}, "svg">>>;

package/lib/components/MultiDimensionSelect/MultiDimensionSelectConnect.d.ts

@@ -1,15 +0,0 @@
-import * as React from 'react';
-interface MultiDimensionSelectConnectProps {
-    mapId: string;
-    showDialogs?: boolean;
-}
-/**
- * Component used to control values for all dimension other than time and ref.time
- *
- * Expects the following props:
- * @param {string} mapId mapId: string - Id of the map
- * @example
- * ``` <MultiDimensionSelectConnect mapId="mapid_1"  /> ```
- */
-declare const MultiDimensionSelectConnect: React.FC<MultiDimensionSelectConnectProps>;
-export default MultiDimensionSelectConnect;

package/lib/components/MultiDimensionSelect/MultiDimensionSelectDialog.d.ts

@@ -1,15 +0,0 @@
-import * as React from 'react';
-import { DimensionSliderData } from './types';
-export interface MultiDimensionSelectDialogProps {
-    sliderDataArray: DimensionSliderData[];
-    isDialogOpen?: boolean;
-    dimension: string;
-    handleSyncChanged: (layerId: string, dimensionName: string) => void;
-    handleDimensionValueChanged: (layerId: string, dimensionName: string, dimensionValue: string, changeSynched: boolean) => void;
-    onMouseDown?: () => void;
-    onToggleDialog?: (isDialogOpen: boolean) => void;
-    index?: number;
-    order?: number;
-}
-declare const MultiDimensionSelectDialog: React.FC<MultiDimensionSelectDialogProps>;
-export default MultiDimensionSelectDialog;

package/lib/components/MultiDimensionSelect/MultiDimensionSelectDialogConnect.d.ts

@@ -1,8 +0,0 @@
-import * as React from 'react';
-import { MultiDimensionSelectDialogProps } from './MultiDimensionSelectDialog';
-interface MultiDimensionSelectDialogConnectProps extends MultiDimensionSelectDialogProps {
-    mapId: string;
-    isDialogOpen?: boolean;
-}
-declare const MultiDimensionSelectDialogConnect: React.FC<MultiDimensionSelectDialogConnectProps>;
-export default MultiDimensionSelectDialogConnect;

package/lib/components/MultiDimensionSelect/index.d.ts

@@ -1,2 +0,0 @@
-export { default as MultiDimensionSelectDialog } from './MultiDimensionSelectDialog';
-export { default as MultiDimensionSelectConnect } from './MultiDimensionSelectConnect';

package/lib/components/MultiDimensionSelect/types.d.ts

@@ -1,18 +0,0 @@
-import { Mark } from '@material-ui/core';
-export interface DimensionSliderData {
-    dimensionName: string;
-    layerId: string;
-    layerName: string;
-    unit: string;
-    marks: Mark[];
-    synced: boolean;
-    validSelection: boolean;
-    currentValue: string;
-}
-export interface DimensionConfig {
-    name: string;
-    label: string;
-    defaultUnit: string;
-    reversed: boolean;
-    iconType: string;
-}

package/lib/components/SyncGroups/ConfigurableConnectedMap.d.ts

@@ -1,17 +0,0 @@
-import React from 'react';
-import { Bbox, Layer } from '../../store/mapStore/types';
-interface ConfigurableConnectedMapProps {
-    title?: string;
-    id?: string;
-    className?: string;
-    layers: Layer[];
-    activeLayerId?: string;
-    baseLayer?: Layer;
-    bbox?: Bbox;
-    srs?: string;
-    displayTimeInMap?: boolean;
-    displayLayerManagerButtonInMap?: boolean;
-    shouldAutoUpdate?: boolean;
-}
-export declare const ConfigurableConnectedMap: React.FC<ConfigurableConnectedMapProps>;
-export {};

package/lib/components/SyncGroups/SyncGroupDialog.d.ts

@@ -1,7 +0,0 @@
-import * as React from 'react';
-interface SyncGroupDialogProps {
-    syncGroupsOpen: boolean;
-    setSyncGroupsOpen: (open: boolean) => void;
-}
-export declare const SyncGroupDialog: React.FC<SyncGroupDialogProps>;
-export {};