@opengeoweb/core 4.22.1 → 5.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/core",
-  "version": "4.22.1",
+  "version": "5.0.0",
   "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": "4.22.1",
-    "@opengeoweb/form-fields": "4.22.1",
-    "@opengeoweb/shared": "4.22.1",
-    "@opengeoweb/theme": "4.22.1",
-    "@opengeoweb/webmap": "4.22.1",
+    "@opengeoweb/api": "5.0.0",
+    "@opengeoweb/form-fields": "5.0.0",
+    "@opengeoweb/shared": "5.0.0",
+    "@opengeoweb/theme": "5.0.0",
+    "@opengeoweb/webmap": "5.0.0",
     "@redux-eggs/core": "2.2.0",
     "@redux-eggs/redux-toolkit": "2.2.0",
     "@redux-eggs/saga-extension": "2.2.0",

package/src/lib/components/ComponentsLookUp/componentsLookUp.d.ts

@@ -1,14 +1,14 @@
 import React from 'react';
-import { MapPreset, MapPresetInitialProps } from '../../store/mapStore/types';
+import { mapTypes } from '../../store';
 import { InitialHarmTempAndPrecipProps } from '../MultiMapView/HarmoniePresets';
 import { ModelRunIntervalProps } from '../MultiMapView/ModelRunInterval';
 interface InitialMultiMapProps {
-    mapPreset: MapPreset[];
+    mapPreset: mapTypes.MapPreset[];
     syncGroupsIds: string[];
     shouldShowZoomControls?: boolean;
 }
 export interface InitialMapProps {
-    mapPreset: MapPreset;
+    mapPreset: mapTypes.MapPreset;
     syncGroupsIds: string[];
 }
 interface InitialSliderProps {
@@ -17,7 +17,7 @@ interface InitialSliderProps {
     };
     syncGroupsIds: string[];
 }
-export declare type InitialProps = InitialMapProps | InitialMultiMapProps | InitialSliderProps | InitialHarmTempAndPrecipProps | ModelRunIntervalProps | MapPresetInitialProps;
+export declare type InitialProps = InitialMapProps | InitialMultiMapProps | InitialSliderProps | InitialHarmTempAndPrecipProps | ModelRunIntervalProps | mapTypes.MapPresetInitialProps;
 /**
  * The lookup table is for registering your own components with the workspace.
  * @param payload

package/src/lib/components/ConfigurableMap/ConfigurableMapConnect.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { AnimationPayloadType, Bbox, Dimension, DockedLayerManagerSize, Layer } from '../../store/mapStore/types';
+import { mapTypes, layerTypes } from '../../store';
 export declare const defaultBbox: {
     srs: string;
     bbox: {
@@ -11,17 +11,17 @@ export declare const defaultBbox: {
 };
 export interface ConfigurableMapConnectProps {
     id?: string;
-    dockedLayerManagerSize?: DockedLayerManagerSize;
+    dockedLayerManagerSize?: mapTypes.DockedLayerManagerSize;
     shouldAutoUpdate?: boolean;
     shouldAnimate?: boolean;
     title?: string;
-    layers: Layer[];
+    layers: layerTypes.Layer[];
     autoUpdateLayerId?: string;
     autoTimeStepLayerId?: string;
-    bbox?: Bbox;
+    bbox?: mapTypes.Bbox;
     srs?: string;
-    dimensions?: Dimension[];
-    animationPayload?: AnimationPayloadType;
+    dimensions?: mapTypes.Dimension[];
+    animationPayload?: mapTypes.AnimationPayloadType;
     shouldShowZoomControls?: boolean;
     displayMapPin?: boolean;
     showTimeSlider?: boolean;

package/src/lib/components/FeatureInfo/GetFeatureInfoButtonConnect.d.ts

@@ -1,8 +1,8 @@
 import * as React from 'react';
-import { Source } from '../../store/ui/types';
+import { uiTypes } from '../../store';
 interface GetFeatureInfoButtonProps {
     mapId: string;
-    source?: Source;
+    source?: uiTypes.Source;
 }
 declare const GetFeatureInfoButtonConnect: React.FC<GetFeatureInfoButtonProps>;
 export default GetFeatureInfoButtonConnect;

package/src/lib/components/FeatureInfo/GetFeatureInfoDialog.d.ts

@@ -1,16 +1,15 @@
 import React from 'react';
-import { Layer, MapLocation } from '../../store/mapStore/types';
-import { Source } from '../../store/ui/types';
+import { layerTypes, mapTypes, uiTypes } from '../../store';
 interface GetFeatureInfoDialogProps {
-    layers: Layer[];
+    layers: layerTypes.Layer[];
     isOpen: boolean;
     onClose: () => void;
     onMouseDown?: () => void;
     mapId: string;
     showMapId?: boolean;
     order?: number;
-    source?: Source;
-    mapPinLocation?: MapLocation;
+    source?: uiTypes.Source;
+    mapPinLocation?: mapTypes.MapLocation;
 }
 declare const GetFeatureInfoDialog: React.FC<GetFeatureInfoDialogProps>;
 export default GetFeatureInfoDialog;

package/src/lib/components/FeatureInfo/utils.d.ts

@@ -1,4 +1,4 @@
-import { Layer } from '../../store/mapStore/types';
+import { layerTypes } from '../../store';
 export interface GFIResult {
     data: string;
     isLoading: boolean;
@@ -14,4 +14,4 @@ export interface GFILayer {
  * @param mapId
  * @returns
  */
