fix(typing): Fix typing issues in geometry controls (#999)

infra-geo-ouverte · Mar 17, 2022 · c167a77 · c167a77
1 parent e726b0b
commit c167a77
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/packages/geo/src/lib/geometry/shared/controls/draw.ts b/packages/geo/src/lib/geometry/shared/controls/draw.ts
@@ -1,7 +1,6 @@
 import { EventsKey } from 'ol/events';
 import OlMap from 'ol/Map';
-import OlFeature from 'ol/Feature';
-import * as OlStyle from 'ol/style';
+import { StyleLike as OlStyleLike } from 'ol/style/Style';
 import type { default as OlGeometryType } from 'ol/geom/GeometryType';
 import OlVectorSource from 'ol/source/Vector';
 import OlVectorLayer from 'ol/layer/Vector';
@@ -23,8 +22,8 @@ export interface DrawControlOptions {
   geometryType: typeof OlGeometryType | string;
   drawingLayerSource?: OlVectorSource<OlGeometry>;
   drawingLayer?: OlVectorLayer<OlVectorSource<OlGeometry>>;
-  drawingLayerStyle?: OlStyle.Style | ((olFeature: OlFeature<OlGeometry>) => OlStyle.Style);
-  interactionStyle?: OlStyle.Style | ((olFeature: OlFeature<OlGeometry>) => OlStyle.Style);
+  drawingLayerStyle?: OlStyleLike;
+  interactionStyle?: OlStyleLike;
   maxPoints?: number;
 }
 

diff --git a/packages/geo/src/lib/geometry/shared/controls/modify.ts b/packages/geo/src/lib/geometry/shared/controls/modify.ts
@@ -1,6 +1,7 @@
 import OlMap from 'ol/Map';
 import OlFeature from 'ol/Feature';
 import * as OlStyle from 'ol/style';
+import { StyleLike as OlStyleLike } from 'ol/style/Style';
 import OlVectorSource from 'ol/source/Vector';
 import OlVectorLayer from 'ol/layer/Vector';
 import OlModify from 'ol/interaction/Modify';
@@ -31,9 +32,8 @@ import {
 export interface ModifyControlOptions {
   source?: OlVectorSource<any>;
   layer?: OlVectorLayer<any>;
-  layerStyle?: OlStyle.Style | ((olfeature: OlFeature<any>) => OlStyle.Style);
-  drawStyle?: OlStyle.Style | ((olfeature: OlFeature<any>) => OlStyle.Style) | OlStyle.Circle |
-    ((olfeature: OlFeature<OlGeometry>) => OlStyle.Circle);
+  layerStyle?: OlStyleLike;
+  drawStyle?: OlStyleLike;
   modify?: boolean;
   translate?: boolean;
 }

diff --git a/packages/geo/src/lib/geometry/shared/controls/slice.ts b/packages/geo/src/lib/geometry/shared/controls/slice.ts
@@ -1,6 +1,6 @@
 import OlMap from 'ol/Map';
 import OlFeature from 'ol/Feature';
-import OlStyle from 'ol/style/Style';
+import { StyleLike as OlStyleLike } from 'ol/style/Style';
 import OlVectorSource from 'ol/source/Vector';
 import OlVectorLayer from 'ol/layer/Vector';
 import type { default as OlGeometry } from 'ol/geom/Geometry';
@@ -15,8 +15,8 @@ import { DrawControl } from './draw';
 export interface SliceControlOptions {
   source?: OlVectorSource<OlGeometry>;
   layer?: OlVectorLayer<OlVectorSource<OlGeometry>>;
-  layerStyle?: OlStyle | ((olfeature: OlFeature<OlGeometry>) => OlStyle);
-  drawStyle?: OlStyle | ((olfeature: OlFeature<OlGeometry>) => OlStyle);
+  layerStyle?: OlStyleLike;
+  drawStyle?: OlStyleLike;
 }
 
 /**