fix: adjust components for new react-geo components

terrestris · Apr 25, 2024 · 3b9423e · 3b9423e
1 parent 1c08e08
commit 3b9423e
Show file tree

Hide file tree

Showing 42 changed files with 66 additions and 67 deletions.
diff --git a/src/components/AddLayerModal/index.tsx b/src/components/AddLayerModal/index.tsx
@@ -35,10 +35,10 @@ import UrlUtil from '@terrestris/base-util/dist/UrlUtil/UrlUtil';
 import CapabilitiesUtil from '@terrestris/ol-util/dist/CapabilitiesUtil/CapabilitiesUtil';
 import MapUtil from '@terrestris/ol-util/dist/MapUtil/MapUtil';
 
-import { SimpleButton } from '@terrestris/react-geo';
+import SimpleButton from '@terrestris/react-geo/dist/Button/SimpleButton/SimpleButton';
 import {
   useMap
-} from '@terrestris/react-geo/dist/Hook/useMap';
+} from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 
 import useAppDispatch from '../../hooks/useAppDispatch';
 import useAppSelector from '../../hooks/useAppSelector';

diff --git a/src/components/BasicMapComponent/index.tsx b/src/components/BasicMapComponent/index.tsx
@@ -10,11 +10,11 @@ import {
 
 import MapUtil from '@terrestris/ol-util/dist/MapUtil/MapUtil';
 
-import useMap from '@terrestris/react-geo/dist/Hook/useMap';
-
-import MapComponent, {
+import {
+  MapComponent,
   MapComponentProps
-} from '@terrestris/react-geo/dist/Map/MapComponent/MapComponent';
+} from '@terrestris/react-util/dist/Components/MapComponent/MapComponent';
+import { useMap } from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 
 import usePlugins from '../../hooks/usePlugins';
 

diff --git a/src/components/BasicNominatimSearch/index.tsx b/src/components/BasicNominatimSearch/index.tsx
@@ -15,7 +15,7 @@ import {
 import NominatimSearch, {
   NominatimSearchProps
 } from '@terrestris/react-geo/dist/Field/NominatimSearch/NominatimSearch';
-import useMap from '@terrestris/react-geo/dist/Hook/useMap';
+import { useMap } from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 
 export const BasicNominatimSearch: React.FC<Partial<NominatimSearchProps>> = ({
   ...restProps

diff --git a/src/components/EditFeatureDrawer/DeleteButton/index.tsx b/src/components/EditFeatureDrawer/DeleteButton/index.tsx
@@ -31,11 +31,11 @@ import {
 
 import {
   useMap
-} from '@terrestris/react-geo/dist/Hook/useMap';
+} from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 import {
   WmsLayer,
   isWmsLayer
-} from '@terrestris/react-geo/dist/Util/typeUtils';
+} from '@terrestris/react-util/dist/Util/typeUtils';
 
 import useExecuteWfsTransaction from '../../../hooks/useExecuteWfsTransaction';
 import useWriteWfsTransaction from '../../../hooks/useWriteWfsTransaction';

diff --git a/src/components/EditFeatureDrawer/EditFeatureFullForm/index.tsx b/src/components/EditFeatureDrawer/EditFeatureFullForm/index.tsx
@@ -35,12 +35,12 @@ import {
   Logger
 } from '@terrestris/base-util';
 
-import useMap from '@terrestris/react-geo/dist/Hook/useMap';
+import { useMap } from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 
 import {
   WmsLayer,
   isWmsLayer
-} from '@terrestris/react-geo/dist/Util/typeUtils';
+} from '@terrestris/react-util/dist/Util/typeUtils';
 
 import ShogunFile from '@terrestris/shogun-util/dist/model/File';
 import {

diff --git a/src/components/EditFeatureDrawer/EditFeatureGeometryToolbar/index.tsx b/src/components/EditFeatureDrawer/EditFeatureGeometryToolbar/index.tsx
@@ -37,8 +37,6 @@ import ModifyButton from '@terrestris/react-geo/dist/Button/ModifyButton/ModifyB
 import SimpleButton from '@terrestris/react-geo/dist/Button/SimpleButton/SimpleButton';
 import ToggleGroup from '@terrestris/react-geo/dist/Button/ToggleGroup/ToggleGroup';
 
-import Toolbar, { ToolbarProps } from '@terrestris/react-geo/dist/Toolbar/Toolbar';
-
 import {
   useMap
 } from '@terrestris/react-util';
@@ -52,6 +50,7 @@ import useAppSelector from '../../../hooks/useAppSelector';
 import {
   setFormDirty
 } from '../../../store/editFeature';
+import Toolbar, { ToolbarProps } from '../../Toolbar';
 
 import './index.less';
 

diff --git a/src/components/EditFeatureDrawer/EditFeatureSwitch/index.tsx b/src/components/EditFeatureDrawer/EditFeatureSwitch/index.tsx
@@ -14,10 +14,10 @@ import {
 
 import Logger from '@terrestris/base-util/dist/Logger';
 
-import useMap from '@terrestris/react-geo/dist/Hook/useMap';
+import { useMap } from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 import {
   WmsLayer
-} from '@terrestris/react-geo/dist/Util/typeUtils';
+} from '@terrestris/react-util/dist/Util/typeUtils';
 
 import useAppDispatch from '../../../hooks/useAppDispatch';
 import useAppSelector from '../../../hooks/useAppSelector';

diff --git a/src/components/EditFeatureDrawer/EditFeatureToolbar/index.tsx b/src/components/EditFeatureDrawer/EditFeatureToolbar/index.tsx
@@ -10,7 +10,7 @@ import {
 
 import {
   WmsLayer
-} from '@terrestris/react-geo/dist/Util/typeUtils';
+} from '@terrestris/react-util/dist/Util/typeUtils';
 
 import useAppSelector from '../../../hooks/useAppSelector';
 

diff --git a/src/components/EditFeatureDrawer/ResetButton/index.tsx b/src/components/EditFeatureDrawer/ResetButton/index.tsx
@@ -27,8 +27,8 @@ import {
 
 import {
   useMap
-} from '@terrestris/react-geo/dist/Hook/useMap';
-import { DigitizeUtil } from '@terrestris/react-geo/dist/Util/DigitizeUtil';
+} from '@terrestris/react-util/dist/Hooks/useMap/useMap';
+import { DigitizeUtil } from '@terrestris/react-util/dist/Util/DigitizeUtil';
 
 import useAppDispatch from '../../../hooks/useAppDispatch';
 import {

diff --git a/src/components/EditFeatureDrawer/SaveButton/index.tsx b/src/components/EditFeatureDrawer/SaveButton/index.tsx
@@ -28,14 +28,14 @@ import {
 
 import {
   useMap
-} from '@terrestris/react-geo/dist/Hook/useMap';
+} from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 import {
   DigitizeUtil
-} from '@terrestris/react-geo/dist/Util/DigitizeUtil';
+} from '@terrestris/react-util/dist/Util/DigitizeUtil';
 import {
   WmsLayer,
   isWmsLayer
-} from '@terrestris/react-geo/dist/Util/typeUtils';
+} from '@terrestris/react-util/dist/Util/typeUtils';
 
 import useAppDispatch from '../../../hooks/useAppDispatch';
 import useAppSelector from '../../../hooks/useAppSelector';

diff --git a/src/components/EditFeatureDrawer/index.tsx b/src/components/EditFeatureDrawer/index.tsx
@@ -21,12 +21,12 @@ import {
 
 import MapUtil from '@terrestris/ol-util/dist/MapUtil/MapUtil';
 
-import useMap from '@terrestris/react-geo/dist/Hook/useMap';
+import { useMap } from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 
 import {
   WmsLayer,
   isWmsLayer
-} from '@terrestris/react-geo/dist/Util/typeUtils';
+} from '@terrestris/react-util/dist/Util/typeUtils';
 
 import useAppDispatch from '../../hooks/useAppDispatch';
 import useAppSelector from '../../hooks/useAppSelector';

diff --git a/src/components/Footer/index.tsx b/src/components/Footer/index.tsx
@@ -11,7 +11,7 @@ import { createStringXY } from 'ol/coordinate';
 import { useTranslation } from 'react-i18next';
 
 import ScaleCombo from '@terrestris/react-geo/dist/Field/ScaleCombo/ScaleCombo';
-import useMap from '@terrestris/react-geo/dist/Hook/useMap';
+import { useMap } from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 
 import './index.less';
 import useAppSelector from '../../hooks/useAppSelector';

diff --git a/src/components/LayerDetailsModal/LayerDetails/index.tsx b/src/components/LayerDetailsModal/LayerDetails/index.tsx
@@ -28,7 +28,7 @@ import CapabilitiesUtil from '@terrestris/ol-util/dist/CapabilitiesUtil/Capabili
 
 import {
   isWmsLayer
-} from '@terrestris/react-geo/dist/Util/typeUtils';
+} from '@terrestris/react-util/dist/Util/typeUtils';
 
 import {
   getBearerTokenHeader

diff --git a/src/components/LayerDetailsModal/index.tsx b/src/components/LayerDetailsModal/index.tsx
@@ -24,7 +24,7 @@ import MapUtil from '@terrestris/ol-util/dist/MapUtil/MapUtil';
 
 import {
   useMap
-} from '@terrestris/react-geo/dist/Hook/useMap';
+} from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 
 import useAppDispatch from '../../hooks/useAppDispatch';
 import useAppSelector from '../../hooks/useAppSelector';

diff --git a/src/components/MapDrawer/index.tsx b/src/components/MapDrawer/index.tsx
@@ -10,7 +10,7 @@ import type {
   DrawerProps
 } from 'antd/es/drawer';
 
-import useMap from '@terrestris/react-geo/dist/Hook/useMap';
+import { useMap } from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 
 import './index.less';
 

diff --git a/src/components/MultiSearch/index.tsx b/src/components/MultiSearch/index.tsx
@@ -48,10 +48,10 @@ import logger from '@terrestris/base-util/dist/Logger';
 
 import MapUtil from '@terrestris/ol-util/dist/MapUtil/MapUtil';
 import { NominatimPlace } from '@terrestris/react-geo/dist/Field/NominatimSearch/NominatimSearch';
-import useMap from '@terrestris/react-geo/dist/Hook/useMap';
 import SearchResultsPanel, {
   Category as ResultCategory
 } from '@terrestris/react-geo/dist/Panel/SearchResultsPanel/SearchResultsPanel';
+import { useMap } from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 
 import {
   SearchConfig

diff --git a/src/components/Permalink/index.tsx b/src/components/Permalink/index.tsx
@@ -29,7 +29,7 @@ import PermalinkUtil from '@terrestris/ol-util/dist/PermalinkUtil/PermalinkUtil'
 
 import {
   useMap
-} from '@terrestris/react-geo/dist/Hook/useMap';
+} from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 
 import Layer from '@terrestris/shogun-util/dist/model/Layer';
 

diff --git a/src/components/PrintForm/ScaleSelect/index.tsx b/src/components/PrintForm/ScaleSelect/index.tsx
@@ -14,7 +14,7 @@ import {
   MapFishPrintV3Manager
 } from '@terrestris/mapfish-print-manager';
 
-import useMap from '@terrestris/react-geo/dist/Hook/useMap';
+import { useMap } from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 
 export interface ScaleSelectProps extends SelectProps<number> {
   printManager: MapFishPrintV3Manager;

diff --git a/src/components/PrintForm/index.tsx b/src/components/PrintForm/index.tsx
@@ -35,7 +35,7 @@ import MapFishPrintV3WMTSSerializer
 
 import { LayerUtil } from '@terrestris/ol-util';
 import MapUtil from '@terrestris/ol-util/dist/MapUtil/MapUtil';
-import { useMap } from '@terrestris/react-geo/dist/Hook/useMap';
+import { useMap } from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 import { getBearerTokenHeader } from '@terrestris/shogun-util/dist/security/getBearerTokenHeader';
 
 import useAppDispatch from '../../hooks/useAppDispatch';

diff --git a/src/components/ToolMenu/Draw/Attributions/index.tsx b/src/components/ToolMenu/Draw/Attributions/index.tsx
@@ -16,7 +16,7 @@ import { useTranslation } from 'react-i18next';
 
 import {
   useMap
-} from '@terrestris/react-geo/dist/Hook/useMap';
+} from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 
 import './index.less';
 import AttributionRow, { InputFields } from './AttributionRow';

diff --git a/src/components/ToolMenu/Draw/DeleteAllButton/index.tsx b/src/components/ToolMenu/Draw/DeleteAllButton/index.tsx
@@ -13,10 +13,10 @@ import {
   useTranslation
 } from 'react-i18next';
 
+import SimpleButton, { SimpleButtonProps } from '@terrestris/react-geo/dist/Button/SimpleButton/SimpleButton';
 import {
-  SimpleButton, useMap
-} from '@terrestris/react-geo';
-import { SimpleButtonProps } from '@terrestris/react-geo/dist/Button/SimpleButton/SimpleButton';
+  useMap
+} from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 import { DigitizeUtil } from '@terrestris/react-util/dist/Util/DigitizeUtil';
 
 const { confirm } = Modal;

