@igo2/geo 1.13.0-alpha.0 → 1.13.0-alpha.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 { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import { FormBuilder, FormGroup } 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: UntypedFormGroup;
+    form: FormGroup;
     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: UntypedFormBuilder, languageService: LanguageService, configService: ConfigService, dialogRef: MatDialogRef<AddCatalogDialogComponent>, data: {
+    constructor(formBuilder: FormBuilder, languageService: LanguageService, configService: ConfigService, dialogRef: MatDialogRef<AddCatalogDialogComponent>, data: {
         predefinedCatalogs: Catalog[];
         store: EntityStore<Catalog>;
         error: boolean;

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

@@ -6,7 +6,7 @@ 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 { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms';
+import { FormGroup, FormBuilder } from '@angular/forms';
 import { DrawControl } from '../../geometry/shared/controls/draw';
 import { EntityTableTemplate } from '@igo2/common';
 import type { default as OlGeometryType } from 'ol/geom/GeometryType';
@@ -49,10 +49,10 @@ export declare class DrawComponent implements OnInit, OnDestroy {
     fontSizeForm: string;
     fontStyleForm: string;
     position: string;
-    form: UntypedFormGroup;
+    form: FormGroup;
     icons: Array<string>;
     icon: string;
-    constructor(languageService: LanguageService, formBuilder: UntypedFormBuilder, drawStyleService: DrawStyleService, dialog: MatDialog, drawIconService: DrawIconService);
+    constructor(languageService: LanguageService, formBuilder: FormBuilder, drawStyleService: DrawStyleService, dialog: MatDialog, drawIconService: DrawIconService);
     ngOnInit(): void;
     /**
      * Remove the drawing layer and the interactions

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

@@ -1,5 +1,5 @@
 import OlRenderFeature from 'ol/render/Feature';
-import { UntypedFormGroup } from '@angular/forms';
+import { FormGroup } 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: UntypedFormGroup;
+    form: FormGroup;
     feature: Feature | undefined;
     data: Feature;
 }

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 { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
+import { FormBuilder, FormGroup } 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: UntypedFormGroup;
+    form: FormGroup;
     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: UntypedFormBuilder, domService: DOMService, configService: ConfigService, cdRef: ChangeDetectorRef);
+    constructor(ogcFilterService: OGCFilterService, formBuilder: FormBuilder, 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 { UntypedFormControl } from '@angular/forms';
+import { FormControl } 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: UntypedFormControl;
-    beginMinuteFormControl: UntypedFormControl;
-    endHourFormControl: UntypedFormControl;
-    endMinuteFormControl: UntypedFormControl;
+    beginHourFormControl: FormControl<any>;
+    beginMinuteFormControl: FormControl<any>;
+    endHourFormControl: FormControl<any>;
+    endMinuteFormControl: FormControl<any>;
     _beginValue: Date;
     _endValue: Date;
     readonly _defaultMin: string;

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

@@ -4,7 +4,7 @@ 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 { UntypedFormControl } from '@angular/forms';
+import { FormControl } from '@angular/forms';
 import { BehaviorSubject } from 'rxjs';
 import type { default as OlGeometryType } from 'ol/geom/GeometryType';
 import { GeoJSONGeometry } from '../../../geometry/shared/geometry.interfaces';
@@ -81,7 +81,7 @@ export declare class SpatialFilterItemComponent implements OnDestroy, OnInit {
     private value$$;
     private radiusChanges$$;
     private bufferChanges$$;
-    formControl: UntypedFormControl;
+    formControl: FormControl<any>;
     geometryType: typeof OlGeometryType | string;
     geometryTypeField: boolean;
     geometryTypes: string[];
@@ -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: UntypedFormControl;
-    bufferFormControl: UntypedFormControl;
+    radiusFormControl: FormControl<any>;
+    bufferFormControl: FormControl<any>;
     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 { UntypedFormControl } from '@angular/forms';
+import { FormControl } 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: UntypedFormControl;
-    bufferFormControl: UntypedFormControl;
+    formControl: FormControl<any>;
+    bufferFormControl: FormControl<any>;
     /**
      * 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 { UntypedFormControl } from '@angular/forms';
+import { FormControl } 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: UntypedFormControl;
+    selectedTypeIndex: FormControl<number>;
     /**
      * Reference to the SpatialFIlterType enum
      * @internal

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

@@ -1,5 +1,5 @@
 import { ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core';
-import { UntypedFormControl } from '@angular/forms';
+import { FormControl } from '@angular/forms';
 import type { default as OlGeometryType } from 'ol/geom/GeometryType';
 import * as OlStyle from 'ol/style';
 import { BehaviorSubject } from 'rxjs';
@@ -23,7 +23,7 @@ export declare class GeometryFormFieldComponent implements OnInit, OnDestroy {
     /**
      * The field's form control
      */
-    formControl: UntypedFormControl;
+    formControl: FormControl;
     /**
      * The map to draw the geometry on
      */

package/lib/import-export/import-export/import-export.component.d.ts

@@ -1,5 +1,5 @@
 import { OnDestroy, OnInit, EventEmitter, ChangeDetectorRef } from '@angular/core';
-import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms';
+import { FormGroup, FormBuilder } from '@angular/forms';
 import { BehaviorSubject } from 'rxjs';
 import { MessageService, LanguageService, ConfigService, StorageService } from '@igo2/core';
 import { IgoMap } from '../../map/shared/map';
@@ -28,8 +28,8 @@ export declare class ImportExportComponent implements OnDestroy, OnInit {
     private cdRef;
     private storageService;
     private downloadService;
-    form: UntypedFormGroup;
-    importForm: UntypedFormGroup;
+    form: FormGroup;
+    importForm: FormGroup;
     formats$: BehaviorSubject<any>;
     encodings$: BehaviorSubject<any>;
     exportableLayers$: BehaviorSubject<AnyLayer[]>;
@@ -68,7 +68,7 @@ export declare class ImportExportComponent implements OnDestroy, OnInit {
     set inputProj(value: any);
     get popupAllowed(): boolean;
     set popupAllowed(value: boolean);
-    constructor(importService: ImportService, exportService: ExportService, languageService: LanguageService, messageService: MessageService, styleListService: StyleListService, styleService: StyleService, formBuilder: UntypedFormBuilder, config: ConfigService, cdRef: ChangeDetectorRef, storageService: StorageService, downloadService: DownloadService);
+    constructor(importService: ImportService, exportService: ExportService, languageService: LanguageService, messageService: MessageService, styleListService: StyleListService, styleService: StyleService, formBuilder: FormBuilder, config: ConfigService, cdRef: ChangeDetectorRef, storageService: StorageService, downloadService: DownloadService);
     ngOnInit(): void;
     private computeProjections;
     private getWorkspaceByLayerId;

package/lib/print/print-form/print-form.component.d.ts

@@ -1,12 +1,12 @@
 import { EventEmitter, OnInit } from '@angular/core';
-import { UntypedFormGroup, UntypedFormBuilder, UntypedFormControl } from '@angular/forms';
+import { FormGroup, FormBuilder, FormControl } from '@angular/forms';
 import { BehaviorSubject } from 'rxjs';
 import { PrintOptions } from '../shared/print.interface';
 import { PrintOutputFormat, PrintPaperFormat, PrintOrientation, PrintResolution, PrintSaveImageFormat, PrintLegendPosition } from '../shared/print.type';
 import * as i0 from "@angular/core";
 export declare class PrintFormComponent implements OnInit {
     private formBuilder;
-    form: UntypedFormGroup;
+    form: FormGroup;
     outputFormats: {
         Pdf: "Pdf";
         Image: "Image";
@@ -74,21 +74,21 @@ export declare class PrintFormComponent implements OnInit {
     set showLegend(value: boolean);
     get doZipFile(): boolean;
     set doZipFile(value: boolean);
-    get outputFormatField(): UntypedFormControl;
-    get paperFormatField(): UntypedFormControl;
-    get imageFormatField(): UntypedFormControl;
-    get orientationField(): UntypedFormControl;
-    get resolutionField(): UntypedFormControl;
-    get commentField(): UntypedFormControl;
-    get showProjectionField(): UntypedFormControl;
-    get showScaleField(): UntypedFormControl;
-    get showLegendField(): UntypedFormControl;
-    get doZipFileField(): UntypedFormControl;
-    get titleField(): UntypedFormControl;
-    get subtitleField(): UntypedFormControl;
-    get legendPositionField(): UntypedFormControl;
+    get outputFormatField(): FormControl<any>;
+    get paperFormatField(): FormControl<any>;
+    get imageFormatField(): FormControl<any>;
+    get orientationField(): FormControl<any>;
+    get resolutionField(): FormControl<any>;
+    get commentField(): FormControl<any>;
+    get showProjectionField(): FormControl<any>;
+    get showScaleField(): FormControl<any>;
+    get showLegendField(): FormControl<any>;
+    get doZipFileField(): FormControl<any>;
+    get titleField(): FormControl<any>;
+    get subtitleField(): FormControl<any>;
+    get legendPositionField(): FormControl<any>;
     submit: EventEmitter<PrintOptions>;
-    constructor(formBuilder: UntypedFormBuilder);
+    constructor(formBuilder: FormBuilder);
     ngOnInit(): void;
     handleFormSubmit(data: PrintOptions, isValid: boolean): void;
     toggleImageSaveProp(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igo2/geo",
-  "version": "1.13.0-alpha.0",
+  "version": "1.13.0-alpha.1",
   "description": "IGO Library",
   "author": "MSP",
   "keywords": [
@@ -26,24 +26,24 @@
     "windows-1252": "^3.0.4"
   },
   "peerDependencies": {
-    "@angular/animations": "^14.0.6",
-    "@angular/common": "^14.0.6",
-    "@angular/core": "^14.0.6",
-    "@angular/forms": "^14.0.6",
-    "@angular/material": "^14.0.5",
-    "@igo2/common": "^1.13.0-alpha.0",
-    "@igo2/core": "^1.13.0-alpha.0",
-    "@igo2/utils": "^1.13.0-alpha.0",
+    "@angular/animations": "^13.3.11",
+    "@angular/common": "^13.3.11",
+    "@angular/core": "^13.3.11",
+    "@angular/forms": "^13.3.11",
+    "@angular/material": "^13.3.9",
+    "@igo2/common": "^1.13.0-alpha.1",
+    "@igo2/core": "^1.13.0-alpha.1",
+    "@igo2/utils": "^1.13.0-alpha.1",
     "ol": "~6.14.1",
     "proj4": "^2.8.0",
     "rxjs": "^6.6.7",
-    "ol-mapbox-style": "^8.2.0",
+    "ol-mapbox-style": "^6.5.1",
     "striptags": "^3.2.0"
   },
   "optionalDependencies": {
     "file-saver": "^2.0.2",
     "html2canvas": "^1.0.0-rc.5",
-    "jspdf": "^2.5.1",
+    "jspdf": "^2.3.1",
     "jszip": "^3.1.5",
     "moment": "^2.24.0",
     "stream": "^0.0.2"