-export declare const getLayersToUpdate: (layers: Layer[], mapId: string) => GFILayer[];
+export declare const getLayersToUpdate: (layers: layerTypes.Layer[], mapId: string) => GFILayer[];

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

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import { Service } from '../../WMSLoader/services';
-import { LayerType } from '../../../store/mapStore/types';
+import { layerTypes } from '../../../store';
 interface AddLayerButtonProps {
     onRenderTree?: (service: Service) => React.ReactChild;
     preloadedServices?: Service[];
     tooltip?: string;
-    layerType?: LayerType;
+    layerType?: layerTypes.LayerType;
     shouldFocus?: boolean;
 }
 declare const AddLayersButton: React.FC<AddLayerButtonProps>;

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

@@ -1,12 +1,12 @@
 import * as React from 'react';
-import { LayerType } from '../../../store/mapStore/types';
+import { layerTypes } from '../../../store';
 import { Service } from '../../WMSLoader/services';
 interface AddLayerPopupProps {
     onRenderTree?: (service: Service) => React.ReactChild;
     preloadedServices?: Service[];
     open?: boolean;
     handleClose?: () => void;
-    layerType?: LayerType;
+    layerType?: layerTypes.LayerType;
 }
 declare const AddLayersPopup: React.FC<AddLayerPopupProps>;
 export default AddLayersPopup;

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

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

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

@@ -1,8 +1,8 @@
 import * as React from 'react';