diff --git a/src/components/ToolMenu/Draw/StylingDrawerButton/StylingComponent/index.tsx b/src/components/ToolMenu/Draw/StylingDrawerButton/StylingComponent/index.tsx
@@ -5,7 +5,8 @@ import {
   useState
 } from 'react';
 
-import CardStyle, {
+import {
+  CardStyle,
   CardStyleProps
 } from 'geostyler/dist/Component/CardStyle/CardStyle';
 
@@ -30,7 +31,7 @@ import MapUtil from '@terrestris/ol-util/dist/MapUtil/MapUtil';
 
 import {
   useMap
-} from '@terrestris/react-geo/dist/Hook/useMap';
+} from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 
 export type StylingComponentProps = CardStyleProps & {};
 

diff --git a/src/components/ToolMenu/Draw/index.tsx b/src/components/ToolMenu/Draw/index.tsx
@@ -40,10 +40,10 @@ import ToggleGroup from '@terrestris/react-geo/dist/Button/ToggleGroup/ToggleGro
 import UploadButton from '@terrestris/react-geo/dist/Button/UploadButton/UploadButton';
 import {
   useMap
-} from '@terrestris/react-geo/dist/Hook/useMap';
+} from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 import {
   DigitizeUtil
-} from '@terrestris/react-geo/dist/Util/DigitizeUtil';
+} from '@terrestris/react-util/dist/Util/DigitizeUtil';
 
 import './index.less';
 

