@opengeoweb/core 4.8.0 → 4.10.0

package/lib/components/LayerManager/LayerContainerRow/LayerRow/ActivateLayer/ActivateLayer.d.ts

@@ -1,10 +1,8 @@
 import * as React from 'react';
 interface ActivateLayerProps {
-    tooltipTitle?: string;
-    onClickActivate: () => void;
-    isActive?: boolean;
-    isEnabled?: boolean;
-    id?: string;
+    onChange: (isActive: boolean) => void;
+    isActive: boolean;
+    isEnabled: boolean;
 }
 declare const ActivateLayer: React.FC<ActivateLayerProps>;
 export default ActivateLayer;

package/lib/components/LayerManager/LayerContainerRow/LayerRow/DragHandle/DragHandle.d.ts

@@ -3,6 +3,7 @@ interface DragHandleProps {
     isDisabled?: boolean;
     index?: number;
     hideTooltip?: boolean;
+    isSorting?: boolean;
 }
 export declare const TOOLTIP_TITLE = "Drag";
 declare const DragHandle: React.FC<DragHandleProps>;

package/lib/components/LayerManager/LayerManagerHeaderOptions.d.ts

@@ -20,5 +20,9 @@ export declare const sizeLarge: {
     width: number;
     height: number;
 };
+export declare const sizeExtraLarge: {
+    width: number;
+    height: number;
+};
 declare const HeaderOptions: React.FC<HeaderOptionsProps>;
 export default HeaderOptions;

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

@@ -1,3 +1,4 @@
+export { default as LayerManager } from './LayerManager';
 export { default as LayerManagerConnect } from './LayerManagerConnect';
 export { default as DockedLayerManagerConnect } from './DockedLayerManagerConnect';
 export { default as LayerSelectConnect } from './LayerSelect/LayerSelectConnect';

package/lib/components/TimeSlider/TimeSlider.d.ts

@@ -7,6 +7,13 @@ export interface TimeSliderProps {
     mapIsActive?: boolean;
     onToggleTimeSlider?: (isVisible: boolean) => void;
     isVisible?: boolean;
+    timeStep: number;
+    dataStartTime: number;
+    dataEndTime: number;
+    selectedTime: number;
+    currentTime: number;
+    onSetNewDate: (newDate: string) => void;
+    onSetCenterTime: (newTime: number) => void;
 }
 declare const TimeSlider: React.FC<TimeSliderProps>;
 export default TimeSlider;

package/lib/components/TimeSlider/TimeSliderButtons/AnimationLengthButton/AnimationLengthButton.d.ts

@@ -3,8 +3,7 @@ export declare const title = "Animation";
 interface AnimationLengthButtonProps {
     disabled?: boolean;
     animationLength?: AnimationLength;
-    animationLengthInMinutes?: number;
     onChangeAnimationLength: (length: number) => void;
 }
-declare const AnimationLengthButton: ({ disabled, animationLength, animationLengthInMinutes, onChangeAnimationLength, }: AnimationLengthButtonProps) => JSX.Element;
+declare const AnimationLengthButton: ({ disabled, animationLength, onChangeAnimationLength, }: AnimationLengthButtonProps) => JSX.Element;
 export default AnimationLengthButton;

package/lib/components/TimeSlider/TimeSliderButtons/TimeSliderMenu/TimeSliderMenu.d.ts

@@ -15,6 +15,7 @@ export interface TimeSliderMenuProps {
     handleAutoClick?: () => void;
     isAutoSelected?: boolean;
     onChangeMouseWheel?: (element: Mark) => void;
-    animationLength?: number;
+    displayVariableDuration?: boolean;
+    layerHasTimeStep?: boolean;
 }
-export declare const TimeSliderMenu: ({ marks, value, isOpenByDefault, handleMenuItemClick, isDisabled, handleAutoClick, isAutoSelected, title, icon, onChangeMouseWheel, animationLength, }: TimeSliderMenuProps) => JSX.Element;
+export declare const TimeSliderMenu: ({ marks, value, isOpenByDefault, handleMenuItemClick, isDisabled, handleAutoClick, isAutoSelected, title, icon, onChangeMouseWheel, displayVariableDuration, layerHasTimeStep, }: TimeSliderMenuProps) => JSX.Element;

package/lib/components/TimeSlider/TimeSliderButtons/TimeStepButton/TimeStepButton.d.ts