-import { Layer } from '../../../../store/mapStore/types';
+import { layerTypes } from '../../../../store';
 interface BaseLayersProps {
-    selectedBaseLayers: Layer[];
-    availableBaseLayers: Layer[];
+    selectedBaseLayers: layerTypes.Layer[];
+    availableBaseLayers: layerTypes.Layer[];
     onChangeBaseLayers: (name: string) => void;
     icon?: React.ElementType;
     tooltipPrefix?: string;

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

@@ -1,11 +1,11 @@
 import * as React from 'react';
-import { Layer } from '../../../../store/mapStore/types';
-export declare const constructLayerId: (baseLayer: Layer, selectedBaseLayers: Layer[]) => string;
-export declare const constructListAvailableBaseLayers: (selectedBaseLayers: Layer[], preloadedAvailableBaseLayers: Layer[], mapId: string) => Layer[];
-export declare const areAvailableBaseLayersSame: (availableBaseLayerList: Layer[], newBaseLayerList: Layer[]) => boolean;
+import { layerTypes } from '../../../../store';
+export declare const constructLayerId: (baseLayer: layerTypes.Layer, selectedBaseLayers: layerTypes.Layer[]) => string;
+export declare const constructListAvailableBaseLayers: (selectedBaseLayers: layerTypes.Layer[], preloadedAvailableBaseLayers: layerTypes.Layer[], mapId: string) => layerTypes.Layer[];
+export declare const areAvailableBaseLayersSame: (availableBaseLayerList: layerTypes.Layer[], newBaseLayerList: layerTypes.Layer[]) => boolean;
 interface BaseLayersConnectProps {
     mapId: string;
-    preloadedAvailableBaseLayers: Layer[];
+    preloadedAvailableBaseLayers: layerTypes.Layer[];
     tooltipPrefix?: string;
     icon?: React.ElementType;
 }
@@ -15,7 +15,7 @@ declare const BaseLayersConnect: React.FC<BaseLayersConnectProps>;
  *
  * Expects the following props:
  * @param {string} mapId mapId: string - Id of the map
- * @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
+ * @param {layerTypes.Layer[]} preloadedAvailableBaseLayers preloadedAvailableBaseLayers: array of layerTypes.Layer objects - contains an array of layerTypes.Layer objects (consisting solely of type baseLayer) that are available to be shown as basemaps
  * @example
  * ``` <BaseLayersConnect mapId="mapid_1" preloadedAvailableBaseLayers = {baseLayersList} /> ```
  */

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

@@ -1,10 +1,10 @@
 import * as React from 'react';
-import { Source } from '../../../store/ui/types';
+import { uiTypes } from '../../../store';
 import { LayerManagerCustomSettings } from '../LayerManagerUtils';
 interface DescriptionRowProps {
     mapId: string;
     mapPresetsModule?: React.ReactElement;
-    source?: Source;
+    source?: uiTypes.Source;
     settings?: LayerManagerCustomSettings['header'];
     isMultiMap?: boolean;
 }

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

@@ -1,16 +1,15 @@
 import * as React from 'react';
-import { Layer } from '../../store/mapStore/types';
+import { layerTypes, uiTypes } from '../../store';
 import { Service } from '../WMSLoader/services';
-import { Source } from '../../store/ui/types';
 interface DockedLayerManagerConnectProps {
     mapId: string;
-    preloadedAvailableBaseLayers?: Layer[];
+    preloadedAvailableBaseLayers?: layerTypes.Layer[];
     preloadedBaseServices?: Service[];
     bounds?: string;
     title?: string;
     showMapIdInTitle?: boolean;
     leftHeaderComponent?: React.ReactElement;
-    source?: Source;
+    source?: uiTypes.Source;
 }
 /**
  * Docked Layer Manager connected to the store displaying the layers for the corresponding map it's included in

package/src/lib/components/LayerManager/LayerContainerRow/LayerRow/DimensionSelect/DimensionSelect.d.ts

@@ -1,9 +1,9 @@
 import * as React from 'react';
-import { Dimension, LayerActionOrigin } from '../../../../../store/mapStore/types';
+import { mapTypes, layerTypes } from '../../../../../store';
 interface DimensionSelectProps {
     layerId: string;
-    layerDimensions?: Dimension[];
-    onLayerChangeDimension: (dimensionName: string, dimensionValue: string, origin?: LayerActionOrigin.layerManager) => void;
+    layerDimensions?: mapTypes.Dimension[];
+    onLayerChangeDimension: (dimensionName: string, dimensionValue: string, origin?: layerTypes.LayerActionOrigin.layerManager) => void;
     isEnabled?: boolean;
 }
 declare const DimensionSelect: React.FC<DimensionSelectProps>;

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

@@ -1,8 +1,9 @@
 import React from 'react';
-import { Dimension, Layer, Services } from '../../../../store/mapStore/types';
+import { mapTypes, layerTypes } from '../../../../store';
+import type { serviceTypes } from '../../../../store';
 interface LayerRowProps {
     layerId?: string;
-    layer?: Layer;
+    layer?: layerTypes.Layer;
     layerName?: string;
     mapId: string;
     onLayerRowClick?: (layerId?: string) => void;
@@ -25,7 +26,7 @@ interface LayerRowProps {
     onLayerChangeDimension?: (payload: {
         origin: string;
         layerId: string;
-        dimension: Dimension;
+        dimension: mapTypes.Dimension;
     }) => void;
     onLayerDelete?: (payload: {
         mapId: string;
@@ -44,7 +45,7 @@ interface LayerRowProps {
     layerMenuLayout?: React.ReactChild;
     layerActiveLayout?: React.ReactChild;
     disableActivateLayer?: boolean;
-    services?: Services;
+    services?: serviceTypes.Services;
     isEnabled?: boolean;
     dragHandle?: React.ReactElement;
     isLayerMissing?: boolean;

package/src/lib/components/LayerManager/LayerContainerRow/LayerRow/RenderLayers/RenderLayers.d.ts

@@ -1,9 +1,9 @@
 import * as React from 'react';
-import { ServiceLayer } from '../../../../../store/mapStore/types';
+import { serviceTypes } from '../../../../../store';
 export interface RenderLayersProps {
     onChangeLayerName: (name: string) => void;
     layerName: string;
-    layers: ServiceLayer[];
+    layers: serviceTypes.ServiceLayer[];
     isEnabled?: boolean;
     tooltipPrefix?: string;
 }

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

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { HeaderSize } from '@opengeoweb/shared';
-import { Layer } from '../../store/mapStore/types';
-import { Source } from '../../store/ui/types';
+import { layerTypes } from '../../store';
+import type { uiTypes } from '../../store';
 import { Service } from '../WMSLoader/services';
 import { LayerManagerCustomSettings } from './LayerManagerUtils';
 import { Size } from './LayerManagerHeaderOptions';
@@ -12,7 +12,7 @@ export declare type Position = {
 };
 interface LayerManagerProps {
     mapId: string;
-    preloadedAvailableBaseLayers?: Layer[];
+    preloadedAvailableBaseLayers?: layerTypes.Layer[];
     preloadedBaseServices?: Service[];
     bounds?: string;
     title?: string;
@@ -20,7 +20,7 @@ interface LayerManagerProps {
     onMouseDown?: () => void;
     isOpen: boolean;
     order?: number;
-    source?: Source;
+    source?: uiTypes.Source;
     leftHeaderComponent?: React.ReactElement;
     isLoading?: boolean;
     error?: string;

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

@@ -1,9 +1,9 @@
 import * as React from 'react';
-import { Layer } from '../../store/mapStore/types';
+import { layerTypes } from '../../store';
 import { Service } from '../WMSLoader/services';
 interface LayerManagerConnectProps {
     mapId?: string;
-    preloadedAvailableBaseLayers?: Layer[];
+    preloadedAvailableBaseLayers?: layerTypes.Layer[];
     preloadedMapServices?: Service[];
     preloadedBaseServices?: Service[];
     bounds?: string;

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

@@ -1,8 +1,8 @@
 import * as React from 'react';
-import { Source } from '../../store/ui/types';
+import { uiTypes } from '../../store';
 interface LayerManagerMapButtonConnectProps {
     mapId: string;
-    source?: Source;
+    source?: uiTypes.Source;
     isMultiMap?: boolean;
 }
 declare const LayerManagerMapButtonConnect: React.FC<LayerManagerMapButtonConnectProps>;

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { DockedLayerManagerSize } from '../../store/mapStore/types';
+import { mapTypes } from '../../store';
 import { Size, ToolbarButtonSettings } from './LayerManagerHeaderOptions';
 export declare const columnClasses: {
     column1: string;
@@ -152,7 +152,7 @@ export declare const layerManagerStyle: {
         };
     };
 };
-export declare const returnCorrectSize: (sizeResult: DockedLayerManagerSize | undefined) => Size;
+export declare const returnCorrectSize: (sizeResult: mapTypes.DockedLayerManagerSize | undefined) => Size;
 export interface LayerManagerCustomSettings {
     toolbar?: {
         dragHandle?: {

package/src/lib/components/LayerManager/LayerSelect/KeywordFilterButton/KeywordFilterButtonConnect.d.ts

@@ -1,8 +1,8 @@
 import * as React from 'react';
-import { Source } from '../../../../store/ui/types';
+import { uiTypes } from '../../../../store';
 interface KeywordFilterButtonConnectProps {
     mapId: string;
-    source?: Source;
+    source?: uiTypes.Source;
     isMultiMap?: boolean;
 }
 declare const KeywordFilterButtonConnect: React.FC<KeywordFilterButtonConnectProps>;

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

@@ -1,6 +1,5 @@
 import * as React from 'react';
-import { Source } from '../../../../store/ui/types';
-import { Filter } from '../../../../store/layerSelect/types';
+import { uiTypes, layerSelectTypes } from '../../../../store';
 export declare const DIALOG_TITLE = "Groups & Keywords";
 export interface KeywordFilterResultsProps {
     bounds?: string;
@@ -8,8 +7,8 @@ export interface KeywordFilterResultsProps {
     onMouseDown?: () => void;
     isOpen: boolean;
     order?: number;
-    source?: Source;
-    filters: Filter[];
+    source?: uiTypes.Source;
+    filters: layerSelectTypes.Filter[];
 }
 declare const KeywordFilterResults: React.FC<KeywordFilterResultsProps>;
 export default KeywordFilterResults;

package/src/lib/components/LayerManager/LayerSelect/KeywordFilterResults/KeywordFilterResultsListItem.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { Filter } from '../../../../store/layerSelect/types';
+import { layerSelectTypes } from '../../../../store';
 export interface FilterListItemProps {
-    filter: Filter;
+    filter: layerSelectTypes.Filter;
     toggleFilter: (filterIds: string[]) => void;
     enableOnlyOneFilter: (filterId: string) => void;
 }

package/src/lib/components/LayerManager/LayerSelect/KeywordFilterResults/KeywordFilterResultsListItemConnect.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { Filter } from '../../../../store/layerSelect/types';
+import { layerSelectTypes } from '../../../../store';
 export interface KeywordFilterResultsListItemConnectProps {
-    filter: Filter;
+    filter: layerSelectTypes.Filter;
 }
 declare const KeywordFilterResultsListItemConnect: React.FC<KeywordFilterResultsListItemConnectProps>;
 export default KeywordFilterResultsListItemConnect;

package/src/lib/components/LayerManager/LayerSelect/LayerInfo/LayerInfoButtonConnect.d.ts

@@ -1,11 +1,10 @@
 import React from 'react';
-import { ServiceLayer } from '../../../../store/mapStore/types';
-import { Source } from '../../../../store/ui/types';
+import { uiTypes, serviceTypes } from '../../../../store';
 interface LayerInfoButtonProps {
-    layer: ServiceLayer;
+    layer: serviceTypes.ServiceLayer;
     mapId: string;
     serviceName: string;
-    source?: Source;
+    source?: uiTypes.Source;
 }
 declare const LayerInfoButtonConnect: React.FC<LayerInfoButtonProps>;
 export default LayerInfoButtonConnect;

package/src/lib/components/LayerManager/LayerSelect/LayerInfo/LayerInfoDialog.d.ts

@@ -1,13 +1,12 @@
 import React from 'react';
-import { ActiveLayerObject } from '../../../../store/layerSelect/types';
-import { Source } from '../../../../store/ui/types';
+import { uiTypes, layerSelectTypes } from '../../../../store';
 export interface LayerInfoDialogProps {
-    layer: ActiveLayerObject;
+    layer: layerSelectTypes.ActiveLayerObject;
     onClose: () => void;
     isOpen: boolean;
     onMouseDown?: () => void;
     order?: number;
-    source?: Source;
+    source?: uiTypes.Source;
     dialogHeight?: number;
 }
 declare const LayerInfoDialog: React.FC<LayerInfoDialogProps>;

package/src/lib/components/LayerManager/LayerSelect/LayerInfo/LayerInfoLegend.d.ts

@@ -1,9 +1,9 @@
 import React from 'react';
-import { Dimension } from '../../../../store/mapStore/types';
+import { mapTypes } from '../../../../store';
 export interface LayerInfoLegendProps {
     title: string;
     name: string;
-    dimensions: Dimension[];
+    dimensions: mapTypes.Dimension[];
     legendURL: string;
 }
 declare const LayerInfoLegend: React.FC<LayerInfoLegendProps>;

package/src/lib/components/LayerManager/LayerSelect/LayerInfo/LayerInfoUtils.d.ts

@@ -1,10 +1,9 @@
 import React from 'react';
-import { Dimension } from '../../../../store/mapStore/types';
-import { ActiveLayerObject } from '../../../../store/layerSelect/types';
+import { mapTypes, layerSelectTypes } from '../../../../store';
 import { ListItem } from './LayerInfoList';
-export declare const getLayerStyles: (layer: ActiveLayerObject) => string;
-export declare const getDimensionValue: (name: string, dimensions: Dimension[]) => string;
-export declare const getLayerBbox: (layer: ActiveLayerObject) => string;
-export declare const getDimensionIcon: (name: string, dimensions: Dimension[]) => React.ReactElement;
+export declare const getLayerStyles: (layer: layerSelectTypes.ActiveLayerObject) => string;
+export declare const getDimensionValue: (name: string, dimensions: mapTypes.Dimension[]) => string;
+export declare const getLayerBbox: (layer: layerSelectTypes.ActiveLayerObject) => string;
+export declare const getDimensionIcon: (name: string, dimensions: mapTypes.Dimension[]) => React.ReactElement;
 export declare const getDimensionLabel: (name: string) => string;
-export declare const getDimensionsList: (dimensions: Dimension[]) => ListItem[];
+export declare const getDimensionsList: (dimensions: mapTypes.Dimension[]) => ListItem[];

package/src/lib/components/LayerManager/LayerSelect/LayerList/LayerAddRemoveButton.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { ReduxLayer } from '../../../../store/mapStore/layers/types';
+import { layerTypes } from '../../../../store';
 interface LayerAddRemoveButtonProps {
-    layer: ReduxLayer;
+    layer: layerTypes.ReduxLayer;
     layerIndex: number;
     serviceUrl: string;
     addLayer: ({ serviceUrl, layerName }: {
@@ -12,7 +12,7 @@ interface LayerAddRemoveButtonProps {
         layerId: any;
         layerIndex: any;
     }) => void;
-    mapLayers: ReduxLayer[];
+    mapLayers: layerTypes.ReduxLayer[];
 }
 declare const LayerAddRemoveButton: React.FC<LayerAddRemoveButtonProps>;
 export default LayerAddRemoveButton;

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

@@ -1,10 +1,8 @@
 import * as React from 'react';
-import { ReduxLayer } from '../../../../store/mapStore/layers/types';
-import { ActiveLayerObject } from '../../../../store/layerSelect/types';
-import { Services } from '../../../../store/mapStore/types';
+import { layerTypes, serviceTypes, layerSelectTypes } from '../../../../store';
 export interface LayerListProps {
-    services: Services;
-    filteredLayers: ActiveLayerObject[];
+    services: serviceTypes.Services;
+    filteredLayers: layerSelectTypes.ActiveLayerObject[];
     layerSelectHeight: number;
     serviceListHeight: number;
     layerSelectWidth: number;
@@ -16,7 +14,7 @@ export interface LayerListProps {
         layerId: any;
         layerIndex: any;
     }) => void;
-    mapLayers: ReduxLayer[];
+    mapLayers: layerTypes.ReduxLayer[];
     mapId: string;
     searchFilter: string;
 }

package/src/lib/components/LayerManager/LayerSelect/LayerList/LayerListRow.d.ts

@@ -1,9 +1,9 @@
 import React from 'react';
-import { ReduxLayer, ServiceLayer, ReduxService } from '../../../../store/mapStore/types';
+import { layerTypes, serviceTypes } from '../../../../store';
 interface LayerListRowProps {
-    layer: ServiceLayer;
+    layer: serviceTypes.ServiceLayer;
     layerIndex: number;
-    service: ReduxService;
+    service: serviceTypes.ReduxService;
     addLayer: ({ serviceUrl, layerName }: {
         serviceUrl: any;
         layerName: any;
@@ -12,7 +12,7 @@ interface LayerListRowProps {
         layerId: any;
         layerIndex: any;
     }) => void;
-    mapLayers: ReduxLayer[];
+    mapLayers: layerTypes.ReduxLayer[];
     mapId: string;
     layerSelectWidth: number;
     searchFilter: string;

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Source } from '../../../store/ui/types';
+import { uiTypes } from '../../../store';
 interface LayerSelectProps {
     mapId: string;
     bounds?: string;
@@ -8,7 +8,7 @@ interface LayerSelectProps {
     onMouseDown?: (event: MouseEvent) => void;
     isOpen: boolean;
     order?: number;
-    source?: Source;
+    source?: uiTypes.Source;
     startSize?: {
         width: number;
         height: number;

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

@@ -1,8 +1,8 @@
 import * as React from 'react';
-import { Source } from '../../../store/ui/types';
+import { uiTypes } from '../../../store';
 interface LayerSelectButtonConnectProps {
     mapId: string;
-    source?: Source;
+    source?: uiTypes.Source;
     tooltipTitle?: string;
     icon?: React.ReactNode;
     isMultiMap?: boolean;

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

@@ -1,5 +1,5 @@
 import { CSSProperties } from 'react';
-import { ActiveServiceObjectEntities } from '../../../store/layerSelect/types';
+import { layerSelectTypes } from '../../../store';
 export declare const layerSelectColumnsLarge: {
     column1: {
         width: number;
@@ -74,4 +74,4 @@ export declare const layerSelectColumnsSmall: {
 };
 export declare const widthToColumns: (width: number) => Record<string, CSSProperties>;
 export declare const widthToRowHeight: (width: number) => number;
-export declare const sortByService: (serviceObj: ActiveServiceObjectEntities) => ActiveServiceObjectEntities;
+export declare const sortByService: (serviceObj: layerSelectTypes.ActiveServiceObjectEntities) => layerSelectTypes.ActiveServiceObjectEntities;

package/src/lib/components/LayerManager/LayerSelect/ServiceList/ServiceChip.d.ts

@@ -1,8 +1,8 @@
 import * as React from 'react';
-import { ActiveServiceObject } from '../../../../store/layerSelect/types';
+import { layerSelectTypes } from '../../../../store';
 interface ServiceChipProps {
     all?: boolean;
-    service?: ActiveServiceObject;
+    service?: layerSelectTypes.ActiveServiceObject;
     isSelected?: boolean;
     isDisabled?: boolean;
     toggleChip?: (service: string) => void;

package/src/lib/components/LayerManager/LayerSelect/ServiceList/ServiceChipConnect.d.ts

@@ -1,9 +1,9 @@
 import * as React from 'react';
-import { ActiveServiceObject } from '../../../../store/layerSelect/types';
+import { layerSelectTypes } from '../../../../store';
 export interface ServiceChipConnectProps {
     all?: boolean;
     serviceId?: string;
-    service?: ActiveServiceObject;
+    service?: layerSelectTypes.ActiveServiceObject;
     isSelected?: boolean;
     isAllSelected?: boolean;
     isDisabled?: boolean;