diff --git a/src/components/ToolMenu/FeatureInfo/FeatureInfoTabs/index.tsx b/src/components/ToolMenu/FeatureInfo/FeatureInfoTabs/index.tsx
@@ -20,7 +20,7 @@ import {
 
 import MapUtil from '@terrestris/ol-util/dist/MapUtil/MapUtil';
 
-import useMap from '@terrestris/react-geo/dist/Hook/useMap';
+import { useMap } from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 
 import {
   PropertyFormItemReadConfig,

diff --git a/src/components/ToolMenu/FeatureInfo/FeaturePropertyGrid/index.tsx b/src/components/ToolMenu/FeatureInfo/FeaturePropertyGrid/index.tsx
@@ -19,7 +19,7 @@ import {
 import MapUtil from '@terrestris/ol-util/dist/MapUtil/MapUtil';
 
 import PropertyGrid from '@terrestris/react-geo/dist/Grid/PropertyGrid/PropertyGrid';
-import useMap from '@terrestris/react-geo/dist/Hook/useMap';
+import { useMap } from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 
 import useHighlightVectorLayer from '../../../../hooks/useHighlightVectorLayer';
 

diff --git a/src/components/ToolMenu/FeatureInfo/PaginationToolbar/index.tsx b/src/components/ToolMenu/FeatureInfo/PaginationToolbar/index.tsx
@@ -40,8 +40,8 @@ import Logger from '@terrestris/base-util/dist/Logger';
 
 import {
   useMap
-} from '@terrestris/react-geo/dist/Hook/useMap';
-import { DigitizeUtil } from '@terrestris/react-geo/dist/Util/DigitizeUtil';
+} from '@terrestris/react-util/dist/Hooks/useMap/useMap';
+import { DigitizeUtil } from '@terrestris/react-util/dist/Util/DigitizeUtil';
 
 import useAppDispatch from '../../../../hooks/useAppDispatch';
 import useAppSelector from '../../../../hooks/useAppSelector';

diff --git a/src/components/ToolMenu/FeatureInfo/index.tsx b/src/components/ToolMenu/FeatureInfo/index.tsx
@@ -23,10 +23,10 @@ import CoordinateInfo, {
   CoordinateInfoProps,
   CoordinateInfoState
 } from '@terrestris/react-geo/dist/CoordinateInfo/CoordinateInfo';
-import { useMap } from '@terrestris/react-geo/dist/Hook/useMap';
+import { useMap } from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 import {
   isWmsLayer, WmsLayer
-} from '@terrestris/react-geo/dist/Util/typeUtils';
+} from '@terrestris/react-util/dist/Util/typeUtils';
 
 import { getBearerTokenHeader } from '@terrestris/shogun-util/dist/security/getBearerTokenHeader';
 

diff --git a/src/components/ToolMenu/LayerTree/LayerTreeContextMenu/index.tsx b/src/components/ToolMenu/LayerTree/LayerTreeContextMenu/index.tsx
@@ -47,10 +47,10 @@ import MapUtil from '@terrestris/ol-util/dist/MapUtil/MapUtil';
 
 import {
   useMap
-} from '@terrestris/react-geo/dist/Hook/useMap';
+} from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 import {
   isWmsLayer
-} from '@terrestris/react-geo/dist/Util/typeUtils';
+} from '@terrestris/react-util/dist/Util/typeUtils';
 
 import {
   DownloadConfig

diff --git a/src/components/ToolMenu/LayerTree/index.tsx b/src/components/ToolMenu/LayerTree/index.tsx
@@ -24,14 +24,14 @@ import {
 
 import MapUtil from '@terrestris/ol-util/dist/MapUtil/MapUtil';
 
-import {
-  useMap
-} from '@terrestris/react-geo/dist/Hook/useMap';
 import RgLayerTree, {
   LayerTreeProps as RgLayerTreeProps
 } from '@terrestris/react-geo/dist/LayerTree/LayerTree';
 import Legend from '@terrestris/react-geo/dist/Legend/Legend';
 import LayerTransparencySlider from '@terrestris/react-geo/dist/Slider/LayerTransparencySlider/LayerTransparencySlider';
+import {
+  useMap
+} from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 
 import LayerType from '@terrestris/shogun-util/dist/model/enum/LayerType';
 import {

diff --git a/src/components/ToolMenu/Measure/index.tsx b/src/components/ToolMenu/Measure/index.tsx
@@ -17,7 +17,7 @@ import MeasureButton from '@terrestris/react-geo/dist/Button/MeasureButton/Measu
 import ToggleGroup from '@terrestris/react-geo/dist/Button/ToggleGroup/ToggleGroup';
 import {
   useMap
-} from '@terrestris/react-geo/dist/Hook/useMap';
+} from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 
 import './index.less';
 

diff --git a/src/components/ToolMenu/index.tsx b/src/components/ToolMenu/index.tsx
@@ -44,7 +44,7 @@ import {
 
 import {
   useMap
-} from '@terrestris/react-geo/dist/Hook/useMap';
+} from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 
 import useAppDispatch from '../../hooks/useAppDispatch';
 import useAppSelector from '../../hooks/useAppSelector';

diff --git a/src/components/UploadDataModal/index.tsx b/src/components/UploadDataModal/index.tsx
@@ -49,7 +49,7 @@ import MapUtil from '@terrestris/ol-util/dist/MapUtil/MapUtil';
 
 import {
   useMap
-} from '@terrestris/react-geo/dist/Hook/useMap';
+} from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 
 import Layer from '@terrestris/shogun-util/dist/model/Layer';
 import SHOGunApplicationUtil from '@terrestris/shogun-util/dist/parser/SHOGunApplicationUtil';

diff --git a/src/components/UserMenu/index.tsx b/src/components/UserMenu/index.tsx
@@ -27,15 +27,14 @@ import {
   useTranslation
 } from 'react-i18next';
 
-import UserChip from '@terrestris/react-geo/dist/UserChip/UserChip';
-
 import useAppSelector from '../../hooks/useAppSelector';
 import useSHOGunAPIClient from '../../hooks/useSHOGunAPIClient';
 import {
   getGravatarUrl
 } from '../../utils/getGravatarUrl';
 
 import ApplicationInfo from '../ApplicationInfo';
+import UserChip from '../UserChip';
 
 import './index.less';