fix: cleanup imports

geostyler · Jun 19, 2024 · 605ccc7 · 605ccc7
1 parent 0174151
commit 605ccc7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/src/OlStyleParser.ts b/src/OlStyleParser.ts
@@ -46,7 +46,7 @@ import { METERS_PER_UNIT } from 'ol/proj/Units';
 
 import OlStyleUtil from './Util/OlStyleUtil';
 import { toContext } from 'ol/render';
-import { Feature as OlFeature } from 'ol';
+import OlFeature from 'ol/Feature';
 
 export interface OlParserStyleFct {
   (feature?: any, resolution?: number): any;

diff --git a/src/Util/OlStyleUtil.ts b/src/Util/OlStyleUtil.ts
@@ -1,22 +1,29 @@
 import {
   Expression,
+  MarkSymbolizer,
+  PropertyType,
+  Style,
+  TextSymbolizer
+} from 'geostyler-style/dist/style';
+
+import {
   Fcase,
   GeoStylerBooleanFunction,
   GeoStylerFunction,
   GeoStylerNumberFunction,
   GeoStylerStringFunction,
   GeoStylerUnknownFunction,
+} from 'geostyler-style/dist/functions';
+
+import {
   isGeoStylerBooleanFunction,
   isGeoStylerFunction,
   isGeoStylerNumberFunction,
   isGeoStylerStringFunction,
-  isGeoStylerUnknownFunction,
-  MarkSymbolizer,
-  PropertyType,
-  Style,
-  TextSymbolizer
-} from 'geostyler-style';
-import { Feature as OlFeature } from 'ol';
+  isGeoStylerUnknownFunction
+} from 'geostyler-style/dist/typeguards';
+
+import OlFeature from 'ol/Feature';
 import { colors } from './colors';
 
 const WELLKNOWNNAME_TTF_REGEXP = /^ttf:\/\/(.+)#(.+)$/;