fix imports

OpenRailAssociation · Feb 12, 2025 · 7cba244 · 7cba244
1 parent cdc9f81
commit 7cba244
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/ui-warped-map/src/components/BaseMap.tsx b/ui-warped-map/src/components/BaseMap.tsx
@@ -1,9 +1,9 @@
 import React, { type PropsWithChildren, useEffect, useMemo, useState } from 'react';
 
-import { type StyleSpecification } from '@maplibre/maplibre-gl-style-spec';
 import { bbox } from '@turf/bbox';
 import { featureCollection } from '@turf/helpers';
 import type { Feature, LineString } from 'geojson';
+import { type StyleSpecification } from 'maplibre-gl';
 import ReactMapGL, { Layer, type LayerProps, type MapRef, Source } from 'react-map-gl/maplibre';
 
 import { bboxAs2D } from '../core/helpers';

diff --git a/ui-warped-map/src/components/DataLoader.tsx b/ui-warped-map/src/components/DataLoader.tsx
@@ -1,8 +1,8 @@
 import React, { useEffect, useState } from 'react';
 
-import { type StyleSpecification } from '@maplibre/maplibre-gl-style-spec';
 import { featureCollection } from '@turf/helpers';
 import type { Feature, FeatureCollection } from 'geojson';
+import { type StyleSpecification } from 'maplibre-gl';
 import { createPortal } from 'react-dom';
 import ReactMapGL, { Layer, type LayerProps, type MapRef, Source } from 'react-map-gl/maplibre';
 

diff --git a/ui-warped-map/src/components/TransformedDataMap.tsx b/ui-warped-map/src/components/TransformedDataMap.tsx
@@ -1,13 +1,13 @@
 import React, { type PropsWithChildren, useEffect, useMemo, useState } from 'react';
 
-import { type StyleSpecification } from '@maplibre/maplibre-gl-style-spec';
 import { featureCollection } from '@turf/helpers';
 import type { Feature, FeatureCollection, LineString } from 'geojson';
 import { omit } from 'lodash';
+import { type StyleSpecification } from 'maplibre-gl';
 import ReactMapGL, {
   Layer,
   type LayerProps,
-  type LineLayer,
+  type LineLayerSpecification,
   type MapRef,
   Source,
 } from 'react-map-gl/maplibre';
@@ -21,7 +21,7 @@ type TransformedDataMapProps = {
   sources: SourceDefinition[];
   transformedData: Record<string, FeatureCollection>;
   path?: Feature<LineString>;
-  pathLayer?: Omit<LineLayer, 'source-layer'>;
+  pathLayer?: Omit<LineLayerSpecification, 'source-layer'>;
   log?: boolean;
 };
 

diff --git a/ui-warped-map/src/components/WarpedMap.tsx b/ui-warped-map/src/components/WarpedMap.tsx
@@ -1,10 +1,10 @@
 import React, { type ComponentType, type PropsWithChildren, useEffect, useState } from 'react';
 
-import { type StyleSpecification } from '@maplibre/maplibre-gl-style-spec';
 import { bbox } from '@turf/bbox';
 import type { Feature, FeatureCollection, LineString } from 'geojson';
 import { isNil, mapValues, omitBy } from 'lodash';
-import { type LineLayer } from 'react-map-gl/maplibre';
+import { type StyleSpecification } from 'maplibre-gl';
+import { type LineLayerSpecification } from 'react-map-gl/maplibre';
 
 import DataLoader from './DataLoader';
 import Loader from './Loader';
@@ -30,7 +30,7 @@ const DEFAULT_COMPONENTS: Components = {
 
 type WarpedMapProps = {
   path: Feature<LineString>;
-  pathLayer?: Omit<LineLayer, 'source-layer'>;
+  pathLayer?: Omit<LineLayerSpecification, 'source-layer'>;
   sources: SourceDefinition[];
   components?: Partial<Components>;
   mapStyle?: string | StyleSpecification;

diff --git a/ui-warped-map/src/stories/Algorithms.tsx b/ui-warped-map/src/stories/Algorithms.tsx
@@ -2,7 +2,7 @@ import React, { useMemo } from 'react';
 
 import { featureCollection } from '@turf/helpers';
 import type { Feature, LineString } from 'geojson';
-import { Layer, type LineLayer, Source } from 'react-map-gl/maplibre';
+import { Layer, type LineLayerSpecification, Source } from 'react-map-gl/maplibre';
 
 import { OSM_BASE_MAP_STYLE, OSM_SOURCE } from './helpers';
 import BaseMap from '../components/BaseMap';
@@ -14,7 +14,7 @@ import { useAsyncMemo } from '../core/useAsyncMemo';
 
 const SOURCES: SourceDefinition[] = [OSM_SOURCE];
 
-const PATH_LAYER: Omit<LineLayer, 'source-layer'> = {
+const PATH_LAYER: Omit<LineLayerSpecification, 'source-layer'> = {
   id: 'path-layer',
   source: 'path',
   type: 'line',

diff --git a/ui-warped-map/src/stories/SampleMap.tsx b/ui-warped-map/src/stories/SampleMap.tsx
@@ -3,7 +3,7 @@ import React, { useMemo } from 'react';
 import { featureCollection } from '@turf/helpers';
 import type { Feature, LineString } from 'geojson';
 import 'maplibre-gl/dist/maplibre-gl.css';
-import { Layer, type LineLayer, Source } from 'react-map-gl/maplibre';
+import { Layer, type LineLayerSpecification, Source } from 'react-map-gl/maplibre';
 
 import { OSM_BASE_MAP_STYLE, OSM_SOURCE } from './helpers';
 import BaseMap from '../components/BaseMap';
@@ -14,7 +14,7 @@ import { useAsyncMemo } from '../core/useAsyncMemo';
 
 const SOURCES: SourceDefinition[] = [OSM_SOURCE];
 
-const PATH_LAYER: Omit<LineLayer, 'source-layer'> = {
+const PATH_LAYER: Omit<LineLayerSpecification, 'source-layer'> = {
   id: 'path-layer',
   source: 'path',
   type: 'line',

diff --git a/ui-warped-map/src/stories/helpers.ts b/ui-warped-map/src/stories/helpers.ts
@@ -1,4 +1,4 @@
-import { type StyleSpecification } from '@maplibre/maplibre-gl-style-spec';
+import { type StyleSpecification } from 'maplibre-gl';
 import { type LayerProps } from 'react-map-gl';
 
 import { type SourceDefinition } from '../core/types';