@igo2/geo 1.13.0-alpha.1 → 1.13.1

package/lib/catalog/catalog-library/add-catalog-dialog.component.d.ts

@@ -1,7 +1,7 @@
 import { LanguageService, ConfigService } from '@igo2/core';
 import { OnInit, OnDestroy } from '@angular/core';
 import { MatDialogRef } from '@angular/material/dialog';
-import { FormBuilder, FormGroup } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { BehaviorSubject } from 'rxjs';
 import { EntityStore } from '@igo2/common';
 import { Catalog } from '../shared/catalog.abstract';
@@ -17,7 +17,7 @@ export declare class AddCatalogDialogComponent implements OnInit, OnDestroy {
         error: boolean;
         addedCatalog: Catalog;
     };
-    form: FormGroup;
+    form: UntypedFormGroup;
     private defaultAddedCatalogType;
     private addedCatalogType$$;
     predefinedCatalogsList$: BehaviorSubject<Catalog[]>;
@@ -28,7 +28,7 @@ export declare class AddCatalogDialogComponent implements OnInit, OnDestroy {
     addedCatalog: Catalog;
     emailAddress: string;
     private storeViewAll$$;
-    constructor(formBuilder: FormBuilder, languageService: LanguageService, configService: ConfigService, dialogRef: MatDialogRef<AddCatalogDialogComponent>, data: {
+    constructor(formBuilder: UntypedFormBuilder, languageService: LanguageService, configService: ConfigService, dialogRef: MatDialogRef<AddCatalogDialogComponent>, data: {
         predefinedCatalogs: Catalog[];
         store: EntityStore<Catalog>;
         error: boolean;

package/lib/datasource/shared/datasources/datasource.interface.d.ts

@@ -1,7 +1,7 @@
 import olSource from 'ol/source/Source';
 import { DownloadOptions } from '../../../download/shared/download.interface';
 import { OgcFilterOperatorType } from '../../../filter/shared/ogc-filter.enum';
-import type { default as OlGeometryType } from 'ol/geom/GeometryType';
+import type { Type } from 'ol/geom/Geometry';
 export interface DataSourceOptions {
     type?: 'wms' | 'wfs' | 'vector' | 'wmts' | 'xyz' | 'osm' | 'tiledebug' | 'carto' | 'arcgisrest' | 'imagearcgisrest' | 'tilearcgisrest' | 'websocket' | 'mvt' | 'cluster';
     optionsFromCapabilities?: boolean;
@@ -43,7 +43,7 @@ export interface EditionOptions {
     addUrl: string;
     deleteUrl: string;
     modifyUrl: string;
-    geomType: typeof OlGeometryType;
+    geomType: Type;
     hasGeometry: boolean;
     addWithDraw?: boolean;
     messages?: any[];

package/lib/datasource/shared/datasources/wfs-datasource.d.ts

@@ -4,7 +4,6 @@ import { DataSource } from './datasource';
 import { WFSDataSourceOptions } from './wfs-datasource.interface';
 import { WFSService } from './wfs.service';
 import { OgcFiltersOptions } from '../../../filter/shared/ogc-filter.interface';
-import { BehaviorSubject } from 'rxjs';
 import { AuthInterceptor } from '@igo2/auth';
 export declare class WFSDataSource extends DataSource {
     options: WFSDataSourceOptions;
@@ -14,7 +13,6 @@ export declare class WFSDataSource extends DataSource {
     mostRecentIdCallOGCFilter: number;
     set ogcFilters(value: OgcFiltersOptions);
     get ogcFilters(): OgcFiltersOptions;
-    readonly ogcFilters$: BehaviorSubject<OgcFiltersOptions>;
     constructor(options: WFSDataSourceOptions, wfsService: WFSService, authInterceptor?: AuthInterceptor);
     protected createOlSource(): olSourceVector<OlGeometry>;
     setOgcFilters(ogcFilters: OgcFiltersOptions, triggerEvent?: boolean): void;

package/lib/datasource/shared/datasources/wms-datasource.d.ts

@@ -17,7 +17,6 @@ export declare class WMSDataSource extends DataSource {
     get queryHtmlTarget(): string;
     set ogcFilters(value: OgcFiltersOptions);
     get ogcFilters(): OgcFiltersOptions;
-    readonly ogcFilters$: BehaviorSubject<OgcFiltersOptions>;
     set timeFilter(value: TimeFilterOptions);
     get timeFilter(): TimeFilterOptions;
     readonly timeFilter$: BehaviorSubject<TimeFilterOptions>;

package/lib/datasource/shared/datasources/wms-datasource.interface.d.ts

@@ -1,6 +1,7 @@
 import olSource from 'ol/source/Source';
 import olSourceVector from 'ol/source/Vector';
 import type { default as OlGeometry } from 'ol/geom/Geometry';
+import type { ServerType } from 'ol/source/wms';
 import { DataSourceOptions } from './datasource.interface';
 import { WFSDataSourceOptionsParams } from './wfs-datasource.interface';
 export interface WMSDataSourceOptions extends DataSourceOptions {
@@ -11,7 +12,7 @@ export interface WMSDataSourceOptions extends DataSourceOptions {
     crossOrigin?: string;
     projection?: string;
     resolutions?: number[];
-    serverType?: string;
+    serverType?: ServerType;
     ratio?: number;
     ol?: olSourceVector<OlGeometry> | olSource;
     refreshIntervalSec?: number;

package/lib/draw/draw/draw-popup.component.d.ts

@@ -1,8 +1,5 @@
 import { MatDialogRef } from '@angular/material/dialog';
 import * as i0 from "@angular/core";
-export interface DialogData {
-    label: string;
-}
 export declare class DrawPopupComponent {
     dialogRef: MatDialogRef<DrawPopupComponent>;
     data: {

package/lib/draw/draw/draw.component.d.ts

@@ -6,10 +6,10 @@ import { FontType, GeometryType } from '../shared/draw.enum';
 import { IgoMap } from '../../map/shared/map';
 import { BehaviorSubject } from 'rxjs';
 import { Draw, FeatureWithDraw } from '../shared/draw.interface';
-import { FormGroup, FormBuilder } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms';
 import { DrawControl } from '../../geometry/shared/controls/draw';
 import { EntityTableTemplate } from '@igo2/common';
-import type { default as OlGeometryType } from 'ol/geom/GeometryType';
+import type { Type } from 'ol/geom/Geometry';
 import { DrawStyleService } from '../shared/draw-style.service';
 import { DrawIconService } from '../shared/draw-icon.service';
 import * as i0 from "@angular/core";
@@ -30,7 +30,6 @@ export declare class DrawComponent implements OnInit, OnDestroy {
     strokeWidth: number;
     fontSize: string;
     fontStyle: string;
-    fontType: FontType;
     map: IgoMap;
     store: FeatureStore<FeatureWithDraw>;
     draw$: BehaviorSubject<Draw>;
@@ -46,13 +45,12 @@ export declare class DrawComponent implements OnInit, OnDestroy {
     drawControlIsActive: boolean;
     labelsAreShown: boolean;
     private subscriptions$$;
-    fontSizeForm: string;
-    fontStyleForm: string;
     position: string;
-    form: FormGroup;
+    form: UntypedFormGroup;
     icons: Array<string>;
     icon: string;
-    constructor(languageService: LanguageService, formBuilder: FormBuilder, drawStyleService: DrawStyleService, dialog: MatDialog, drawIconService: DrawIconService);
+    private numberOfDrawings;
+    constructor(languageService: LanguageService, formBuilder: UntypedFormBuilder, drawStyleService: DrawStyleService, dialog: MatDialog, drawIconService: DrawIconService);
     ngOnInit(): void;
     /**
      * Remove the drawing layer and the interactions
@@ -67,44 +65,20 @@ export declare class DrawComponent implements OnInit, OnDestroy {
      * @returns a Draw Control
      */
     createDrawControl(fillColor?: string, strokeColor?: string, strokeWidth?: number): DrawControl;
-    /**
-     * Called when the user selects a new geometry type
-     * @param geometryType the geometry type selected by the user
-     */
-    onGeometryTypeChange(geometryType: typeof OlGeometryType): void;
     /**
      * Store initialization, including drawing layer creation
      */
     private initStore;
     /**
-     * Called when the user changes the color in a color picker
-     * @param labelsAreShown wheter the labels are shown or not
-     * @param isAnIcon wheter the feature is an icon or not
-     */
-    onColorChange(labelsAreShown: boolean, isAnIcon: boolean): void;
-    /**
-     * Called when the user toggles the Draw control is toggled
-     * @internal
-     */
-    onToggleDrawControl(toggleIsChecked: boolean): void;
-    /**
-     * Activate the correct control
+     * Open the style modal dialog box
      */
-    private toggleDrawControl;
+    openStyleModalDialog(): void;
     /**
      * Open a dialog box to enter label and do something
      * @param olGeometry geometry at draw end or selected geometry
      * @param drawEnd event fired at drawEnd?
      */
-    private openDialog;
-    /**
-     * Activate a given control
-     */
-    private activateDrawControl;
-    /**
-     * Deactivate the active draw control
-     */
-    private deactivateDrawControl;
+    private openDrawDialog;
     /**
      * Clear the draw source and track the geometry being draw
      * @param olGeometry Ol linestring or polygon
@@ -118,35 +92,30 @@ export declare class DrawComponent implements OnInit, OnDestroy {
      * @internal
      */
     private addFeatureToStore;
-    /**
-     * Replace the feature in the store
-     * @param entity the entity to replace
-     * @param olGeometry the new geometry to insert in the store
-     */
-    private replaceFeatureInStore;
     private buildForm;
-    deleteDrawings(): void;
     /**
-     * Clear the tooltips of an OL geometry
-     * @param olGeometry OL geometry with tooltips
+     * Called when the user double-clicks the selected drawing
      */
-    private clearLabelsOfOlGeometry;
+    editLabelDrawing(): void;
+    openShorcutsDialog(): void;
+    deleteDrawings(): void;
     /**
      * Called when the user toggles the labels toggle
      */
     onToggleLabels(): void;
     /**
-     * Update the label of a geometry when a label is entered in a dialog box
-     * @param olGeometry the geometry
-     * @param label the label
+     * Called when the user toggles the Draw control is toggled
+     * @internal
      */
-    private updateLabelOfOlGeometry;
-    onIconChange(event?: any): void;
-    openShorcutsDialog(): void;
+    onToggleDrawControl(toggleIsChecked: boolean): void;
     /**
-     * Called when the user double-clicks the selected drawing
+     * Called when the user changes the color in a color picker
+     * @param labelsAreShown wheter the labels are shown or not
+     * @param isAnIcon wheter the feature is an icon or not
+     * @param fillColor which is the filling color
+     * @param strokeColor which is the stroke color
      */
-    editLabelDrawing(): void;
+    onColorChange(labelsAreShown: boolean, isAnIcon: boolean, fillColor: string, strokeColor: string): void;
     /**
      * Called when the user changes the font size or/and style
      * @param labelsAreShown wheter the labels are shown or not
@@ -154,7 +123,59 @@ export declare class DrawComponent implements OnInit, OnDestroy {
      * @param style the style of the font
      */
     onFontChange(labelsAreShown: boolean, size: string, style: FontType): void;
-    get allFontStyles(): string[];
+    /**
+     * Called when the user changes the value of the horizontal/vertical offset
+     * @param labelsAreShown wheter the labels are shown or not
+     * @param offsetX horizontal offset of the label
+     * @param offsetY vertical offset of the label
+     */
+    onOffsetLabelChange(labelsAreShown: boolean, offsetX: number, offsetY: number): void;
+    onIconChange(event?: any): void;
+    /**
+     * Called when the user selects a new geometry type
+     * @param geometryType the geometry type selected by the user
+     */
+    onGeometryTypeChange(geometryType: Type): void;
+    /**
+     * Update the label of a geometry when a label is entered in a dialog box
+     * @param olGeometry the geometry
+     * @param label the label
+     */
+    private updateLabelOfOlGeometry;
+    private updateFontSizeAndStyle;
+    private updateFillAndStrokeColor;
+    private updateOffset;
+    /**
+     * Check the amount of rows as a possible alternative
+     */
+    updateHeightTable(): void;
+    /**
+     * Activate the correct control
+     */
+    private toggleDrawControl;
+    /**
+     * Clear the tooltips of an OL geometry
+     * @param olGeometry OL geometry with tooltips
+     */
+    private clearLabelsOfOlGeometry;
+    /**
+     * Replace the feature in the store
+     * @param entity the entity to replace
+     * @param olGeometry the new geometry to insert in the store
+     */
+    private replaceFeatureInStore;
+    /**
+     * Deactivate the active draw control
+     */
+    private deactivateDrawControl;
+    /**
+     * Activate a given control
+     */
+    private activateDrawControl;
+    /**
+     * Recreates the style of the feature stored
+     */
+    private elementStyle;
     static ɵfac: i0.ɵɵFactoryDeclaration<DrawComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<DrawComponent, "igo-draw", never, { "fontType": "fontType"; "map": "map"; "store": "store"; }, { "fillColor": "fillColor"; "strokeColor": "strokeColor"; "strokeWidth": "strokeWidth"; "fontSize": "fontSize"; "fontStyle": "fontStyle"; }, never, never, false>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<DrawComponent, "igo-draw", never, { "map": "map"; "store": "store"; }, { "fillColor": "fillColor"; "strokeColor": "strokeColor"; "strokeWidth": "strokeWidth"; "fontSize": "fontSize"; "fontStyle": "fontStyle"; }, never, never, false>;
 }

package/lib/draw/draw/draw.module.d.ts

@@ -9,20 +9,23 @@ import * as i7 from "@angular/material/button-toggle";
 import * as i8 from "@angular/material/divider";
 import * as i9 from "@angular/material/form-field";
 import * as i10 from "@angular/material/icon";
-import * as i11 from "@angular/material/tooltip";
-import * as i12 from "@angular/material/input";
-import * as i13 from "@angular/material/list";
-import * as i14 from "@angular/material/select";
-import * as i15 from "@angular/material/slide-toggle";
-import * as i16 from "@angular/material/dialog";
-import * as i17 from "@igo2/core";
-import * as i18 from "@igo2/common";
-import * as i19 from "ngx-color-picker";
+import * as i11 from "@angular/material/badge";
+import * as i12 from "@angular/material/tooltip";
+import * as i13 from "@angular/material/input";
+import * as i14 from "@angular/material/list";
+import * as i15 from "@angular/material/select";
+import * as i16 from "@angular/material/slide-toggle";
+import * as i17 from "@angular/material/dialog";
+import * as i18 from "@igo2/core";
+import * as i19 from "@igo2/common";
+import * as i20 from "ngx-color-picker";
+import * as i21 from "@angular/platform-browser";
+import * as i22 from "@angular/platform-browser/animations";
 /**
  * @ignore
  */
 export declare class IgoDrawModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<IgoDrawModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<IgoDrawModule, [typeof i1.DrawComponent, typeof i2.DrawPopupComponent, typeof i3.DrawShorcutsComponent], [typeof i4.FormsModule, typeof i4.ReactiveFormsModule, typeof i5.CommonModule, typeof i6.MatButtonModule, typeof i7.MatButtonToggleModule, typeof i8.MatDividerModule, typeof i9.MatFormFieldModule, typeof i10.MatIconModule, typeof i11.MatTooltipModule, typeof i9.MatFormFieldModule, typeof i12.MatInputModule, typeof i13.MatListModule, typeof i14.MatSelectModule, typeof i15.MatSlideToggleModule, typeof i16.MatDialogModule, typeof i17.IgoLanguageModule, typeof i18.IgoEntityTableModule, typeof i19.ColorPickerModule], [typeof i1.DrawComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<IgoDrawModule, [typeof i1.DrawComponent, typeof i2.DrawPopupComponent, typeof i3.DrawShorcutsComponent], [typeof i4.FormsModule, typeof i4.ReactiveFormsModule, typeof i5.CommonModule, typeof i6.MatButtonModule, typeof i7.MatButtonToggleModule, typeof i8.MatDividerModule, typeof i9.MatFormFieldModule, typeof i10.MatIconModule, typeof i11.MatBadgeModule, typeof i12.MatTooltipModule, typeof i9.MatFormFieldModule, typeof i13.MatInputModule, typeof i14.MatListModule, typeof i15.MatSelectModule, typeof i16.MatSlideToggleModule, typeof i17.MatDialogModule, typeof i18.IgoLanguageModule, typeof i19.IgoEntityTableModule, typeof i20.ColorPickerModule, typeof i21.BrowserModule, typeof i22.BrowserAnimationsModule], [typeof i1.DrawComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<IgoDrawModule>;
 }

package/lib/draw/shared/draw-style.service.d.ts

@@ -10,6 +10,8 @@ export declare class DrawStyleService {
     private icon;
     private fontSize;
     private fontStyle;
+    private offsetX;
+    private offsetY;
     constructor(mapService: MapService);
     getFillColor(): string;
     setFillColor(fillColor: string): void;
@@ -24,7 +26,11 @@ export declare class DrawStyleService {
     setFontSize(fontSize: string): void;
     getFontStyle(): string;
     setFontStyle(fontStyle: string): void;
-    createDrawingLayerStyle(feature: any, resolution: any, labelsAreShown?: boolean, icon?: string): OlStyle.Style;
+    getOffsetX(): number;
+    setOffsetX(offsetX: number): void;
+    getOffsetY(): number;
+    setOffsetY(offsetY: number): void;
+    createIndividualElementStyle(feature: any, resolution: any, labelsAreShown: boolean, fontSizeAndStyle: string, fillColor: string, strokeColor: string, offsetX: number, offsetY: number, icon?: string): OlStyle.Style;
     static ɵfac: i0.ɵɵFactoryDeclaration<DrawStyleService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<DrawStyleService>;
 }

package/lib/draw/shared/draw.interface.d.ts

@@ -20,6 +20,10 @@ export interface FeatureWithDrawProperties {
     longitude: number;
     latitude: number;
     rad: number;
+    fontStyle: string;
+    drawingStyle: DrawingStyle;
+    offsetX: number;
+    offsetY: number;
 }
 export interface FeatureStoreDrawStrategyOptions {
     map: IgoMap;

package/lib/feature/feature-details/feature-details.component.d.ts

@@ -50,8 +50,12 @@ export declare class FeatureDetailsComponent implements OnInit, OnDestroy {
     isDoc(value: any): boolean;
     isImg(value: any): boolean;
     isEmbeddedLink(value: any): boolean;
-    getEmbeddedLinkText(value: any): any;
+    getEmbeddedLinkText(value: any): string;
     filterFeatureProperties(feature: any): any;
+    /**
+     * Copy the url to a clipboard
+     */
+    copyTextToClipboard(value: string): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<FeatureDetailsComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<FeatureDetailsComponent, "igo-feature-details", never, { "source": "source"; "map": "map"; "toolbox": "toolbox"; "feature": "feature"; }, { "routeEvent": "routeEvent"; "selectFeature": "selectFeature"; "htmlDisplayEvent": "htmlDisplayEvent"; }, never, never, false>;
 }

package/lib/feature/shared/feature.interfaces.d.ts

@@ -1,5 +1,5 @@
 import OlRenderFeature from 'ol/render/Feature';
-import { FormGroup } from '@angular/forms';
+import { UntypedFormGroup } from '@angular/forms';
 import { GeoJsonGeometryTypes } from 'geojson';
 import { EntityKey, EntityStoreOptions, EntityStoreStrategyOptions } from '@igo2/common';
 import { VectorLayer } from '../../layer';
@@ -68,7 +68,7 @@ export interface FeatureStoreSelectionStrategyOptions extends FeatureStoreStrate
     dragBox?: boolean;
 }
 export interface FeatureFormSubmitEvent {
-    form: FormGroup;
+    form: UntypedFormGroup;
     feature: Feature | undefined;
     data: Feature;
 }

package/lib/feature/shared/store.d.ts

@@ -57,6 +57,7 @@ export declare class FeatureStore<T extends Feature = Feature> extends EntitySto
      * @param motion Optional: The type of motion to perform
      */
     setLayerOlFeatures(olFeatures: OlFeature<OlGeometry>[], motion?: FeatureMotion, viewScale?: [number, number, number, number], areaRatio?: number): void;
+    setLayerExtent(): void;
     /**
      * Add features to the the layer
      * @param features Openlayers feature objects

package/lib/filter/ogc-filter-selection/ogc-filter-selection.component.d.ts

@@ -4,7 +4,7 @@ import { DOMService } from '@igo2/common';
 import { OgcFilterableDataSource, OgcPushButton, OgcSelectorBundle, SelectorGroup } from '../../filter/shared/ogc-filter.interface';
 import { IgoMap } from '../../map';
 import { OGCFilterService } from '../shared/ogc-filter.service';
-import { FormBuilder, FormGroup } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { OgcFilterOperator } from '../shared/ogc-filter.enum';
 import { MatSelect } from '@angular/material/select';
 import { BehaviorSubject } from 'rxjs';
@@ -26,7 +26,7 @@ export declare class OgcFilterSelectionComponent implements OnInit {
     set currentFilter(value: any);
     private _currentFilter;
     ogcFilterOperator: typeof OgcFilterOperator;
-    form: FormGroup;
+    form: UntypedFormGroup;
     private ogcFilterWriter;
     color: string;
     selectAllSelected: boolean;
@@ -52,7 +52,7 @@ export declare class OgcFilterSelectionComponent implements OnInit {
     set selectEnableds(value: any[]);
     get autocompleteEnabled(): any;
     set autocompleteEnabled(value: any);
-    constructor(ogcFilterService: OGCFilterService, formBuilder: FormBuilder, domService: DOMService, configService: ConfigService, cdRef: ChangeDetectorRef);
+    constructor(ogcFilterService: OGCFilterService, formBuilder: UntypedFormBuilder, domService: DOMService, configService: ConfigService, cdRef: ChangeDetectorRef);
     private buildForm;
     getPushButtonsGroups(): SelectorGroup[];
     getCheckboxesGroups(): SelectorGroup[];

package/lib/filter/ogc-filter-time/ogc-filter-time.component.d.ts

@@ -1,5 +1,5 @@
 import { ElementRef, EventEmitter, OnInit } from '@angular/core';
-import { FormControl } from '@angular/forms';
+import { UntypedFormControl } from '@angular/forms';
 import { OgcFilterOperator } from '../../filter/shared/ogc-filter.enum';
 import { OGCFilterTimeService } from '../shared/ogc-filter-time.service';
 import { OgcFilterableDataSourceOptions, OgcFilterableDataSource } from '../shared/ogc-filter.interface';
@@ -17,10 +17,10 @@ export declare class OgcFilterTimeComponent implements OnInit {
     endHours: number[];
     beginMinutes: number[];
     endMinutes: number[];
-    beginHourFormControl: FormControl<any>;
-    beginMinuteFormControl: FormControl<any>;
-    endHourFormControl: FormControl<any>;
-    endMinuteFormControl: FormControl<any>;
+    beginHourFormControl: UntypedFormControl;
+    beginMinuteFormControl: UntypedFormControl;
+    endHourFormControl: UntypedFormControl;
+    endMinuteFormControl: UntypedFormControl;
     _beginValue: Date;
     _endValue: Date;
     readonly _defaultMin: string;

package/lib/filter/shared/ogc-filter.interface.d.ts

@@ -7,7 +7,6 @@ import { DOMValue } from '@igo2/common';
 import { DataSource } from '../../datasource/shared/datasources/datasource';
 import { DataSourceOptions } from '../../datasource/shared/datasources/datasource.interface';
 import { OgcFilterOperatorType } from './ogc-filter.enum';
-import { BehaviorSubject } from 'rxjs';
 export interface OgcFilter extends olFormatFilter {
 }
 export interface WFSWriteGetFeatureOptions {
@@ -104,7 +103,6 @@ export interface OgcFilterableDataSourceOptions extends DataSourceOptions {
 }
 export interface OgcFilterableDataSource extends DataSource {
     options: OgcFilterableDataSourceOptions;
-    ogcFilters$?: BehaviorSubject<OgcFiltersOptions>;
     setOgcFilters(ogcFilters: OgcFiltersOptions, triggerEvent?: boolean): any;
 }
 export interface IgoLogicalArrayOptions {

package/lib/filter/spatial-filter/spatial-filter-item/spatial-filter-item.component.d.ts

@@ -4,9 +4,9 @@ import { SelectionModel } from '@angular/cdk/collections';
 import { IgoMap } from '../../../map';
 import { SpatialFilterItemType } from './../../shared/spatial-filter.enum';
 import { Feature } from './../../../feature/shared/feature.interfaces';
-import { FormControl } from '@angular/forms';
+import { UntypedFormControl } from '@angular/forms';
 import { BehaviorSubject } from 'rxjs';
-import type { default as OlGeometryType } from 'ol/geom/GeometryType';
+import type { Type } from 'ol/geom/Geometry';
 import { GeoJSONGeometry } from '../../../geometry/shared/geometry.interfaces';
 import * as olStyle from 'ol/style';
 import { MatTreeNestedDataSource } from '@angular/material/tree';
@@ -81,8 +81,8 @@ export declare class SpatialFilterItemComponent implements OnDestroy, OnInit {
     private value$$;
     private radiusChanges$$;
     private bufferChanges$$;
-    formControl: FormControl<any>;
-    geometryType: typeof OlGeometryType | string;
+    formControl: UntypedFormControl;
+    geometryType: Type | string;
     geometryTypeField: boolean;
     geometryTypes: string[];
     drawGuideField: boolean;
@@ -98,8 +98,8 @@ export declare class SpatialFilterItemComponent implements OnDestroy, OnInit {
     PolyStyle: olStyle.Style | ((feature: any, resolution: any) => olStyle.Style);
     radius: number;
     buffer: number;
-    radiusFormControl: FormControl<any>;
-    bufferFormControl: FormControl<any>;
+    radiusFormControl: UntypedFormControl;
+    bufferFormControl: UntypedFormControl;
     measureUnit: MeasureLengthUnit;
     zoneWithBuffer: any;
     listIsVisible: boolean;

package/lib/filter/spatial-filter/spatial-filter-list/spatial-filter-list.component.d.ts

@@ -3,7 +3,7 @@ import { SpatialFilterService } from './../../shared/spatial-filter.service';
 import { SpatialFilterQueryType } from './../../shared/spatial-filter.enum';
 import { OnInit, OnDestroy, EventEmitter } from '@angular/core';
 import { Subscription } from 'rxjs';
-import { FormControl } from '@angular/forms';
+import { UntypedFormControl } from '@angular/forms';
 import { Feature } from '../../../feature';
 import { MeasureLengthUnit } from '../../../measure/shared';
 import { LanguageService, MessageService } from '@igo2/core';
@@ -26,8 +26,8 @@ export declare class SpatialFilterListComponent implements OnInit, OnDestroy {
     zoneWithBuffer: any;
     selectedZone: any;
     measureUnit: MeasureLengthUnit;
-    formControl: FormControl<any>;
-    bufferFormControl: FormControl<any>;
+    formControl: UntypedFormControl;
+    bufferFormControl: UntypedFormControl;
     /**
      * Available measure units for the measure type given
      * @internal

package/lib/filter/spatial-filter/spatial-filter-type/spatial-filter-type.component.d.ts

@@ -1,6 +1,6 @@
 import { OnInit, EventEmitter } from '@angular/core';
 import { SpatialFilterQueryType, SpatialFilterType } from '../../shared/spatial-filter.enum';
-import { FormControl } from '@angular/forms';
+import { UntypedFormControl } from '@angular/forms';
 import { EntityStore } from '@igo2/common';
 import { Feature } from '../../../feature';
 import { MeasureLengthUnit } from '../../../measure';
@@ -14,7 +14,7 @@ export declare class SpatialFilterTypeComponent implements OnInit {
     set store(store: EntityStore<Feature>);
     private _store;
     queryType: string[];
-    selectedTypeIndex: FormControl<number>;
+    selectedTypeIndex: UntypedFormControl;
     /**
      * Reference to the SpatialFIlterType enum
      * @internal

package/lib/geometry/geometry-form-field/geometry-form-field-input.component.d.ts

@@ -2,7 +2,7 @@ import { OnInit, OnDestroy, ChangeDetectorRef } from '@angular/core';
 import { NgControl, ControlValueAccessor } from '@angular/forms';
 import * as OlStyle from 'ol/style';
 import OlGeometry from 'ol/geom/Geometry';
-import type { default as OlGeometryType } from 'ol/geom/GeometryType';
+import type { Type } from 'ol/geom/Geometry';
 import OlVectorSource from 'ol/source/Vector';
 import { IgoMap } from '../../map';
 import { DrawControl, ModifyControl } from '../shared/controls';
@@ -38,8 +38,8 @@ export declare class GeometryFormFieldInputComponent implements OnInit, OnDestro
     /**
      * The geometry type
      */
-    set geometryType(value: typeof OlGeometryType);
-    get geometryType(): typeof OlGeometryType;
+    set geometryType(value: Type);
+    get geometryType(): Type;
     private _geometryType;
     /**
      * The drawGuide around the mouse pointer to help drawing

package/lib/geometry/geometry-form-field/geometry-form-field.component.d.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core';
-import { FormControl } from '@angular/forms';
-import type { default as OlGeometryType } from 'ol/geom/GeometryType';
+import { UntypedFormControl } from '@angular/forms';
+import type { Type } from 'ol/geom/Geometry';
 import * as OlStyle from 'ol/style';
 import { BehaviorSubject } from 'rxjs';
 import { IgoMap } from '../../map';
@@ -23,14 +23,14 @@ export declare class GeometryFormFieldComponent implements OnInit, OnDestroy {
     /**
      * The field's form control
      */
-    formControl: FormControl;
+    formControl: UntypedFormControl;
     /**
      * The map to draw the geometry on
      */
     map: IgoMap;
-    set geometryType(value: typeof OlGeometryType);
-    get geometryType(): typeof OlGeometryType;
-    readonly geometryType$: BehaviorSubject<typeof OlGeometryType>;
+    set geometryType(value: Type);
+    get geometryType(): Type;
+    readonly geometryType$: BehaviorSubject<Type>;
     /**
      * Whether a geometry type toggle should be displayed
      */

package/lib/geometry/shared/controls/draw.d.ts

@@ -1,12 +1,12 @@
 import OlMap from 'ol/Map';
 import { StyleLike as OlStyleLike } from 'ol/style/Style';
-import type { default as OlGeometryType } from 'ol/geom/GeometryType';
+import type { Type } from 'ol/geom/Geometry';
 import OlVectorSource from 'ol/source/Vector';
 import OlVectorLayer from 'ol/layer/Vector';
 import type { default as OlGeometry } from 'ol/geom/Geometry';
 import { Subject, BehaviorSubject } from 'rxjs';
 export interface DrawControlOptions {
-    geometryType: typeof OlGeometryType | string;
+    geometryType: Type | string;
     drawingLayerSource?: OlVectorSource<OlGeometry>;
     drawingLayer?: OlVectorLayer<OlVectorSource<OlGeometry>>;
     drawingLayerStyle?: OlStyleLike;
@@ -81,7 +81,7 @@ export declare class DrawControl {
      * Set the current geometry type
      * @param geometryType the geometry type
      */
-    setGeometryType(geometryType: typeof OlGeometryType): void;
+    setGeometryType(geometryType: Type): void;
     /**
      * Create a drawing source if none is defined in the options
      */

package/lib/geometry/shared/geometry.interfaces.d.ts

@@ -1,10 +1,10 @@
-import type { default as OlGeometryType } from 'ol/geom/GeometryType';
+import type { Type } from 'ol/geom/Geometry';
 import { GeoJsonGeometryTypes } from 'geojson';
 import { FormFieldInputs } from '@igo2/common';
 import { IgoMap } from '../../map';
 export interface GeometryFormFieldInputs extends FormFieldInputs {
     map: IgoMap;
-    geometryType: typeof OlGeometryType;
+    geometryType: Type;
     tooltip?: string;
 }
 export interface GeoJSONGeometry {