@@ -2,13 +2,14 @@ import * as React from 'react';
 import { Dimension, MapActionOrigin } from '../../../../store/mapStore/types';
 export declare const timeStepTitle = "Time step";
 export interface TimeStepButtonProps {
-    timeStep: number;
+    timeStep?: number;
     disabled?: boolean;
     isTimestepAuto: boolean;
     timeDimension?: Dimension;
     onChangeTimeStep: (scale: number, origin?: MapActionOrigin) => void;
     onToggleTimestepAuto?: () => void;
     isOpenByDefault?: boolean;
+    timeStepFromLayer?: number;
 }
 declare const TimeStepButton: React.FC<TimeStepButtonProps>;
 export default TimeStepButton;

package/lib/components/TimeSlider/TimeSliderConnect.d.ts

@@ -1,34 +1,9 @@
 import * as React from 'react';
-import { mapActions } from '../../store';
+export declare const useUpdateTimestep: (mapId: string) => void;
 interface TimeSliderConnectProps {
     sourceId: string;
     mapId: string;
-    isTimeSliderHoverOn?: boolean;
-    isTimeSliderVisible?: boolean;
     isAlwaysVisible?: boolean;
-    toggleTimeSliderHover?: typeof mapActions.toggleTimeSliderHover;
-    toggleTimeSliderIsVisible?: typeof mapActions.toggleTimeSliderIsVisible;
-    activeWindowId?: string;
 }
-/**
- * TimeSlider component with components connected to the store displaying the time slider
- *
- * Expects the following props:
- * @param {string} mapId mapId: string - Id of the map
- * @param {string} sourceId sourceId: string - Source Id of the timeslider
- * @example
- * ``` <TimeSliderConnect sourceId="timeslider-1" mapId={mapId} />```
- */
-declare const TimeSliderConnect: import("react-redux").ConnectedComponent<React.FC<TimeSliderConnectProps>, {
-    sourceId: string;
-    mapId: string;
-    isAlwaysVisible?: boolean | undefined;
-    isTimeSliderHoverOn?: boolean | undefined;
-    isTimeSliderVisible?: boolean | undefined;
-    toggleTimeSliderHover?: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("../../store/mapStore/types").ToggleTimeSliderHoverPayload, string> | undefined;
-    toggleTimeSliderIsVisible?: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("../../store/mapStore/types").ToggleTimeSliderIsVisiblePayload, string> | undefined;
-    activeWindowId?: string | undefined;
-    context?: React.Context<import("react-redux").ReactReduxContextValue<any, import("redux").AnyAction>> | undefined;
-    store?: import("redux").Store<any, import("redux").AnyAction> | undefined;
-}>;
+declare const TimeSliderConnect: React.FC<TimeSliderConnectProps>;
 export default TimeSliderConnect;

package/lib/components/TimeSlider/TimeSliderCurrentTimeBox/TimeSliderCurrentTimeBox.d.ts

@@ -9,6 +9,7 @@ export interface TimeSliderCurrentTimeBoxProps {
     dataEndTime?: number;
     timeStep?: number;
     unfilteredSelectedTime: number;
+    isAutoUpdating?: boolean;
     setUnfilteredSelectedTime: (unfliteredSelectedTime: number) => void;
     onSetNewDate?: (newDate: string) => void;
 }

package/lib/components/TimeSlider/TimeSliderCurrentTimeBox/TimeSliderCurrentTimeBoxConnect.d.ts

