Refactoring types

2021-10-05 13:46:10 +02:00
parent 4ef077f8d7
commit 160eb10aba
31 changed files with 118 additions and 102 deletions
--- a/projects/common-map/src/fm-map/components/aol/file-drop-target/file-drop-target.component.ts
+++ b/projects/common-map/src/fm-map/components/aol/file-drop-target/file-drop-target.component.ts
@@ -4,7 +4,7 @@ import { MapComponent } from 'ngx-openlayers';
 import * as proj  from 'ol/proj';
 import {Point,Geometry} from 'ol/geom';
 import { GeoJSON } from 'ol/format';
-import { Feature } from 'ol';
+import { Feature} from 'ol';

 export interface IDroppedFile {
  files: any,
@@ -21,7 +21,7 @@ export class FileDropTargetComponent implements OnInit, OnDestroy {
  element: Element;
  @Output() onFileDropped = new EventEmitter<IDroppedFile>();
  @Input() parentCode: string;
-  @Input() features: Array<Feature>;
+  @Input() features: Array<Feature<Geometry>>;

  constructor(private map: MapComponent) {
  }
--- a/projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.ts
+++ b/projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, Input, ViewChild, ElementRef, OnChanges, SimpleChanges ,Host} from '@angular/core';
 import { MapComponent } from 'ngx-openlayers';
-import Overlay from 'ol/Overlay';
+import  Overlay  from 'ol/Overlay';
 import { fromLonLat, toLonLat } from 'ol/proj';


@@ -52,7 +52,7 @@ export class GpsLocation  implements OnInit,OnChanges{
    this.rotate = "rotate(" + Math.round(this.heading) + " 500 500)";
    this.locTolerancePixels = this.locationTolerance;
    this.map.instance.addOverlay(this.instance);
-    this.map.instance.getView().on('change:resolution', (evt) => {
+    this.map.instance.getView().on('change:resolution', (evt:any) => {
      this.resolution = evt.target.get('resolution');
      this.recalcLocationTolerance();
    });
--- a/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts
+++ b/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts
@@ -10,12 +10,14 @@ import * as proj from 'ol/proj';
 import * as loadingstrategy from 'ol/loadingstrategy';
 import * as style from 'ol/style';
 import {Tile,Layer,Image} from 'ol/layer';
-import {XYZ,ImageStatic,OSM,BingMaps,TileWMS,TileArcGISRest,TileJSON} from 'ol/source';
+import {XYZ,ImageStatic,OSM,BingMaps,TileWMS,TileArcGISRest,TileJSON,Source} from 'ol/source';
 import {Vector as VectorSource} from 'ol/source';
 import { Vector as VectorLayer } from 'ol/layer';
 import VectorTileSource from 'ol/source/VectorTile';
 import VectorTileLayer from 'ol/layer/VectorTile';
 import {GeoJSON,MVT} from 'ol/format';
+import { Geometry } from 'ol/geom';
+import TileSource from 'ol/source/Tile';

@Component({
  selector: 'fm-map-item-layers',
@@ -34,7 +36,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
  private initialized:boolean = false;
  private mapEventHandlerInstalled = false;
  private selectedFeatures = {};
-  private selectionLayer:Layer = null;
+  private selectionLayer:Layer<Source> = null;
  
  constructor(private itemService: ItemService, private map: MapComponent, public appConfig: AppConfig) {
    super(map);
@@ -119,9 +121,9 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
    return this.styleCache[key];
  }

-  createGeotiffLayer(item:IItem,itemLayer:IItemLayer):Layer {
+  createGeotiffLayer(item:IItem,itemLayer:IItemLayer):Layer<Source> {
    var layerIndex = -1;
-    var layer: Layer = null;  
+    var layer: Layer<Source> = null;  
    layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : item.data.layers[0].index;
    let source = new XYZ({ maxZoom: 19, minZoom: 1, url: `${this._apiEndPoint}/api/v1/items/${item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${Date.parse(item.updated)}` });
    layer = new Tile({ source: source });
@@ -142,9 +144,9 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
    return layer;
  }

-  createShapeLayer(item:IItem,itemLayer:IItemLayer):Layer {
+  createShapeLayer(item:IItem,itemLayer:IItemLayer):Layer<Source> {
    var layerIndex = -1;
-    var layer: Layer = null; 
+    var layer: Layer<Source> = null; 
    layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : item.data.layers[0].index;
    var data = item.data;
    var l:ILayer = (data && data.layers && data.layers.length > 0) ? data.layers[layerIndex] : null;
@@ -177,7 +179,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
      let source = new VectorSource({
        strategy: loadingstrategy.bbox,
        loader: function (extent: Extent, resolution: number, projection: Projection) {
-          var source = this as VectorSource;
+          var source = this as VectorSource<Geometry>;
          __this.itemService.getItemFeatures(item.code, extent, projection.getCode(), layerIndex).subscribe(function (data) {
            var features = format.readFeatures(data);
            for (let f of features) {
@@ -230,16 +232,16 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
    return layer;
  }

-  createSelectionLayer(itemLayer:IItemLayer):Layer {
+  createSelectionLayer(itemLayer:IItemLayer):Layer<Source> {
    var layerIndex = -1;
-    var layer: Layer = null; 
+    var layer: Layer<Source> = null; 
    layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : itemLayer.item.data.layers[0].index;
    var data = itemLayer.item.data;
    var l:ILayer = (data && data.layers && data.layers.length > 0) ? data.layers[layerIndex] : null;
    if (l && l.rendering && l.rendering.renderoutputType == "VectorTiles") {
      return new VectorTileLayer({
        renderMode: 'vector',
-        source: itemLayer.layer.getSource(),
+        source: (itemLayer.layer as VectorTileLayer).getSource(),
        style: (feature) => {
          if (feature.getId() in this.selectedFeatures) {

@@ -260,9 +262,9 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
    return null;
  }

-  createExternalLayer(item:IItem,itemLayer:IItemLayer):Layer {
+  createExternalLayer(item:IItem,itemLayer:IItemLayer):Layer<Source> {
    let data = item.data as ILayerData;
-    var layer: Layer = null; 
+    var layer: Layer<Source> = null; 
    switch (data.interfaceType) {
      case 'OSM': {
        let source = new OSM();
@@ -312,8 +314,8 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
    return layer;
  }

-  createLayer(itemLayer: IItemLayer): Layer {
-    var layer: Layer = null;   
+  createLayer(itemLayer: IItemLayer): Layer<Source> {
+    var layer: Layer<Source> = null;   
    var layerIndex = -1;
    if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.geotiff.processed') {
      layer = this.createGeotiffLayer(itemLayer.item,itemLayer);
@@ -360,7 +362,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
    }
  }

-  addOrUpdateOlLayer(itemLayer:IItemLayer,index:number):Layer {
+  addOrUpdateOlLayer(itemLayer:IItemLayer,index:number):Layer<Source> {
    if(!itemLayer) return null;
    var olLayers = this.instance.getLayers();
    var layer = itemLayer.layer;
@@ -385,7 +387,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
  }

  updateLayers(itemLayers: IItemLayer[]) {
-    let newLayers: IItemLayer[] = [];
+    let newLayers: Layer<Source>[] = [];
    if (itemLayers) {
      itemLayers.forEach((itemLayer, index) => {
        if(itemLayer.item.itemType ==  'vnd.farmmaps.itemtype.temporal') {
--- 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
@@ -3,14 +3,14 @@ import { LayerVectorComponent, SourceVectorComponent, MapComponent } from 'ngx-o
 import { ItemService,ItemTypeService,IItem, IItemType } from '@farmmaps/common';

 import { Feature } from 'ol';
-import { Point } from 'ol/geom';
+import { Point,Geometry } from 'ol/geom';
 import { MapBrowserEvent } from 'ol';
 import * as style from 'ol/style';
 import * as color from 'ol/color';
 import * as loadingstrategy from 'ol/loadingstrategy';
 import * as condition from 'ol/events/condition';
 import * as extent from 'ol/extent';
-import {Vector,Cluster} from 'ol/source';
+import {Vector,Cluster,Source} from 'ol/source';
 import {Layer} from 'ol/layer';
 import {GeoJSON} from 'ol/format';
 import {Select} from 'ol/interaction';
@@ -25,17 +25,17 @@ import {FeatureIconService} from '../../../services/feature-icon.service';
  ]
 })
 export class ItemVectorSourceComponent extends SourceVectorComponent implements OnInit, OnChanges {
-  instance: Vector;
+  instance: Vector<Geometry>;
  private _format: GeoJSON;
  private _select: Select;
  private _hoverSelect: Select;
  private _iconScale: number = 0.05;
-  @Input() features: Array<Feature>;
-  @Input() selectedFeature: Feature;
+  @Input() features: Array<Feature<Geometry>>;
+  @Input() selectedFeature: Feature<Geometry>;
  @Input() selectedItem: IItem;
  @Input() styles:IStyles;
-  @Output() onFeatureSelected: EventEmitter<Feature> = new EventEmitter<Feature>();
-  @Output() onFeatureHover: EventEmitter<Feature> = new EventEmitter<Feature>();
+  @Output() onFeatureSelected: EventEmitter<Feature<Geometry>> = new EventEmitter<Feature<Geometry>>();
+  @Output() onFeatureHover: EventEmitter<Feature<Geometry>> = new EventEmitter<Feature<Geometry>>();
  private stylesCache:IStyles = {};

  constructor(@Host() private layer: LayerVectorComponent, private itemService: ItemService, private map: MapComponent, private itemTypeService: ItemTypeService,private featureIconService$:FeatureIconService) {
@@ -43,7 +43,7 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
    this._format = new GeoJSON();
  }  

-  geometry(feature: Feature) {
+  geometry(feature: Feature<Geometry>) {
    let view = this.map.instance.getView();
    let resolution = view.getResolution();
    var geometry = feature.getGeometry();
@@ -55,9 +55,9 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
    return geometry;
   }

-  getSelectedStyle(feature:Feature):style.Style {
+  getSelectedStyle(feature:Feature<Geometry>):style.Style {
    let key = feature.get('itemType')+"_selected";
-    let evaluatedStyle =null;
+    let evaluatedStyle: style.Style | (Feature<Geometry>) =undefined;
    var styleEntry = this.stylesCache[key];    
    if(styleEntry) {
      if(typeof styleEntry === 'function')  {
@@ -71,7 +71,7 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
    if(evaluatedStyle ) {
      evaluatedStyle.setGeometry((feature) => this.geometry(feature));
    } 
-    return evaluatedStyle
+    return evaluatedStyle as style.Style
  }

  ngOnInit() {
@@ -80,17 +80,17 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
    this._select = new Select({
      style:null,
      hitTolerance: 10,
-      layers: [this.layer.instance as Layer]
+      layers: [this.layer.instance as Layer<Source>]
    });
    this._hoverSelect = new Select({
-      style: (feature) => {        
+      style: (feature:Feature<Geometry>) => {        
        return this.getSelectedStyle(feature);
      },
      hitTolerance: 10,
      condition: (e: MapBrowserEvent) => {
        return e.type == 'pointermove';
      },
-      layers: [this.layer.instance as Layer]
+      layers: [this.layer.instance as Layer<Source>]
    });
    this.map.instance.addInteraction(this._select);
    this.map.instance.addInteraction(this._hoverSelect);      
@@ -132,7 +132,7 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
              fill: new style.Fill({
                color: fillColor
              }),
-              geometry:(feature) => this.geometry(feature)
+              geometry:(feature:Feature<Geometry>) => this.geometry(feature)
            });                   
        } else {
          key = 'file';
--- a/projects/common-map/src/fm-map/components/aol/layer-vector-image/layer-vector-image.component.ts
+++ b/projects/common-map/src/fm-map/components/aol/layer-vector-image/layer-vector-image.component.ts
@@ -1,8 +1,5 @@
-import { Component, OnDestroy, OnInit, Input, Optional, OnChanges, SimpleChanges } from '@angular/core';
-import { Vector } from 'ol/layer';
-import { Style } from 'ol/style';
-import { StyleFunction } from 'ol/style/Style';
-import { LayerVectorComponent, LayerGroupComponent, MapComponent } from 'ngx-openlayers';
+import { Component, OnDestroy, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core';
+import { LayerVectorComponent, MapComponent } from 'ngx-openlayers';
 import { RenderType  } from 'ol/layer/Vector';

@Component({
@@ -12,7 +9,7 @@ import { RenderType  } from 'ol/layer/Vector';
  `,
 })
 export class LayerVectorImageComponent extends LayerVectorComponent implements OnInit, OnDestroy, OnChanges {
-  public source: Vector;
+  //public source: Vector;

  @Input()
  renderMode: RenderType | string = "image";  
--- a/projects/common-map/src/fm-map/components/feature-list-container/feature-list-container.component.ts
+++ b/projects/common-map/src/fm-map/components/feature-list-container/feature-list-container.component.ts
@@ -1,5 +1,6 @@
 import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject} from '@angular/core';
 import { Feature } from 'ol';
+import { Geometry} from 'ol/geom';
 import { FeatureListComponent,AbstractFeatureListComponent } from '../feature-list/feature-list.component';
 import { WidgetHostDirective } from '../widget-host/widget-host.directive';
 import  {IQueryState,PackageService } from '@farmmaps/common';
@@ -20,10 +21,10 @@ export class FeatureListContainerComponent {
    this.featureLists = [...this.featureLists].reverse();
  }

-  @Input() features: Array<Feature>
+  @Input() features: Array<Feature<Geometry>>
  @Input() queryState: IQueryState;
-  @Input() selectedFeature: Feature;
-  @Input() clickedFeature:Observable<Feature>;
+  @Input() selectedFeature: Feature<Geometry>;
+  @Input() clickedFeature:Observable<Feature<Geometry>>;

  @ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective; 
  componentRef:any;
--- a/projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.ts
+++ b/projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.ts
@@ -9,6 +9,7 @@ import * as mapActions from '../../actions/map.actions';
 import { tassign } from 'tassign';
 import { Router } from '@angular/router';
 import { Feature } from 'ol';
+import { Geometry} from 'ol/geom';

@ForItemType("vnd.farmmaps.itemtype.croppingscheme")
@Injectable()
@@ -23,7 +24,7 @@ export class FeatureListCroppingschemeComponent extends AbstractFeatureListCompo
        super(store, itemTypeService, location);
    }

-    getAction(feature:Feature):Action {
+    getAction(feature:Feature<Geometry>):Action {
        var queryState = tassign(mapReducers.initialState.queryState, { parentCode: feature.get('code'), itemType: "vnd.farmmaps.itemtype.cropfield" });
        return new mapActions.DoQuery(queryState);
    }
--- a/projects/common-map/src/fm-map/components/feature-list-feature-container/feature-list-feature-container.component.ts
+++ b/projects/common-map/src/fm-map/components/feature-list-feature-container/feature-list-feature-container.component.ts
@@ -1,5 +1,6 @@
 import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject, Type} from '@angular/core';
 import { Feature } from 'ol';
+import { Geometry } from 'ol/geom';
 import { AbstractFeatureListFeatureComponent,FeatureListFeatureComponent } from '../feature-list-feature/feature-list-feature.component';
 import { WidgetHostDirective } from '../widget-host/widget-host.directive';

@@ -18,7 +19,7 @@ export class FeatureListFeatureContainerComponent {
    this.featureLists = [...this.featureLists].reverse();
  }

-  @Input() feature: Feature;
+  @Input() feature: Feature<Geometry>;

  @ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective; 

--- a/projects/common-map/src/fm-map/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.ts
+++ b/projects/common-map/src/fm-map/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.ts
@@ -1,5 +1,6 @@
 import { Component, Injectable,ViewChild,AfterViewInit} from '@angular/core';
 import { Feature } from 'ol';
+import { Geometry } from 'ol/geom';
 import { Store } from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
 import { commonReducers,ItemTypeService,AppConfig } from '@farmmaps/common';
@@ -23,11 +24,11 @@ export class FeatureListFeatureCropfieldComponent extends AbstractFeatureListFea
    super(store, itemTypeService,config);
  }

-  areaInHa(feature:Feature):number {
+  areaInHa(feature:Feature<Geometry>):number {
    if(!feature) return 0;
    // get area from faeture if 0 calculate from polygon
    let a = feature.get('area');
    if(a) return a;
-    return  getArea(feature.getGeometry(),{projectio:"EPSG:3857"}) / 10000;
+    return  getArea(feature.getGeometry(),{projection:"EPSG:3857"}) / 10000;
  }
 }
--- a/projects/common-map/src/fm-map/components/feature-list-feature/feature-list-feature.component.ts
+++ b/projects/common-map/src/fm-map/components/feature-list-feature/feature-list-feature.component.ts
@@ -1,5 +1,6 @@
 import { Component, Input, Injectable,Directive} from '@angular/core';
 import { Feature } from 'ol';
+import { Geometry } from 'ol/geom';
 import { Store } from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
 import { commonReducers,ItemTypeService,AppConfig } from '@farmmaps/common';
@@ -9,7 +10,7 @@ import { commonReducers,ItemTypeService,AppConfig } from '@farmmaps/common';
@Injectable()
@Directive()
 export abstract class AbstractFeatureListFeatureComponent {
-  @Input() feature: Feature
+  @Input() feature: Feature<Geometry>

  constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService,public config:AppConfig) {
  } 
--- a/projects/common-map/src/fm-map/components/feature-list/feature-list.component.ts
+++ b/projects/common-map/src/fm-map/components/feature-list/feature-list.component.ts
@@ -1,6 +1,7 @@
 import { Component, Input, Injectable,Directive,SimpleChanges } from '@angular/core';
 import { Location } from '@angular/common';
 import { Feature } from 'ol';
+import { Geometry} from 'ol/geom';
 import { Store,Action} from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
 import { commonReducers,ItemTypeService, IItem, Item } from '@farmmaps/common';
@@ -14,20 +15,20 @@ import { IQueryState } from '@farmmaps/common';
@Injectable()
@Directive()
 export abstract class AbstractFeatureListComponent {
-  @Input() features: Array<Feature>;
+  @Input() features: Array<Feature<Geometry>>;
  @Input() queryState: IQueryState;
-  @Input() selectedFeature: Feature;
+  @Input() selectedFeature: Feature<Geometry>;
  constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService, private location: Location) {
  }

-  handleFeatureClick(feature:Feature) {
+  handleFeatureClick(feature:Feature<Geometry>) {
    if(feature) {
      let action = this.getAction(feature);
      this.store.dispatch(action);  
    }
  }

-  getAction(feature:Feature):Action {
+  getAction(feature:Feature<Geometry>):Action {
      var newQuery: any = tassign(mapReducers.initialState.queryState);
      newQuery.parentCode = feature.get('parentCode');
      newQuery.itemCode = feature.get('code');
@@ -48,7 +49,7 @@ export abstract class AbstractFeatureListComponent {
    this.location.back();
  }

-  isFeatureSelected(feature:Feature):boolean {
+  isFeatureSelected(feature:Feature<Geometry>):boolean {
    if(!this.selectedFeature) return false;
    return feature.getId() == this.selectedFeature.getId();
  }  
--- a/projects/common-map/src/fm-map/components/feature-thumbnail/feature-thumbnail.component.ts
+++ b/projects/common-map/src/fm-map/components/feature-thumbnail/feature-thumbnail.component.ts
@@ -16,7 +16,7 @@ export class GeometryThumbnailComponent implements OnInit {

  @ViewChild('canvas') canvas;
  @ViewChild('container') container;
-  @Input('feature') feature:Feature;
+  @Input('feature') feature:Feature<Geometry>;

  ngOnInit(): void {
  }
--- a/projects/common-map/src/fm-map/components/if-zoom-to-show/if-zoom-to-show.directive.ts
+++ b/projects/common-map/src/fm-map/components/if-zoom-to-show/if-zoom-to-show.directive.ts
@@ -1,5 +1,6 @@
 import { Directive, ViewContainerRef,TemplateRef,OnInit,Input, OnChanges } from '@angular/core';
-import { layer } from 'ol';
+import { Layer } from 'ol/layer';
+import { Source } from 'ol/source';
 import { MapComponent } from 'ngx-openlayers';

@Directive({
@@ -7,7 +8,7 @@ import { MapComponent } from 'ngx-openlayers';
 })
 export class ifZoomToShowDirective  implements OnInit {
  @Input() 
-  set fmMapIfZoomToShow(layer:layer) {
+  set fmMapIfZoomToShow(layer:Layer<Source>) {
    this.layer$=layer;
    this.checkZoom();
  }
@@ -24,7 +25,7 @@ export class ifZoomToShowDirective  implements OnInit {
    this.checkZoom();
  }
  
-  private layer$:layer;
+  private layer$:Layer<Source>;
  private thenTemplate$:TemplateRef<any>;
  private elseTemplate$:TemplateRef<any>;
  private showView = false;
--- a/projects/common-map/src/fm-map/components/map/map.component.ts
+++ b/projects/common-map/src/fm-map/components/map/map.component.ts
@@ -29,6 +29,7 @@ import {commonReducers} from '@farmmaps/common';
 import {commonActions} from '@farmmaps/common';

 import {Feature} from 'ol';
+import {Geometry} from 'ol/geom';
 import {Extent,createEmpty,extend } from 'ol/extent';
 import {transform} from 'ol/proj';
 import { tassign } from 'tassign';
@@ -46,7 +47,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
  public openedModalName$: Observable<string> = this.store.select(commonReducers.selectOpenedModalName);
  public itemTypes$: Observable<{ [id: string]: IItemType }>;
  public mapState$: Observable<IMapState> = this.store.select(mapReducers.selectGetMapState);
-  public features$: Observable<Array<Feature>> = this.store.select(mapReducers.selectGetFeatures);
+  public features$: Observable<Array<Feature<Geometry>>> = this.store.select(mapReducers.selectGetFeatures);
  public overlayLayers$: Observable<Array<IItemLayer>> = this.store.select(mapReducers.selectGetOverlayLayers);
  public selectedOverlayLayer$: Observable<IItemLayer> = this.store.select(mapReducers.selectGetSelectedOverlayLayer);
  public selectedItemLayer$: Observable<IItemLayer> = this.store.select(mapReducers.selectGetSelectedItemLayer);
@@ -63,8 +64,8 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
  public parentCode$: Observable<string> =this.store.select(mapReducers.selectGetParentCode);
  public panelVisible$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelVisible);
  public panelCollapsed$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelCollapsed);
-  public selectedFeature$: Observable<Feature> = this.store.select(mapReducers.selectGetSelectedFeature);
-  public clickedFeature: Subject<Feature> = new Subject<Feature>();
+  public selectedFeature$: Observable<Feature<Geometry>> = this.store.select(mapReducers.selectGetSelectedFeature);
+  public clickedFeature: Subject<Feature<Geometry>> = new Subject<Feature<Geometry>>();
  public selectedItem$: Observable<IItem> = this.store.select(mapReducers.selectGetSelectedItem);
  public parentItem$: Observable<IItem> =this.store.select(mapReducers.selectGetParentItem);
  public queryState$: Observable<IQueryState> = this.store.select(mapReducers.selectGetQueryState);
@@ -163,11 +164,11 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
    this.uploadService.addFiles(droppedFile.files, droppedFile.event, { parentCode:droppedFile.parentCode, geometry:droppedFile.geometry });
  }

-  handleFeatureClick(feature: Feature) {
+  handleFeatureClick(feature: Feature<Geometry>) {
    this.clickedFeature.next(feature);
  }

-  handleFeatureHover(feature: Feature) {
+  handleFeatureHover(feature: Feature<Geometry>) {
    this.store.dispatch(new mapActions.SelectFeature(feature));
  }

--- a/projects/common-map/src/fm-map/components/zoom-to-show-alert/zoom-to-show-alert.component.ts
+++ b/projects/common-map/src/fm-map/components/zoom-to-show-alert/zoom-to-show-alert.component.ts
@@ -1,14 +1,15 @@
 import { Component, Input } from '@angular/core';
-import { layer } from 'ol';
+import { Layer } from 'ol/layer';
+import { Source } from 'ol/source';

@Component({
  selector: 'fm-map-zoom-to-show-alert',
  template: '<div *fmMapIfZoomToShow="layer$" class="alert alert-info"><i class="fas fa-search-plus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Zoom in to show layer</span></div>'
 })
 export class ZoomToShowAlert {
-  public layer$: layer;
+  public layer$: Layer<Source>;
  @Input() 
-  set layer(layer:layer) {
+  set layer(layer:Layer<Source>) {
     this.layer$ = layer;
  }
 }