@opengeoweb/core 5.1.1 → 5.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/core",
-  "version": "5.1.1",
+  "version": "5.2.1",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -15,11 +15,11 @@
   "peerDependencies": {
     "@mui/material": "5.12.0",
     "@mui/system": "5.12.0",
-    "@opengeoweb/api": "5.1.1",
-    "@opengeoweb/form-fields": "5.1.1",
-    "@opengeoweb/shared": "5.1.1",
-    "@opengeoweb/theme": "5.1.1",
-    "@opengeoweb/webmap": "5.1.1",
+    "@opengeoweb/api": "5.2.1",
+    "@opengeoweb/form-fields": "5.2.1",
+    "@opengeoweb/shared": "5.2.1",
+    "@opengeoweb/theme": "5.2.1",
+    "@opengeoweb/webmap": "5.2.1",
     "@redux-eggs/core": "2.2.0",
     "@redux-eggs/redux-toolkit": "2.2.0",
     "@redux-eggs/saga-extension": "2.2.0",
@@ -36,7 +36,7 @@
     "re-resizable": "6.9.9",
     "react": "18.2.0",
     "react-draggable": "4.4.5",
-    "react-hook-form": "7.41.5",
+    "react-hook-form": "7.45.2",
     "react-intl": "6.4.4",
     "react-redux": "8.1.1",
     "react-resize-detector": "9.1.0",

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

@@ -1,9 +1,8 @@
 import * as React from 'react';
-import { Service } from '../../WMSLoader/services';
-import { layerTypes } from '../../../store';
+import { layerSelectTypes, layerTypes } from '../../../store';
 interface AddLayerButtonProps {
-    onRenderTree?: (service: Service) => React.ReactChild;
-    preloadedServices?: Service[];
+    onRenderTree?: (service: layerSelectTypes.LayerSelectService) => React.ReactChild;
+    preloadedServices?: layerSelectTypes.LayerSelectService[];
     tooltip?: string;
     layerType?: layerTypes.LayerType;
     shouldFocus?: boolean;

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

@@ -1,9 +1,8 @@
 import * as React from 'react';
-import { layerTypes } from '../../../store';
-import { Service } from '../../WMSLoader/services';
+import { layerSelectTypes, layerTypes } from '../../../store';
 interface AddLayerPopupProps {
-    onRenderTree?: (service: Service) => React.ReactChild;
-    preloadedServices?: Service[];
+    onRenderTree?: (service: layerSelectTypes.LayerSelectService) => React.ReactChild;
+    preloadedServices?: layerSelectTypes.LayerSelectService[];
     open?: boolean;
     handleClose?: () => void;
     layerType?: layerTypes.LayerType;

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

@@ -1,11 +1,10 @@
 import * as React from 'react';
 import { LayerManagerCustomSettings } from '../LayerManagerUtils';
-import { layerTypes } from '../../../store';
-import { Service } from '../../WMSLoader/services';
+import { layerSelectTypes, layerTypes } from '../../../store';
 interface BaseLayerRowProps {
     mapId: string;
     preloadedAvailableBaseLayers?: layerTypes.Layer[];
-    preloadedServices?: Service[];
+    preloadedServices?: layerSelectTypes.LayerSelectService[];
     tooltip?: string;
     settings?: LayerManagerCustomSettings['footer'];
 }

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

@@ -1,8 +1,7 @@
 import * as React from 'react';
 import { HeaderSize } from '@opengeoweb/shared';
 import { layerTypes } from '../../store';
-import type { uiTypes } from '../../store';
-import { Service } from '../WMSLoader/services';
+import type { layerSelectTypes, uiTypes } from '../../store';
 import { LayerManagerCustomSettings } from './LayerManagerUtils';
 import { Size } from './LayerManagerHeaderOptions';
 export declare type Position = {
@@ -13,7 +12,7 @@ export declare type Position = {
 interface LayerManagerProps {
     mapId: string;
     preloadedAvailableBaseLayers?: layerTypes.Layer[];
-    preloadedBaseServices?: Service[];
+    preloadedBaseServices?: layerSelectTypes.LayerSelectService[];
     bounds?: string;
     title?: string;
     onClose: () => void;

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

@@ -1,12 +1,11 @@
 import * as React from 'react';
-import { layerTypes, uiTypes } from '../../store';
-import { Service } from '../WMSLoader/services';
+import { layerTypes, uiTypes, layerSelectTypes } from '../../store';
 export declare const getDialogType: (mapId: any, isMultiMap: boolean, isDocked: boolean) => string;
 interface LayerManagerConnectProps {
     mapId?: string;
     preloadedAvailableBaseLayers?: layerTypes.Layer[];
-    preloadedMapServices?: Service[];
-    preloadedBaseServices?: Service[];
+    preloadedMapServices?: layerSelectTypes.LayerSelectService[];
+    preloadedBaseServices?: layerSelectTypes.LayerSelectService[];
     bounds?: string;
     title?: string;
     showMapIdInTitle?: boolean;
@@ -21,8 +20,8 @@ interface LayerManagerConnectProps {
  * a dialog should have the <LayerManagerMapButtonConnect/> which is used to focus the correct map and open the dialog
  *
  * Expects the following props:
- * @param {Service[]} preloadedMapServices preloadedMapServices: array of Service objects - contains an array of Service objects that are preloaded into in the WMS Loader for maplayers
- * @param {Service[]} preloadedBaseServices preloadedBaseServices: array of Service objects - contains an array of Service objects that are preloaded into in the WMS Loader fpr baselayers
+ * @param {layerSelectTypes.LayerSelectService[]} preloadedMapServices preloadedMapServices: array of Service objects - contains an array of Service objects that are preloaded into in the WMS Loader for maplayers
+ * @param {layerSelectTypes.LayerSelectService[]} preloadedBaseServices preloadedBaseServices: array of Service objects - contains an array of Service objects that are preloaded into in the WMS Loader fpr baselayers
  * @param {Layer[]} preloadedAvailableBaseLayers preloadedAvailableBaseLayers: array of Layer objects - contains an array of Layer objects (consisting solely of type baseLayer) that are available to be shown as basemaps
  * ``` <LayerManagerConnect />```
  */

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

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

package/src/lib/components/Legend/LegendConnect.d.ts

@@ -1,6 +1,5 @@
 import * as React from 'react';
 import { uiTypes } from '../../store';
-export declare const IS_LEGEND_OPEN_BY_DEFAULT = false;
 interface LegendConnectProps {
     showMapId?: boolean;
     source?: uiTypes.Source;

package/src/lib/components/MapDraw/MapDrawTool.stories.d.ts

@@ -1,12 +1,6 @@
 import React from 'react';
-import { MapDrawToolOptions } from './useMapDrawTool';
 declare const _default: {
     title: string;
 };
 export default _default;
-export declare const MapDrawToolDemo: () => React.ReactElement;
-interface MapDrawToolIntersectDemoProps {
-    mapDrawOptions: MapDrawToolOptions;
-}
-export declare const MapDrawToolIntersectDemo: React.FC<MapDrawToolIntersectDemoProps>;
-export declare const MapDrawToolIntersectWithShapeDemo: () => React.ReactElement;
+export declare const SimpleMapdrawtool: () => React.ReactElement;

package/src/lib/components/MapDraw/MapDrawToolDoubleControls.stories.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+declare const _default: {
+    title: string;
+};
+export default _default;
+export declare const DoubleMapControlsDemo: () => React.ReactElement;

package/src/lib/components/MapDraw/MapDrawToolIntersection.stories.d.ts

@@ -0,0 +1,11 @@
+import React from 'react';
+import { MapDrawToolOptions } from './useMapDrawTool';
+declare const _default: {
+    title: string;
+};
+export default _default;
+interface MapDrawToolIntersectDemoProps {
+    mapDrawOptions: MapDrawToolOptions;
+}
+export declare const IntersectionDemo: React.FC<MapDrawToolIntersectDemoProps>;
+export declare const IntersectionWithShapeDemo: () => React.ReactElement;

package/src/lib/components/MapDraw/mapDrawUtils.d.ts

@@ -53,4 +53,5 @@ export declare const intersectGeoJSONS: (a: GeoJSON.FeatureCollection, b: GeoJSO
 export declare const createInterSections: (geojson: GeoJSON.FeatureCollection, otherGeoJSON: GeoJSON.FeatureCollection, geoJSONproperties?: GeoJSON.GeoJsonProperties) => GeoJSON.FeatureCollection;
 export declare const getGeoJson: (geojson: GeoJSON.FeatureCollection, shouldAllowMultipleshapes: boolean) => GeoJSON.FeatureCollection;
 export declare const getFeatureCollection: (geoJSONFeature: GeoJSON.Feature | GeoJSON.FeatureCollection, shouldAllowMultipleshapes: boolean, geoJSONFeatureCollection?: GeoJSON.FeatureCollection) => GeoJSON.FeatureCollection;
+export declare const isGeoJSONFeatureCreatedByTool: (existingJSON: GeoJSON.FeatureCollection, newGeoJSON: GeoJSON.Feature | GeoJSON.FeatureCollection) => boolean;
 export {};

package/src/lib/components/MapDraw/storyComponents/GeoJSONTextField.d.ts

@@ -1,8 +1,11 @@
 import React from 'react';
+import { SxProps } from '@mui/material';
 interface GeoJSONTextFieldProps {
     geoJSON: GeoJSON.FeatureCollection;
     onChangeGeoJSON?: (geoJSON: GeoJSON.FeatureCollection) => void;
     title?: string;
+    sx?: SxProps;
+    maxRows?: number;
 }
 declare const GeoJSONTextField: React.FC<GeoJSONTextFieldProps>;
 export default GeoJSONTextField;

package/src/lib/components/MapDraw/useMapDrawTool.d.ts

@@ -6,6 +6,7 @@ export declare const defaultIntersectionStyleProperties: GeoJSON.GeoJsonProperti
 export declare const emptyLineString: GeoJSON.Feature;
 export declare const emptyPoint: GeoJSON.Feature;
 export declare const emptyPolygon: GeoJSON.Feature;
+export declare const emptyBox: GeoJSON.Feature;
 export declare const emptyIntersectionShape: GeoJSON.FeatureCollection;
 export declare type DrawMode = DRAWMODE | 'DELETE' | '';
 declare type DrawLayerType = 'geoJSON' | 'geoJSONIntersection' | 'geoJSONIntersectionBounds';
@@ -26,7 +27,6 @@ interface MapDrawToolProps {
     editModes: EditMode[];
     changeDrawMode: (mode: DrawMode) => void;
     isInEditMode: boolean;
-    drawMode: string;
     setEditMode: (shouldEnable: boolean) => void;
     featureLayerIndex: number;
     setFeatureLayerIndex: (newIndex: number) => void;
@@ -35,15 +35,16 @@ interface MapDrawToolProps {
     setActiveTool: (newToolId: string) => void;
     layers: MapViewLayerProps[];
     getLayer: (layerType: DrawLayerType, layerId: string) => MapViewLayerProps;
+    deactivateTool: () => void;
+    setEditModes: (editModes: EditMode[]) => void;
 }
 export interface MapDrawToolOptions {
-    editModes?: EditMode[];
     shouldAllowMultipleshapes?: boolean;
+    defaultEditModes?: EditMode[];
     defaultGeoJSON?: GeoJSON.FeatureCollection;
     defaultGeoJSONIntersection?: GeoJSON.FeatureCollection;
     defaultGeoJSONIntersectionBounds?: GeoJSON.FeatureCollection;
     defaultGeoJSONIntersectionProperties?: GeoJSON.GeoJsonProperties;
-    defaultActiveTool?: string;
 }
 export declare const defaultPoint: {
     id: string;
@@ -100,5 +101,5 @@ export declare const defaultModes: ({
     shape: import("geojson").FeatureCollection<import("geojson").Geometry, import("geojson").GeoJsonProperties>;
     isSelectable: boolean;
 })[];
-export declare const useMapDrawTool: ({ editModes, shouldAllowMultipleshapes, defaultGeoJSON, defaultGeoJSONIntersection, defaultGeoJSONIntersectionBounds, defaultGeoJSONIntersectionProperties, defaultActiveTool, }: MapDrawToolOptions) => MapDrawToolProps;
+export declare const useMapDrawTool: ({ defaultEditModes, shouldAllowMultipleshapes, defaultGeoJSON, defaultGeoJSONIntersection, defaultGeoJSONIntersectionBounds, defaultGeoJSONIntersectionProperties, }: MapDrawToolOptions) => MapDrawToolProps;
 export {};

package/src/lib/components/SyncGroups/SyncGroupList.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { GroupsAndSources } from './types';
+import { syncGroupsTypes } from '../../store';
 interface SyncGroupProps {
-    viewStateData: GroupsAndSources;
+    viewStateData: syncGroupsTypes.GroupsAndSources;
     title: string;
     handleToggle: (arg1: string, arg2?: string) => void;
     addNewGroup: (number: string) => void;

package/src/lib/components/SyncGroups/SyncGroupViewer.d.ts

@@ -1,10 +1,9 @@
 import * as React from 'react';
-import { SyncGroupViewState } from './types';
 import { syncGroupsTypes } from '../../store';
 interface SyncGroupViewerProps {
     onClose: () => void;
     isOpen: boolean;
-    syncGroupViewState: SyncGroupViewState;
+    syncGroupViewState: syncGroupsTypes.SyncGroupViewState;
     syncGroupAddTarget: (payload: syncGroupsTypes.SyncGroupAddTargetPayload) => void;
     syncGroupRemoveTarget: (payload: syncGroupsTypes.SyncGroupRemoveTargetPayload) => void;
     syncGroupAddGroup: (payload: syncGroupsTypes.SyncGroupAddGroupPayload) => void;

package/src/lib/components/WMSLoader/WMSLayerTree/WMSLayerTree.d.ts

@@ -1,8 +1,7 @@
 import * as React from 'react';
-import { Service } from '../services';
-import { layerTypes } from '../../../store';
+import { layerSelectTypes, layerTypes } from '../../../store';
 interface WMSLayerTreeProps {
-    service: Service;
+    service: layerSelectTypes.LayerSelectService;
     onClickLayer: (serviceURL: string, layerName: string) => void;
     highlightedLayers: layerTypes.Layer[];
 }

package/src/lib/components/WMSLoader/WMSLayerTree/WMSLayerTreeConnect.d.ts

@@ -1,8 +1,7 @@
 import React from 'react';
-import { layerActions, layerTypes } from '../../../store';
-import { Service } from '../services';
+import { layerActions, layerTypes, layerSelectTypes } from '../../../store';
 export interface WMSLayerTreeConnectProps {
-    service: Service;
+    service: layerSelectTypes.LayerSelectService;
     addLayer?: typeof layerActions.addLayer;
     setBaseLayers?: typeof layerActions.setBaseLayers;
     addAvailableBaseLayer?: typeof layerActions.addAvailableBaseLayer;
@@ -11,7 +10,7 @@ export interface WMSLayerTreeConnectProps {
     layerType?: layerTypes.LayerType;
 }
 declare const WMSLayerTreeConnect: import("react-redux").ConnectedComponent<React.FC<WMSLayerTreeConnectProps>, {
-    service: Service;
+    service: layerSelectTypes.LayerSelectService;
     mapId: string;
     layerType?: layerTypes.LayerType | undefined;
     addLayer?: import("@reduxjs/toolkit").ActionCreatorWithPayload<layerTypes.AddLayerPayload, "layerReducer/addLayer"> | undefined;

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

@@ -1,10 +1,10 @@
 import * as React from 'react';
-import { Service } from './services';
+import { layerSelectTypes } from '../../store';
 interface WMSLoaderProps {
     onClickService?: (serviceURL: string, layerName: string) => void;
-    onRenderTree?: (service: Service) => React.ReactChild;
+    onRenderTree?: (service: layerSelectTypes.LayerSelectService) => React.ReactChild;
     highlightedLayers?: [];
-    preloadedServices?: Service[];
+    preloadedServices?: layerSelectTypes.LayerSelectService[];
     tooltip?: string;
 }
 declare const WMSLoader: React.FC<WMSLoaderProps>;

package/src/lib/components/WMSLoader/WMSLoaderConnect.d.ts

@@ -1,9 +1,8 @@
 import * as React from 'react';
-import { Service } from './services';
-import { layerTypes } from '../../store';
+import { layerSelectTypes, layerTypes } from '../../store';
 interface WMSLoaderConnectProps {
     mapId: string;
-    preloadedServices?: Service[];
+    preloadedServices?: layerSelectTypes.LayerSelectService[];
     layerType?: layerTypes.LayerType;
     tooltip?: string;
 }
@@ -13,7 +12,7 @@ interface WMSLoaderConnectProps {
  *
  * Expects the following props:
  * @param {string} mapId mapId: string - Id of the map
- * @param {Service[]} [preloadedServices] **optional** preloadedServices: array of Service objects - contains an array of Service objects that are to be loaded as preconfigured WMS services
+ * @param {ServiceRefactorMe[]} [preloadedServices] **optional** preloadedServices: array of Service objects - contains an array of Service objects that are to be loaded as preconfigured WMS services
  * @example
  * ``` <WMSLoaderConnect mapId="mapid_1" preloadedServices = {preloadedServicesList} /> ```
  */

package/src/lib/components/WMSLoader/WMSServerList/WMSServerList.d.ts

@@ -1,9 +1,9 @@
 import * as React from 'react';
-import { Service } from '../services';
+import { layerSelectTypes } from '../../../store';
 interface WMSServerListProps {
-    availableServices: Service[];
-    handleChangeService: (service: Service) => void;
-    service: Service;
+    availableServices: layerSelectTypes.LayerSelectService[];
+    handleChangeService: (service: layerSelectTypes.LayerSelectService) => void;
+    service: layerSelectTypes.LayerSelectService;
 }
 declare const WMSServerList: React.FC<WMSServerListProps>;
 export default WMSServerList;

package/src/lib/index.d.ts

@@ -97,7 +97,7 @@ export * from './store/mapStore/utils/helpers';
 export { SyncGroupViewerConnect } from './components/SyncGroups/SyncGroupViewerConnect';
 export { SyncGroups };
 export { store } from './storybookUtils/store';
-export * from './types/types';
+export * from './store/types';
 export { coreModuleConfig };
 export { LayerManagerConnect, LayerManagerHeaderOptions, LayerManagerDescriptionRow, LayerManagerBaseLayerRow, LayerManagerLayerContainerRow, LayerSelectConnect, LayerManagerMapButtonConnect, LayerManager, useFetchServices, };
 export { MultiDimensionSelectMapButtonsConnect, MultiMapDimensionSelectConnect, };
@@ -105,7 +105,7 @@ export * as publicLayers from './utils/publicLayers';
 export * as publicServices from './utils/publicServices';
 export * as testLayers from './utils/testLayers';
 export * from './utils/jsonPresetFilter';
-export * from './utils/types';
+export * from './store/layerSelect/types';
 export * as defaultConfigurations from './utils/defaultConfigurations';
 export * from './components/Providers/Providers';
 export * from './components/Snackbar';

package/src/lib/store/coreModuleConfig.d.ts

@@ -1,2 +1,2 @@
-declare const coreModuleConfig: (import("@redux-eggs/core").Egg<import("redux").Store<import("./mapStore").WebMapStateModuleState, import("redux").AnyAction>> | import("@redux-eggs/core").Egg<import("redux").Store<import("./generic/synchronizationGroups/types").SynchronizationGroupModuleState, import("redux").AnyAction>> | import("@redux-eggs/core").Egg<import("redux").Store<import("./ui/types").UIModuleState, import("redux").AnyAction>> | import("@redux-eggs/core").Egg<import("redux").Store<import("./layerSelect/types").LayerSelectModuleState, import("redux").AnyAction>> | import("@redux-eggs/core").Egg<import("redux").Store<import("./snackbar/types").SnackbarModuleStore, import("redux").AnyAction>>)[];
+declare const coreModuleConfig: (import("@redux-eggs/core").Egg<import("redux").Store<import("./mapStore").WebMapStateModuleState, import("redux").AnyAction>> | import("@redux-eggs/core").Egg<import("redux").Store<import("./generic/synchronizationGroups/types").SynchronizationGroupModuleState, import("redux").AnyAction>> | import("@redux-eggs/core").Egg<import("redux").Store<import("./ui/types").UIModuleState, import("redux").AnyAction>> | import("@redux-eggs/core").Egg<import("redux").Store<import("..").LayerSelectModuleState, import("redux").AnyAction>> | import("@redux-eggs/core").Egg<import("redux").Store<import("./snackbar/types").SnackbarModuleStore, import("redux").AnyAction>>)[];
 export default coreModuleConfig;

package/src/lib/store/generic/selectors.d.ts

@@ -5,7 +5,7 @@ export declare const getSynchronizationGroupStore: ((state: {
     webmap?: import("../mapStore/types").WebMapState | undefined;
     services?: import("../mapStore/types").ServiceState | undefined;
     layers?: import("../mapStore/types").LayerState | undefined;
-    layerSelect?: import("../layerSelect/types").LayerSelectStoreType | undefined;
+    layerSelect?: import("../..").LayerSelectStoreType | undefined;
 }) => SynchronizationGroupState) & import("reselect").OutputSelectorFields<(args_0: SynchronizationGroupState) => SynchronizationGroupState, {
     clearCache: () => void;
 }> & {
@@ -14,7 +14,7 @@ export declare const getSynchronizationGroupStore: ((state: {
 export declare const getTime: ((state: {
     sources: import("./synchronizationGroups/types").SynchronizationSources;
     groups: import("./synchronizationGroups/types").SynchronizationGroups;
-    viewState: import("../../components/SyncGroups/types").SyncGroupViewState;
+    viewState: import("./synchronizationGroups/types").SyncGroupViewState;
 }, params_0: string) => string | null) & import("reselect").OutputSelectorFields<(args_0: SynchronizationSource) => string | null, {
     clearCache: () => void;
 }> & {

package/src/lib/store/generic/synchronizationGroups/selector.d.ts

@@ -0,0 +1,19 @@
+import { SyncGroupViewState, SynchronizationGroups, SynchronizationSources, SyncType } from './types';
+export declare const groupTypes: {
+    title: string;
+    syncType: SyncType;
+    groupType: string;
+}[];
+export declare const createSyncGroupViewState: (groups: SynchronizationGroups, sources: SynchronizationSources) => SyncGroupViewState;
+export declare const createSyncGroupViewStateSelector: ((state: {
+    syncronizationGroupStore?: import("./types").SynchronizationGroupState | undefined;
+    ui?: import("../../ui/types").UIStoreType | undefined;
+    webmap?: import("../../mapStore/types").WebMapState | undefined;
+    services?: import("../../mapStore/types").ServiceState | undefined;
+    layers?: import("../../mapStore/types").LayerState | undefined;
+    layerSelect?: import("../../..").LayerSelectStoreType | undefined;
+}) => SyncGroupViewState) & import("reselect").OutputSelectorFields<(args_0: SynchronizationGroups, args_1: SynchronizationSources) => SyncGroupViewState, {
+    clearCache: () => void;
+}> & {
+    clearCache: () => void;
+};

package/src/lib/store/generic/synchronizationGroups/selectors.d.ts

@@ -1,4 +1,4 @@
-import type { AppStore } from '../../../types/types';
+import type { AppStore } from '../../types';
 import type { GenericSyncActionPayload } from '../synchronizationActions/types';
 import type { GenericActionPayload } from '../types';
 import type { SyncGroupTarget, SynchronizationGroup, SynchronizationGroupState, SynchronizationSource, SyncType } from './types';
@@ -16,7 +16,7 @@ export declare const getSynchronizationGroupState: ((state: {
     webmap?: import("../../mapStore/types").WebMapState | undefined;
     services?: import("../../mapStore/types").ServiceState | undefined;
     layers?: import("../../mapStore/types").LayerState | undefined;
-    layerSelect?: import("../../layerSelect/types").LayerSelectStoreType | undefined;
+    layerSelect?: import("../../..").LayerSelectStoreType | undefined;
 }) => SynchronizationGroupState) & import("reselect").OutputSelectorFields<(args_0: SynchronizationGroupState) => SynchronizationGroupState, {
     clearCache: () => void;
 }> & {
@@ -32,7 +32,7 @@ export declare const getAllTargetGroupsForSource: ((state: {
     webmap?: import("../../mapStore/types").WebMapState | undefined;
     services?: import("../../mapStore/types").ServiceState | undefined;
     layers?: import("../../mapStore/types").LayerState | undefined;
-    layerSelect?: import("../../layerSelect/types").LayerSelectStoreType | undefined;
+    layerSelect?: import("../../..").LayerSelectStoreType | undefined;
 }, params_0: string) => string[]) & import("reselect").OutputSelectorFields<(args_0: SynchronizationGroupState, args_1: string) => string[], {
     clearCache: () => void;
 }> & {
@@ -44,8 +44,8 @@ export declare const syncGroupGetViewState: ((state: {
     webmap?: import("../../mapStore/types").WebMapState | undefined;
     services?: import("../../mapStore/types").ServiceState | undefined;
     layers?: import("../../mapStore/types").LayerState | undefined;
-    layerSelect?: import("../../layerSelect/types").LayerSelectStoreType | undefined;
-}) => import("../../../components/SyncGroups/types").SyncGroupViewState) & import("reselect").OutputSelectorFields<(args_0: SynchronizationGroupState) => import("../../../components/SyncGroups/types").SyncGroupViewState, {
+    layerSelect?: import("../../..").LayerSelectStoreType | undefined;
+}) => import("./types").SyncGroupViewState) & import("reselect").OutputSelectorFields<(args_0: SynchronizationGroupState) => import("./types").SyncGroupViewState, {
     clearCache: () => void;
 }> & {
     clearCache: () => void;
@@ -56,7 +56,7 @@ export declare const getSyncedMapIdsForTimeslider: ((state: {
     webmap?: import("../../mapStore/types").WebMapState | undefined;
     services?: import("../../mapStore/types").ServiceState | undefined;
     layers?: import("../../mapStore/types").LayerState | undefined;
-    layerSelect?: import("../../layerSelect/types").LayerSelectStoreType | undefined;
+    layerSelect?: import("../../..").LayerSelectStoreType | undefined;
 }) => string[]) & import("reselect").OutputSelectorFields<(args_0: SynchronizationGroupState) => string[], {
     clearCache: () => void;
 }> & {
@@ -68,7 +68,7 @@ export declare const getSyncGroupTargets: ((state: {
     webmap?: import("../../mapStore/types").WebMapState | undefined;
     services?: import("../../mapStore/types").ServiceState | undefined;
     layers?: import("../../mapStore/types").LayerState | undefined;
-    layerSelect?: import("../../layerSelect/types").LayerSelectStoreType | undefined;
+    layerSelect?: import("../../..").LayerSelectStoreType | undefined;
 }) => SyncGroupTarget[]) & import("reselect").OutputSelectorFields<(args_0: SynchronizationGroupState) => SyncGroupTarget[], {
     clearCache: () => void;
 }> & {

package/src/lib/store/generic/synchronizationGroups/types.d.ts

@@ -1,6 +1,22 @@
 import type { GenericActionPayload } from '../types';
 import { SYNCGROUPS_TYPE_SETBBOX, SYNCGROUPS_TYPE_SETTIME, SYNCGROUPS_TYPE_SETLAYERACTIONS } from './constants';
-import type { SyncGroupViewState } from '../../../components/SyncGroups/types';
+export interface Group {
+    id: string;
+    selected: string[];
+}
+export interface SourceById {
+    id: string;
+    name: string;
+}
+export interface GroupsAndSources {
+    groups: Group[];
+    sourcesById: SourceById[];
+}
+export interface SyncGroupViewState {
+    timeslider: GroupsAndSources;
+    zoompane: GroupsAndSources;
+    level: GroupsAndSources;
+}
 export interface SynchronizationGroup {
     type: SyncType;
     title?: string;

package/src/lib/store/generic/synchronizationGroups/utils.d.ts

@@ -1,4 +1,4 @@
-import { AppStore } from '../../../types/types';
+import { AppStore } from '../../types';
 import { AddLayerPayload, DeleteLayerPayload, MoveLayerPayload, SetBaseLayersPayload } from '../../mapStore/types';
 import { SyncLayerPayloads, LayerActionPayloadsWithLayerIds } from '../types';
 import { SyncType } from './types';

package/src/lib/{utils/__mocks__/getCapabilities.d.ts → store/getCapabilities/mocks/mockGetCapabilities.d.ts}

@@ -1,5 +1,5 @@
 import { LayerTree } from '@opengeoweb/webmap';
-import { serviceTypes } from '../../store';
+import { serviceTypes } from '../../mapStore';
 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";
@@ -84,5 +84,5 @@ export declare const mockLayersDefault2: {
     path: never[];
     children: never[];
 };
-export declare const getLayersFromService: (url: string) => Promise<LayerTree>;
-export declare const getLayersFlattenedFromService: (url: string) => Promise<serviceTypes.ServiceLayer[]>;
+export declare const mockGetLayersFromService: (url: string) => Promise<LayerTree>;
+export declare const mockGetLayersFlattenedFromService: (url: string) => Promise<serviceTypes.ServiceLayer[]>;

package/src/lib/store/layerSelect/selectors.d.ts

@@ -1,4 +1,4 @@
-import type { AppStore } from '../../types/types';
+import type { AppStore } from '../types';
 import { LayerSelectStoreType, ActiveServiceObject, ActiveLayerObject, ActiveServiceObjectEntities, ServicePopupObject } from './types';
 /**
  * Returns search filter string

package/src/lib/store/layerSelect/types.d.ts

@@ -1,5 +1,16 @@
 import { EntityState } from '@reduxjs/toolkit';
 import type { ServiceLayer, ServiceScope } from '../mapStore/types';
+export declare type NoIdService = Omit<LayerSelectService, 'id'>;
+export interface UserAddedServices {
+    [url: string]: NoIdService;
+}
+export interface LayerSelectService {
+    name: string;
+    url: string;
+    id: string;
+    scope?: ServiceScope;
+    abstract?: string;
+}
 export interface ActiveLayerObject extends ServiceLayer {
     serviceName: string;
 }