@@ -11,6 +11,7 @@ interface TimeSliderCurrentTimeBoxConnectComponentProps {
     secondsPerPx?: number;
     scale?: Scale;
     isAnimating?: boolean;
+    isAutoUpdating?: boolean;
     unfilteredSelectedTime?: number;
     setTimeSliderUnfilteredSelectedTime?: typeof mapActions.setTimeSliderUnfilteredSelectedTime;
     stopMapAnimation?: typeof mapActions.mapStopAnimation;
@@ -26,6 +27,7 @@ declare const TimeSliderCurrentTimeBoxConnect: import("react-redux").ConnectedCo
     secondsPerPx?: number | undefined;
     scale?: Scale | undefined;
     isAnimating?: boolean | undefined;
+    isAutoUpdating?: boolean | undefined;
     unfilteredSelectedTime?: number | undefined;
     setTimeSliderUnfilteredSelectedTime?: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("../../../store/mapStore/types").SetTimeSliderUnfilteredSelectedTimePayload, string> | undefined;
     stopMapAnimation?: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("../../../store/mapStore/types").SetMapAnimationStopPayload, string> | undefined;

package/lib/components/TimeSlider/TimeSliderCurrentTimeBox/TimeSliderCurrentTimeBoxRenderFunctions.d.ts

@@ -1,3 +1,3 @@
 import { Theme } from '@mui/material';
 import { Scale } from '../../../store/mapStore/types';
-export declare const renderTimeSliderCurrentTimeBox: (ctx: CanvasRenderingContext2D, theme: Theme, width: number, height: number, centerTime: number, selected: number, secondsPerPx: number, scale: Scale) => void;
+export declare const renderTimeSliderCurrentTimeBox: (ctx: CanvasRenderingContext2D, theme: Theme, width: number, height: number, centerTime: number, selected: number, secondsPerPx: number, scale: Scale, isAutoUpdating: boolean) => void;

package/lib/components/TimeSlider/TimeSliderLegend/TimeSliderLegend.d.ts

@@ -16,7 +16,6 @@ export interface TimeSliderLegendProps {
     animationEndTime?: string;
     isTimeSliderHoverOn?: boolean;
     timeStep?: number;
-    mapIsActive?: boolean;
     unfilteredSelectedTime?: number;
     setUnfilteredSelectedTime: (unfliteredSelectedTime: number) => void;
     onSetNewDate?: (newDate: string) => void;

package/lib/components/TimeSlider/TimeSliderLegend/TimeSliderLegendConnect.d.ts

@@ -1,62 +1,7 @@
 import * as React from 'react';
-import { Dimension, Layer, Scale } from '../../../store/mapStore/types';
-import { mapActions, genericActions } from '../../../store';
 interface TimeSliderLegendConnectProps {
     sourceId?: string;
     mapId: string;
-    dimensions?: Dimension[];
-    scale?: Scale;
-    centerTime?: number;
-    secondsPerPx?: number;
-    dataScaleToSecondsPerPx?: number;
-    layers?: Layer[];
-    isAnimating?: boolean;
-    timeStep?: number;
-    isTimeSliderHoverOn?: boolean;
-    animationStartTime?: string;
-    animationEndTime?: string;
-    activeWindowId?: string;
-    unfilteredSelectedTime?: number;
-    setTimeSliderUnfilteredSelectedTime?: typeof mapActions.setTimeSliderUnfilteredSelectedTime;
-    stopMapAnimation?: typeof mapActions.mapStopAnimation;
-    setTime?: typeof genericActions.setTime;
-    mapSetTimeSliderCenterTime?: typeof mapActions.setTimeSliderCenterTime;
-    mapSetTimeSliderSecondsPerPx?: typeof mapActions.setTimeSliderSecondsPerPx;
-    setAnimationStartTime?: typeof mapActions.setAnimationStartTime;
-    setAnimationEndTime?: typeof mapActions.setAnimationEndTime;
 }
-declare const _default: import("react-redux").ConnectedComponent<React.FC<TimeSliderLegendConnectProps>, {
-    sourceId?: string | undefined;
-    mapId: string;
-    dimensions?: Dimension[] | undefined;
-    scale?: Scale | undefined;
-    centerTime?: number | undefined;
-    secondsPerPx?: number | undefined;
-    dataScaleToSecondsPerPx?: number | undefined;
-    layers?: Layer[] | undefined;
-    isAnimating?: boolean | undefined;
-    timeStep?: number | undefined;
-    isTimeSliderHoverOn?: boolean | undefined;
-    animationStartTime?: string | undefined;
-    animationEndTime?: string | undefined;
-    activeWindowId?: string | undefined;
-    unfilteredSelectedTime?: number | undefined;
-    setTimeSliderUnfilteredSelectedTime?: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("../../../store/mapStore/types").SetTimeSliderUnfilteredSelectedTimePayload, string> | undefined;
-    stopMapAnimation?: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("../../../store/mapStore/types").SetMapAnimationStopPayload, string> | undefined;
-    setTime?: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("../../../store/generic/types").SetTimePayload, string> | undefined;
-    mapSetTimeSliderCenterTime?: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("../../../store/mapStore/types").SetTimeSliderCenterTimePayload, string> | undefined;
-    mapSetTimeSliderSecondsPerPx?: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("../../../store/mapStore/types").SetTimeSliderSecondsPerPxPayload, string> | undefined;
-    setAnimationStartTime?: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("../../../store/mapStore/types").SetAnimationStartTimePayload, string> | undefined;
-    setAnimationEndTime?: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("../../../store/mapStore/types").SetAnimationEndTimePayload, string> | undefined;
-    context?: React.Context<import("react-redux").ReactReduxContextValue<any, import("redux").AnyAction>> | undefined;
-    store?: import("redux").Store<any, import("redux").AnyAction> | undefined;
-}>;
-/**
- * TimeSliderLegend component connected to the store displaying a legend of the time slider
- *
- * Expects the following props:
- * @param {string} mapId mapId: string - Id of the map
- * @example
- * ``` <TimeSliderLegendConnect mapId={mapId} />```
- */
-export default _default;
+declare const TimeSliderLegendConnect: React.FC<TimeSliderLegendConnectProps>;
+export default TimeSliderLegendConnect;

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

@@ -1,3 +1,3 @@
 export { default as TimeSlider } from './TimeSlider';
 export { default as TimeSliderConnect } from './TimeSliderConnect';
-export * as timeSliderUtils from './TimeSliderUtils';
+export * as timeSliderUtils from './timeSliderUtils';

package/lib/components/TimeSlider/{TimeSliderUtils.d.ts → timeSliderUtils.d.ts}

@@ -118,6 +118,12 @@ export declare enum TimeInMinutes {
     YEAR = 525600,
     MONTH = 43800,
     DAY = 1440,
-    HOUR = 60
+    HOUR = 60,
+    MINUTE = 1
 }
+/**
+ *
+ * @param minutes
+ * @returns the two highest values in the format yr(s) mo(s) d h m
+ */
 export declare const minutesToDescribedDuration: (minutes: number) => string;

package/lib/index.d.ts

@@ -7,7 +7,7 @@ import { reducer as layerReducer } from './store/mapStore/layers/reducer';
 import synchronizationGroupConfig from './store/generic/config';
 import * as SyncGroups from './store/generic/synchronizationGroups';
 import coreModuleConfig from './store/coreModuleConfig';
-import { LayerManagerConnect, LayerSelectConnect, LayerManagerMapButtonConnect, DockedLayerManagerConnect } from './components/LayerManager';
+import { LayerManagerConnect, LayerSelectConnect, LayerManagerMapButtonConnect, DockedLayerManagerConnect, LayerManager } from './components/LayerManager';
 import { MultiDimensionSelectMapButtonsConnect, MultiMapDimensionSelectConnect } from './components/MultiMapDimensionSelect';
 export * from './hooks';
 export * from './components/MultiMapView/MultiMapViewConnect';
@@ -83,7 +83,7 @@ export { SyncGroups };
 export { store } from './storybookUtils/store';
 export * from './types/types';
 export { coreModuleConfig };
-export { LayerManagerConnect, LayerSelectConnect, LayerManagerMapButtonConnect, DockedLayerManagerConnect, };
+export { LayerManagerConnect, LayerSelectConnect, LayerManagerMapButtonConnect, DockedLayerManagerConnect, LayerManager, };
 export { MultiDimensionSelectMapButtonsConnect, MultiMapDimensionSelectConnect, };
 export * as publicLayers from './utils/publicLayers';
 export * as publicServices from './utils/publicServices';

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

@@ -9,7 +9,7 @@ import { LayerState, Layer, LayerStatus } from './types';
  * @param {string} layerId Id of the layer
  * @returns {object} object containing layer information (service, name, style, enabled etc.)
  */
-export declare const getLayerById: (store: AppStore, layerId: string) => Layer;
+export declare const getLayerById: (store: AppStore, layerId?: string | undefined) => Layer | undefined;
 /**
  * Retrieves all layers indexed by layerId
  *
@@ -159,7 +159,7 @@ export declare const getLayerDimensions: ((state: {
     services?: import("../types").ServiceState | undefined;
     layers?: LayerState | undefined;
     layerSelect?: import("../../layerSelect/types").LayerSelectStoreType | undefined;
-}, params_0: string) => Dimension[]) & import("reselect").OutputSelectorFields<((args_0: Layer) => Dimension[]) & {
+}, params_0?: string | undefined) => Dimension[]) & import("reselect").OutputSelectorFields<((args_0: Layer | undefined) => Dimension[]) & {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -179,7 +179,7 @@ export declare const getLayerNonTimeDimensions: ((state: {
     services?: import("../types").ServiceState | undefined;
     layers?: LayerState | undefined;
     layerSelect?: import("../../layerSelect/types").LayerSelectStoreType | undefined;
-}, params_0: string) => Dimension[]) & import("reselect").OutputSelectorFields<((args_0: Dimension[]) => Dimension[]) & {
+}, params_0?: string | undefined) => Dimension[]) & import("reselect").OutputSelectorFields<((args_0: Dimension[]) => Dimension[]) & {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -199,7 +199,7 @@ export declare const getLayerTimeDimension: ((state: {
     services?: import("../types").ServiceState | undefined;
     layers?: LayerState | undefined;
     layerSelect?: import("../../layerSelect/types").LayerSelectStoreType | undefined;
-}, params_0: string) => Dimension | undefined) & import("reselect").OutputSelectorFields<((args_0: Dimension[]) => Dimension | undefined) & {
+}, params_0?: string | undefined) => Dimension | undefined) & import("reselect").OutputSelectorFields<((args_0: Dimension[]) => Dimension | undefined) & {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -240,7 +240,7 @@ export declare const getLayerOpacity: ((state: {
     services?: import("../types").ServiceState | undefined;
     layers?: LayerState | undefined;
     layerSelect?: import("../../layerSelect/types").LayerSelectStoreType | undefined;
-}, params_0: string) => number) & import("reselect").OutputSelectorFields<(args_0: Layer) => number & {
+}, params_0?: string | undefined) => number) & import("reselect").OutputSelectorFields<(args_0: Layer | undefined) => number & {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -260,7 +260,7 @@ export declare const getLayerEnabled: ((state: {
     services?: import("../types").ServiceState | undefined;
     layers?: LayerState | undefined;
     layerSelect?: import("../../layerSelect/types").LayerSelectStoreType | undefined;
-}, params_0: string) => boolean) & import("reselect").OutputSelectorFields<(args_0: Layer) => boolean & {
+}, params_0?: string | undefined) => boolean) & import("reselect").OutputSelectorFields<(args_0: Layer | undefined) => boolean & {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -280,7 +280,7 @@ export declare const getLayerName: ((state: {
     services?: import("../types").ServiceState | undefined;
     layers?: LayerState | undefined;
     layerSelect?: import("../../layerSelect/types").LayerSelectStoreType | undefined;
-}, params_0: string) => string) & import("reselect").OutputSelectorFields<(args_0: Layer) => string & {
+}, params_0?: string | undefined) => string) & import("reselect").OutputSelectorFields<(args_0: Layer | undefined) => string & {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -300,7 +300,7 @@ export declare const getLayerService: ((state: {
     services?: import("../types").ServiceState | undefined;
     layers?: LayerState | undefined;
     layerSelect?: import("../../layerSelect/types").LayerSelectStoreType | undefined;
-}, params_0: string) => string) & import("reselect").OutputSelectorFields<(args_0: Layer) => string & {
+}, params_0?: string | undefined) => string) & import("reselect").OutputSelectorFields<(args_0: Layer | undefined) => string & {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -320,7 +320,7 @@ export declare const getLayerStyle: ((state: {
     services?: import("../types").ServiceState | undefined;
     layers?: LayerState | undefined;
     layerSelect?: import("../../layerSelect/types").LayerSelectStoreType | undefined;
-}, params_0: string) => string) & import("reselect").OutputSelectorFields<(args_0: Layer) => string & {
+}, params_0?: string | undefined) => string) & import("reselect").OutputSelectorFields<(args_0: Layer | undefined) => string & {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -340,7 +340,7 @@ export declare const getLayerStatus: ((state: {
     services?: import("../types").ServiceState | undefined;
     layers?: LayerState | undefined;
     layerSelect?: import("../../layerSelect/types").LayerSelectStoreType | undefined;
-}, params_0: string) => LayerStatus) & import("reselect").OutputSelectorFields<(args_0: Layer) => LayerStatus & {
+}, params_0?: string | undefined) => LayerStatus) & import("reselect").OutputSelectorFields<(args_0: Layer | undefined) => LayerStatus & {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -380,7 +380,7 @@ export declare const getSelectedFeatureIndex: ((state: {
     services?: import("../types").ServiceState | undefined;
     layers?: LayerState | undefined;
     layerSelect?: import("../../layerSelect/types").LayerSelectStoreType | undefined;
-}, params_0: string) => number | undefined) & import("reselect").OutputSelectorFields<(args_0: Layer) => number & {
+}, params_0?: string | undefined) => number | undefined) & import("reselect").OutputSelectorFields<(args_0: Layer | undefined) => number & {
     clearCache: () => void;
 }> & {
     clearCache: () => void;

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

@@ -1,5 +1,4 @@
 import { Action } from '@reduxjs/toolkit';
-import { Style } from '@opengeoweb/webmap';
 import { FeatureCollection } from 'geojson';
 import type { Dimension, UpdateAllMapDimensionsPayload } from '../map/types';
 import type { SetLayersForServicePayload } from '../types';
@@ -53,7 +52,6 @@ export interface ReduxLayer {
  * Layer is used to define a layer with all its possible properties.
  */
 export interface Layer extends ReduxLayer {
-    styles?: Style[];
     headers?: Headers[];
 }
 export interface AvailableBaseLayersType {

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

@@ -164,7 +164,7 @@ export interface SetTimeSliderScalePayload {
 }
 export interface SetTimeStepPayload {
     mapId: string;
-    timeStep: number;
+    timeStep?: number;
     origin?: MapActionOrigin;
 }
 export interface SetAnimationDelayPayload {

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

@@ -63,5 +63,5 @@ export declare const produceDraftStateSetMapDimensionFromLayerChangeDimension: (
  */
 export declare function moveArrayElements(array: string[], oldIndex: number, newIndex: number): string[];
 export declare const getTimeStepFromDataInterval: (timeInterval: TimeInterval) => number;
-export declare const getActiveLayerTimeStep: (timeDimension: Dimension | undefined) => number | null;
+export declare const getActiveLayerTimeStep: (timeDimension: Dimension | undefined) => number | undefined;
 export {};

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

@@ -1,5 +1,5 @@
 import { Style } from '@opengeoweb/webmap';
-import { ServiceState, ServiceLayer, ReduxService } from './types';
+import { ServiceState, ReduxService } from './types';
 /**
  * Retrieves all serviceIds
  *
@@ -72,7 +72,7 @@ export declare const getLayersFromService: ((state: {
     services?: ServiceState | undefined;
     layers?: import("../types").LayerState | undefined;
     layerSelect?: import("../../layerSelect/types").LayerSelectStoreType | undefined;
-}, params_0: string) => ServiceLayer[]) & import("reselect").OutputSelectorFields<((args_0: ReduxService) => ServiceLayer[]) & {
+}, params_0: string) => import("@opengeoweb/webmap").LayerProps[]) & import("reselect").OutputSelectorFields<((args_0: ReduxService) => import("@opengeoweb/webmap").LayerProps[]) & {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -93,7 +93,7 @@ export declare const getLayerFromService: ((state: {
     services?: ServiceState | undefined;
     layers?: import("../types").LayerState | undefined;
     layerSelect?: import("../../layerSelect/types").LayerSelectStoreType | undefined;
-}, params_0: string, params_1: string) => ServiceLayer) & import("reselect").OutputSelectorFields<((args_0: ServiceLayer[], args_1: string, args_2: string) => ServiceLayer) & {
+}, params_0: string, params_1: string) => import("@opengeoweb/webmap").LayerProps) & import("reselect").OutputSelectorFields<((args_0: import("@opengeoweb/webmap").LayerProps[], args_1: string, args_2: string) => import("@opengeoweb/webmap").LayerProps) & {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -114,7 +114,7 @@ export declare const getLayerStyles: ((state: {
     services?: ServiceState | undefined;
     layers?: import("../types").LayerState | undefined;
     layerSelect?: import("../../layerSelect/types").LayerSelectStoreType | undefined;
-}, params_0: string, params_1: string) => Style[]) & import("reselect").OutputSelectorFields<((args_0: ServiceLayer) => Style[]) & {
+}, params_0: string, params_1: string) => Style[]) & import("reselect").OutputSelectorFields<((args_0: import("@opengeoweb/webmap").LayerProps) => Style[]) & {
     clearCache: () => void;
 }> & {
     clearCache: () => void;

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

@@ -1,4 +1,4 @@
-import { Dimension, GeographicBoundingBox, Style } from '@opengeoweb/webmap';
+import { LayerProps } from '@opengeoweb/webmap';
 export interface Services {
     [key: string]: ReduxService;
 }
@@ -13,17 +13,7 @@ export interface ReduxService {
 /**
  * Used in the services object of webmap to keep a list of available layers in the service
  */
-export interface ServiceLayer {
-    name: string;
-    text: string;
-    leaf: boolean;
-    path: string[];
-    abstract?: string;
-    keywords?: string[];
-    styles?: Style[];
-    dimensions?: Dimension[];
-    geographicBoundingBox?: GeographicBoundingBox;
-}
+export declare type ServiceLayer = LayerProps;
 export interface ServiceState {
     byId: Services;
     allIds: string[];

package/lib/utils/__mocks__/getCapabilities.d.ts

@@ -1,5 +1,5 @@
+import { LayerTree } from '@opengeoweb/webmap';
 import { ServiceLayer } from '../../store/mapStore/types';
-import { LayerTree } from '../getCapabilities';
 export declare const MOCK_URL_WITH_CHILDREN = "https://mockUrlWithChildren.nl";
 export declare const MOCK_URL_NO_CHILDREN = "https://mockUrlNoChildren.nl";
 export declare const MOCK_URL_WITH_NO_TITLE = "https://mockUrlWithNoTitle.nl";

package/lib/utils/defaultTestSettings.d.ts

@@ -19,7 +19,27 @@ export declare const defaultReduxLayerRadarColor: {
     }[];
     id: string;
 };
-export declare const defaultReduxLayerRadarKNMI: Layer;
+export declare const defaultReduxLayerRadarKNMI: {
+    service: string;
+    name: string;
+    title: string;
+    format: string;
+    style: string;
+    enabled: boolean;
+    layerType: LayerType;
+    dimensions: {
+        name: string;
+        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 styleListForRADNL25PCPCMLayer: Style[];

package/lib/utils/getCapabilities.d.ts

@@ -1,20 +1,4 @@
-import { Dimension, GeographicBoundingBox, Style } from '@opengeoweb/webmap';
-/**
- * Represents the layers as advertised in the WMS GetCapabilities document
- */
-export interface LayerTree {
-    leaf: boolean;
-    name: string | null;
-    path: string | string[];
-    title: string;
-    children: LayerTree[];
-    keywords?: string[];
-    abstract?: string;
-    text?: string;
-    styles?: Style[];
-    dimensions?: Dimension[];
-    geographicBoundingBox?: GeographicBoundingBox;
-}
+import { LayerTree } from '@opengeoweb/webmap';
 /**
  * Converts webmapjs node structure to LayerTree
  * @param nodesToRecur THe WebMapJS node structure from service.getNodes();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/core",
-  "version": "4.8.0",
+  "version": "4.10.0",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -13,14 +13,14 @@
   "dependencies": {},
   "peerDependencies": {
     "react": "^17.0.2",
-    "@opengeoweb/shared": "4.8.0",
+    "@opengeoweb/shared": "4.10.0",
     "@mui/material": "^5.10.8",
-    "@opengeoweb/theme": "4.8.0",
+    "@opengeoweb/theme": "4.10.0",
     "react-draggable": "^4.4.5",
     "re-resizable": "^6.9.0",
     "@redux-eggs/core": "^2.2.0",
     "react-redux": "^8.0.4",
-    "@opengeoweb/form-fields": "4.8.0",
+    "@opengeoweb/form-fields": "4.10.0",
     "react-hook-form": "^7.41.5",
     "moment": "^2.29.0",
     "moment-timezone": "^0.5.31",
@@ -28,15 +28,15 @@
     "lodash": "^4.17.20",
     "axios": "^0.25.0",
     "date-fns": "^2.29.3",
-    "@opengeoweb/webmap": "4.8.0",
+    "@opengeoweb/webmap": "4.10.0",
     "throttle-debounce": "^3.0.1",
     "proj4": "^2.6.2",
-    "@opengeoweb/api": "4.8.0",
+    "@opengeoweb/api": "4.10.0",
     "react-intl": "^5.17.5",
     "react-sortablejs": "^6.1.4",
     "sortablejs": "^1.15.0",
-    "react-window": "^1.8.7",
     "immer": "^9.0.15",
+    "react-window": "^1.8.7",
     "@reduxjs/toolkit": "^1.8.3",
     "lodash.clonedeep": "^4.5.0",
     "@turf/turf": "^5.1.6",