From 5d21d665892ba786c782d64f6a894f362f0ce1a0 Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Tue, 5 Oct 2021 14:08:55 +0200 Subject: [PATCH] More type fixes --- .../aol/item-vector-source/item-vector-source.component.ts | 6 +++--- projects/common-map/src/fm-map/models/style.cache.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/common-map/src/fm-map/components/aol/item-vector-source/item-vector-source.component.ts b/projects/common-map/src/fm-map/components/aol/item-vector-source/item-vector-source.component.ts index 5d60072..696e32f 100644 --- a/projects/common-map/src/fm-map/components/aol/item-vector-source/item-vector-source.component.ts +++ b/projects/common-map/src/fm-map/components/aol/item-vector-source/item-vector-source.component.ts @@ -57,7 +57,7 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements getSelectedStyle(feature:Feature):style.Style { let key = feature.get('itemType')+"_selected"; - let evaluatedStyle: style.Style | (Feature) =undefined; + let evaluatedStyle: style.Style =undefined; var styleEntry = this.stylesCache[key]; if(styleEntry) { if(typeof styleEntry === 'function') { @@ -66,10 +66,10 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements evaluatedStyle = styleEntry; } } else { - evaluatedStyle = this.stylesCache["selected"]; + evaluatedStyle = this.stylesCache["selected"] as style.Style; } if(evaluatedStyle ) { - evaluatedStyle.setGeometry((feature) => this.geometry(feature)); + evaluatedStyle .setGeometry((feature:Feature) => this.geometry(feature)); } return evaluatedStyle as style.Style } diff --git a/projects/common-map/src/fm-map/models/style.cache.ts b/projects/common-map/src/fm-map/models/style.cache.ts index e464d15..9611d6e 100644 --- a/projects/common-map/src/fm-map/models/style.cache.ts +++ b/projects/common-map/src/fm-map/models/style.cache.ts @@ -3,5 +3,5 @@ import { Style } from 'ol/style'; import {Geometry } from 'ol/geom'; export interface IStyles{ - [id: string]: Style | (Feature); + [id: string]: Style | ((featue:Feature) => Style); }; \ No newline at end of file