@igo2/geo 1.13.4 → 1.14.1

package/fesm2015/igo2-geo.mjs

@@ -11,7 +11,7 @@ import { MatListModule } from '@angular/material/list';
 import * as i4 from '@angular/material/tooltip';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import * as i5$1 from '@igo2/common';
-import { getEntityId, getEntityTitle, getEntityProperty, getEntityRevision, getEntityIcon, EntityStore, EntityStoreStrategy, EntityStoreWatcher, SecureImagePipe, IgoListModule, IgoCollapsibleModule, IgoImageModule, IgoPanelModule, IgoMatBadgeIconModule, IgoCustomHtmlModule, IgoEntityTableModule, IgoKeyValueModule, IgoFormModule, IgoFormFieldComponent, DOMService, EntityStoreFilterSelectionStrategy, EntityTableColumnRenderer, IgoEntityModule, IgoDOMModule, DragAndDropDirective, IgoSpinnerModule, IgoDrapDropModule, IgoConfirmDialogModule, getEntityTitleHtml, EntityStoreFilterCustomFuncStrategy, IgoStopPropagationModule, IgoFlexibleModule, WidgetService, Workspace, ActionStore, IgoWidgetModule } from '@igo2/common';
+import { getEntityId, getEntityTitle, getEntityProperty, getEntityRevision, getEntityIcon, EntityStore, EntityStoreStrategy, EntityStoreWatcher, SecureImagePipe, EntityTableColumnRenderer, IgoListModule, IgoCollapsibleModule, IgoImageModule, IgoPanelModule, IgoMatBadgeIconModule, IgoCustomHtmlModule, IgoEntityTableModule, IgoKeyValueModule, IgoFormModule, IgoFormFieldComponent, DOMService, EntityStoreFilterSelectionStrategy, IgoEntityModule, IgoDOMModule, DragAndDropDirective, IgoSpinnerModule, IgoDrapDropModule, IgoConfirmDialogModule, getEntityTitleHtml, EntityStoreFilterCustomFuncStrategy, IgoStopPropagationModule, IgoFlexibleModule, WidgetService, Workspace, ActionStore, IgoWidgetModule } from '@igo2/common';
 import * as i3 from '@angular/material/button';
 import { MatButtonModule } from '@angular/material/button';
 import * as i2$1 from '@igo2/core';
@@ -19,7 +19,7 @@ import { IgoLanguageModule, ConfigService, Media, StorageScope, IgoMessageModule
 import * as i1 from '@angular/material/dialog';
 import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
 import * as i7 from '@ngx-translate/core';
-import { BehaviorSubject, combineLatest, of, Observable, forkJoin, Subject, interval, skipWhile as skipWhile$1, zip, EMPTY, ReplaySubject, timer, fromEvent, throwError } from 'rxjs';
+import { BehaviorSubject, combineLatest, of, Observable, forkJoin, Subject, interval, skipWhile as skipWhile$1, zip, EMPTY, ReplaySubject, timer, fromEvent, Subscription, throwError } from 'rxjs';
 import { map, concatMap, first, catchError, skipWhile, debounceTime, skip, distinctUntilChanged, switchMap, take, mergeMap, debounce, takeUntil } from 'rxjs/operators';
 import { Watcher, uuid, SubjectStatus, NumberUtils, ObjectUtils, userAgent, Clipboard, downloadContent, strEnum, ChangeUtils } from '@igo2/utils';
 import olMap from 'ol/Map';
@@ -54,7 +54,7 @@ import { WMSCapabilities, WMTSCapabilities, EsriJSON } from 'ol/format';
 import { Md5 } from 'ts-md5';
 import { MAC } from 'ol/has';
 import * as olfilter from 'ol/format/filter';
-import olWKT from 'ol/format/WKT';
+import olFormatWKT from 'ol/format/WKT';
 import olFormatWFS from 'ol/format/WFS';
 import moment from 'moment';
 import olFormatGML2 from 'ol/format/GML2';
@@ -105,10 +105,10 @@ import { MAT_DATE_LOCALE, MatOptionModule, MatNativeDateModule } from '@angular/
 import * as i13 from '@angular/material/form-field';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import * as i2$2 from '@angular/forms';
-import { ReactiveFormsModule, FormsModule, Validators, UntypedFormControl } from '@angular/forms';
+import { UntypedFormControl, ReactiveFormsModule, FormsModule, Validators } from '@angular/forms';
 import * as i15 from '@angular/material/select';
 import { MatSelectModule } from '@angular/material/select';
-import * as i12$1 from '@angular/material/checkbox';
+import * as i12 from '@angular/material/checkbox';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import * as i11 from '@angular/material/divider';
 import { MatDividerModule } from '@angular/material/divider';
@@ -120,7 +120,7 @@ import * as i23 from '@angular/material/slide-toggle';
 import { MatSlideToggleModule } from '@angular/material/slide-toggle';
 import * as i13$1 from '@angular/material/slider';
 import { MatSliderModule, MatSlider } from '@angular/material/slider';
-import * as i12 from 'ngx-color-picker';
+import * as i12$1 from 'ngx-color-picker';
 import { ColorPickerModule } from 'ngx-color-picker';
 import scrollIntoView from 'scroll-into-view-if-needed';
 import OlOverlay from 'ol/Overlay';
@@ -135,13 +135,13 @@ import { doubleClick } from 'ol/events/condition';
 import lineIntersect from '@turf/line-intersect';
 import * as i18 from '@angular/material/button-toggle';
 import { MatButtonToggleModule } from '@angular/material/button-toggle';
+import * as i17 from '@angular/material/radio';
+import { MatRadioModule } from '@angular/material/radio';
 import * as i11$1 from '@angular/material/autocomplete';
 import { MatAutocompleteModule } from '@angular/material/autocomplete';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import * as i25 from '@angular/material/datepicker';
 import { MatDatepickerModule } from '@angular/material/datepicker';
-import * as i17 from '@angular/material/radio';
-import { MatRadioModule } from '@angular/material/radio';
 import * as i21 from '@angular/material/table';
 import { MatTableModule } from '@angular/material/table';
 import * as i20 from '@angular/material/tabs';
@@ -157,7 +157,7 @@ import { SelectionModel } from '@angular/cdk/collections';
 import { NestedTreeControl } from '@angular/cdk/tree';
 import { encode } from 'windows-1252';
 import { saveAs } from 'file-saver';
-import jspdf from 'jspdf';
+import jsPDF from 'jspdf';
 import html2canvas from 'html2canvas';
 import JSZip from 'jszip';
 import * as i3$1 from '@angular/cdk/drag-drop';
@@ -1123,6 +1123,9 @@ function roundCoordTo(coord, decimal = 3) {
         NumberUtils.roundToNDecimal(coord[1], decimal)
     ];
 }
+function roundCoordToString(coord, decimal = 3) {
+    return roundCoordTo(coord, decimal).map(r => r.toString());
+}
 /**
  * Returns an array of converted coordinates.
  * Conversion is done for every configured projections
@@ -1581,7 +1584,7 @@ class OgcFilterWriter {
         const wfsExpression = filterOptions.expression;
         let geometry;
         if (wfsWktGeometry) {
-            const wkt = new olWKT();
+            const wkt = new olFormatWKT();
             geometry = wkt.readGeometry(wfsWktGeometry, {
                 dataProjection: wfsSrsName,
                 featureProjection: wfsSrsName || 'EPSG:3857'
@@ -8506,12 +8509,12 @@ class MapOfflineDirective {
             else {
                 if (this.networkState.connection === false ||
                     this.offlineButtonState.connection === false) {
-                    layer.ol.setMaxResolution(0);
+                    layer.maxResolution = 0;
                     return;
                 }
                 else if (this.networkState.connection === true ||
                     this.offlineButtonState.connection === true) {
-                    layer.ol.setMaxResolution(Infinity);
+                    layer.maxResolution = layer.options.maxResolution || Infinity;
                     return;
                 }
             }
@@ -8539,22 +8542,22 @@ class MapOfflineDirective {
                 else {
                     if (this.networkState.connection === false ||
                         this.offlineButtonState.connection === false) {
-                        layer.ol.setMaxResolution(0);
+                        layer.maxResolution = 0;
                     }
                     else if (this.networkState.connection === true ||
                         this.offlineButtonState.connection === true) {
-                        layer.ol.setMaxResolution(Infinity);
+                        layer.maxResolution = layer.options.maxResolution || Infinity;
                     }
                 }
             }
             else {
                 if (this.networkState.connection === false ||
                     this.offlineButtonState.connection === false) {
-                    layer.ol.setMaxResolution(0);
+                    layer.maxResolution = 0;
                 }
                 else if (this.networkState.connection === true ||
                     this.offlineButtonState.connection === true) {
-                    layer.ol.setMaxResolution(Infinity);
+                    layer.maxResolution = layer.options.maxResolution || Infinity;
                 }
             }
         });
@@ -8755,7 +8758,7 @@ class HoverFeatureDirective {
             zIndex: 901,
             renderMode: "vector",
             declutter: true,
-            source: new olSourceVectorTile({}),
+            source: new olSourceVectorTile({ projection: this.map.projection }),
             style: (feature, resolution) => {
                 if (this.mvtStyleOptions && feature.getId() in this.selectionMVT) {
                     return this.createHoverStyle(feature, this.mvtStyleOptions, resolution);
@@ -9786,7 +9789,7 @@ class GeoDBService {
         this.compression = compression;
         this.dbName = 'geoData';
         this.collisionsMap = new Map();
-        this._newTiles = 0;
+        this._newData = 0;
     }
     /**
      * Only blob can be will be compressed
@@ -9821,7 +9824,7 @@ class GeoDBService {
             return this.ngxIndexedDBService.getByID(this.dbName, url);
         }), concatMap((dbObject) => {
             if (!dbObject) {
-                this._newTiles++;
+                this._newData++;
                 return this.ngxIndexedDBService.add(this.dbName, geoDBData);
             }
             else {
@@ -9873,11 +9876,11 @@ class GeoDBService {
     deleteByKey(url) {
         return this.ngxIndexedDBService.deleteByKey(this.dbName, url);
     }
-    getRegionTileCountByID(id) {
+    getRegionCountByID(id) {
         const subject = new Subject();
         const dbRequest = this.getRegionByID(id)
-            .subscribe((tiles) => {
-            subject.next(tiles.length);
+            .subscribe((datas) => {
+            subject.next(datas.length);
             subject.complete();
         });
         return subject;
@@ -9896,9 +9899,9 @@ class GeoDBService {
         }
         const IDBKey = IDBKeyRange.only(id);
         const dbRequest = this.ngxIndexedDBService.getAllByIndex(this.dbName, 'regionID', IDBKey);
-        dbRequest.subscribe((tiles) => {
-            tiles.forEach((tile) => {
-                this.ngxIndexedDBService.deleteByKey(this.dbName, tile.url);
+        dbRequest.subscribe((datas) => {
+            datas.forEach((data) => {
+                this.ngxIndexedDBService.deleteByKey(this.dbName, data.url);
             });
         });
         return dbRequest;
@@ -9909,7 +9912,7 @@ class GeoDBService {
     }
     resetCounters() {
         this.resetCollisionsMap();
-        this._newTiles = 0;
+        this._newData = 0;
     }
     resetCollisionsMap() {
         this.collisionsMap = new Map();
@@ -9927,8 +9930,8 @@ class GeoDBService {
             }
         }
     }
-    get newTiles() {
-        return this._newTiles;
+    get newData() {
+        return this._newData;
     }
 }
 GeoDBService.ɵfac = function GeoDBService_Factory(t) { return new (t || GeoDBService)(i0.ɵɵinject(i1$3.NgxIndexedDBService), i0.ɵɵinject(i2$1.CompressionService)); };
@@ -10994,7 +10997,7 @@ class QueryService {
                 features = this.extractGML2Data(res, layer, allowedFieldsAndAlias);
                 break;
         }
-        if (features.length > 0 && features[0].geometry === null) {
+        if (features.length > 0 && (features[0].geometry === null || !features[0].geometry)) {
             const geomToAdd = this.createGeometryFromUrlClick(url);
             for (const feature of features) {
                 feature.geometry = geomToAdd;
@@ -11005,7 +11008,7 @@ class QueryService {
             new RegExp('FEATURE_COUNT=' + this.featureCount) :
             new RegExp('FEATURE_COUNT=' + this.defaultFeatureCount);
         if (featureCount.test(url) &&
-            ((((_b = wmsDatasource.params) === null || _b === void 0 ? void 0 : _b.FEATURE_COUNT) && features.length === this.featureCount) ||
+            ((((_b = wmsDatasource.params) === null || _b === void 0 ? void 0 : _b.FEATURE_COUNT) && this.featureCount > 1 && features.length === this.featureCount) ||
                 (!((_c = wmsDatasource.params) === null || _c === void 0 ? void 0 : _c.FEATURE_COUNT) && features.length === this.defaultFeatureCount))) {
             this.languageService.translate.get('igo.geo.query.featureCountMax', { value: layer.title }).subscribe(message => {
                 const messageObj = this.messageService.info(message);
@@ -11205,6 +11208,7 @@ class QueryService {
         delete properties.SHAPE_P;
         delete properties.the_geom;
         delete properties.geom;
+        delete properties.geom32198;
         let geometry;
         if (featureGeometry) {
             geometry = {
@@ -11364,7 +11368,9 @@ class QueryService {
      *
      */
     getCustomQueryUrl(datasource, options, mapExtent) {
-        let url = datasource.options.queryUrl.replace(/\{xmin\}/g, mapExtent[0].toString())
+        const extent = olextent.getForViewAndSize(options.coordinates, options.resolution, 0, [101, 101]);
+        let url = datasource.options.queryUrl.replace(/\{bbox\}/g, extent.join(','))
+            .replace(/\{xmin\}/g, mapExtent[0].toString())
             .replace(/\{ymin\}/g, mapExtent[1].toString())
             .replace(/\{xmax\}/g, mapExtent[2].toString())
             .replace(/\{ymax\}/g, mapExtent[3].toString())
@@ -12716,9 +12722,13 @@ class CatalogBrowserComponent {
      */
     addLayersToMap(layers) {
         const layers$ = layers.map((layer) => {
+            var _a;
             if (!layer.options.sourceOptions.optionsFromApi) {
                 layer.options.sourceOptions.optionsFromApi = true;
             }
+            if ((_a = this.catalog.profils) === null || _a === void 0 ? void 0 : _a.length) {
+                layer.options.security = { profils: this.catalog.profils };
+            }
             return this.layerService.createAsyncLayer(layer.options);
         });
         zip(...layers$).subscribe((oLayers) => {
@@ -15858,7 +15868,20 @@ var FontType;
     FontType["LucidaConsole"] = "Lucida Console";
     FontType["BrushScriptMT"] = "Brush Script MT";
     FontType["ComicSansMS"] = "Comic Sans MS";
-})(FontType || (FontType = {}));
+})(FontType || (FontType = {}));
+var LabelType;
+(function (LabelType) {
+    LabelType["Coordinates"] = "Coordinates";
+    LabelType["Length"] = "Length";
+    LabelType["Area"] = "Area";
+    LabelType["Predefined"] = "Predefined";
+    LabelType["Custom"] = "Custom";
+})(LabelType || (LabelType = {}));
+var CoordinatesUnit;
+(function (CoordinatesUnit) {
+    CoordinatesUnit["DecimalDegree"] = "DD";
+    CoordinatesUnit["DegreesMinutesSeconds"] = "DMS";
+})(CoordinatesUnit || (CoordinatesUnit = {}));
 
 class DrawIconService {
     constructor(config) {
@@ -16500,6 +16523,22 @@ function createOlTooltipDrawAtPoint(olPoint) {
     olTooltip.setPosition(olPoint.getFlatCoordinates());
     olPoint.set('_tooltip', olTooltip);
     return olTooltip;
+}
+function DDtoDMS(value, unit) {
+    const conversionMapper = new Map([
+        [CoordinatesUnit.DecimalDegree, (val) => {
+                if (typeof val[0] === 'number') {
+                    return roundCoordToString(val, 5);
+                }
+                else {
+                    const numVal = [Number(val[0]), Number(val[1])];
+                    return roundCoordToString(numVal, 5);
+                }
+            }],
+        [CoordinatesUnit.DegreesMinutesSeconds, (val) => convertDDToDMS(val, 2)]
+    ]);
+    let conversion = conversionMapper.get(unit);
+    return conversion ? conversion(value) : undefined;
 }
 
 class DrawStyleService {
@@ -16509,7 +16548,7 @@ class DrawStyleService {
         this.strokeColor = 'rgba(143,7,7,1)';
         this.strokeWidth = 1;
         this.labelsAreShown = true;
-        this.fontSize = '20';
+        this.fontSize = '15';
         this.fontStyle = FontType.Arial.toString();
         this.offsetX = 0;
         this.offsetY = 0;
@@ -17404,8 +17443,24 @@ class DrawControl {
          * Freehand mode observable (defaults to false)
          */
         this.freehand$ = new BehaviorSubject(false);
+        /**
+         * Observables from predefined radius (defaults to false and undefined)
+         */
+        this.ispredefinedRadius$ = new BehaviorSubject(false);
+        this.predefinedRadius$ = new BehaviorSubject(undefined);
+        this.radiusDrawEnd$ = new BehaviorSubject(undefined);
         this.olDrawingLayer = options.drawingLayer ? options.drawingLayer : this.createOlInnerOverlayLayer();
         this.olGeometryType = this.options.geometryType;
+        this.olInteractionStyle = this.options.interactionStyle;
+    }
+    /**
+     * take the value of radius
+     */
+    get radiusVal() {
+        return this.predefinedRadius$.getValue();
+    }
+    set radiusValData(radiusCercle) {
+        this.predefinedRadius$.next(radiusCercle);
     }
     /**
      * Wheter the control is active
@@ -17442,6 +17497,9 @@ class DrawControl {
     getSource() {
         return this.olDrawingLayerSource;
     }
+    setOlInteractionStyle(style) {
+        this.olInteractionStyle = style;
+    }
     /**
      * Set the current geometry type
      * @param geometryType the geometry type
@@ -17449,6 +17507,12 @@ class DrawControl {
     setGeometryType(geometryType) {
         this.olGeometryType = geometryType;
     }
+    /**
+     * Get the current geometry type
+     */
+    getGeometryType() {
+        return this.olGeometryType;
+    }
     /**
      * Create a drawing source if none is defined in the options
      */
@@ -17490,21 +17554,35 @@ class DrawControl {
         // Create Draw interaction
         let olDrawInteraction;
         if (!this.freehand$.getValue()) {
-            olDrawInteraction = new OlDraw({
-                type: this.olGeometryType,
-                source: this.getSource(),
-                stopClick: true,
-                style: this.options.interactionStyle,
-                maxPoints: this.options.maxPoints,
-                freehand: false,
-                freehandCondition: () => false
-            });
+            if (!this.ispredefinedRadius$.getValue()) {
+                olDrawInteraction = new OlDraw({
+                    type: this.olGeometryType,
+                    source: this.getSource(),
+                    stopClick: true,
+                    style: this.olInteractionStyle,
+                    maxPoints: this.options.maxPoints,
+                    freehand: false,
+                    freehandCondition: () => false
+                });
+            }
+            else {
+                olDrawInteraction = new OlDraw({
+                    type: 'Point',
+                    source: this.getSource(),
+                    stopClick: true,
+                    style: this.olInteractionStyle,
+                    maxPoints: this.options.maxPoints,
+                    freehand: false,
+                    freehandCondition: () => false
+                });
+            }
         }
         else {
             if (this.olGeometryType === 'Point') {
                 olDrawInteraction = new OlDraw({
                     type: 'Circle',
                     source: this.getSource(),
+                    style: typeof this.olInteractionStyle === 'function' ? undefined : this.olInteractionStyle,
                     maxPoints: this.options.maxPoints,
                     freehand: true
                 });
@@ -17513,6 +17591,7 @@ class DrawControl {
                 olDrawInteraction = new OlDraw({
                     type: this.olGeometryType,
                     source: this.getSource(),
+                    style: this.olInteractionStyle,
                     maxPoints: this.options.maxPoints,
                     freehand: true
                 });
@@ -17575,6 +17654,9 @@ class DrawControl {
      * @param event Draw event (drawend)
      */
     onDrawEnd(event) {
+        if (event.feature.getGeometry().getType() === 'Point') {
+            this.radiusDrawEnd$.next(this.predefinedRadius$.getValue());
+        }
         this.unsubscribeKeyDown();
         unByKey(this.onDrawKey);
         const olGeometry = event.feature.getGeometry();
@@ -17632,63 +17714,614 @@ class DrawControl {
     }
 }
 
+function DrawPopupComponent_div_12_mat_radio_group_5_mat_radio_button_1_Template(rf, ctx) {
+    if (rf & 1) {
+        const _r10 = i0.ɵɵgetCurrentView();
+        i0.ɵɵelementStart(0, "mat-radio-button", 11);
+        i0.ɵɵlistener("change", function DrawPopupComponent_div_12_mat_radio_group_5_mat_radio_button_1_Template_mat_radio_button_change_0_listener($event) { i0.ɵɵrestoreView(_r10); const ctx_r9 = i0.ɵɵnextContext(3); return i0.ɵɵresetView(ctx_r9.onLabelTypeChange($event.value)); });
+        i0.ɵɵtext(1);
+        i0.ɵɵelementEnd();
+    }
+    if (rf & 2) {
+        const option_r8 = ctx.$implicit;
+        const ctx_r7 = i0.ɵɵnextContext(3);
+        i0.ɵɵproperty("value", option_r8.value)("disabled", ctx_r7.optionAvailable(option_r8.value))("checked", option_r8.checked);
+        i0.ɵɵadvance(1);
+        i0.ɵɵtextInterpolate1(" ", ctx_r7.getProperLengthLabel(option_r8.value), " ");
+    }
+}
+function DrawPopupComponent_div_12_mat_radio_group_5_Template(rf, ctx) {
+    if (rf & 1) {
+        i0.ɵɵelementStart(0, "mat-radio-group", 5);
+        i0.ɵɵtemplate(1, DrawPopupComponent_div_12_mat_radio_group_5_mat_radio_button_1_Template, 2, 4, "mat-radio-button", 10);
+        i0.ɵɵelementEnd();
+    }
+    if (rf & 2) {
+        const ctx_r2 = i0.ɵɵnextContext(2);
+        i0.ɵɵadvance(1);
+        i0.ɵɵproperty("ngForOf", ctx_r2.arrayBuiltInType);
+    }
+}
+function DrawPopupComponent_div_12_ng_container_6_mat_checkbox_1_Template(rf, ctx) {
+    if (rf & 1) {
+        const _r14 = i0.ɵɵgetCurrentView();
+        i0.ɵɵelementStart(0, "mat-checkbox", 13);
+        i0.ɵɵlistener("change", function DrawPopupComponent_div_12_ng_container_6_mat_checkbox_1_Template_mat_checkbox_change_0_listener($event) { i0.ɵɵrestoreView(_r14); const ctx_r13 = i0.ɵɵnextContext(3); return i0.ɵɵresetView(ctx_r13.onLabelTypeChange($event.source.value, $event.checked)); });
+        i0.ɵɵtext(1);
+        i0.ɵɵelementEnd();
+    }
+    if (rf & 2) {
+        const option_r12 = ctx.$implicit;
+        const ctx_r11 = i0.ɵɵnextContext(3);
+        i0.ɵɵproperty("value", option_r12.value)("disabled", ctx_r11.optionAvailable(option_r12.value))("checked", option_r12.checked);
+        i0.ɵɵadvance(1);
+        i0.ɵɵtextInterpolate1(" ", ctx_r11.getProperLengthLabel(option_r12.value), " ");
+    }
+}
+function DrawPopupComponent_div_12_ng_container_6_Template(rf, ctx) {
+    if (rf & 1) {
+        i0.ɵɵelementContainerStart(0, 5);
+        i0.ɵɵtemplate(1, DrawPopupComponent_div_12_ng_container_6_mat_checkbox_1_Template, 2, 4, "mat-checkbox", 12);
+        i0.ɵɵelementContainerEnd();
+    }
+    if (rf & 2) {
+        const ctx_r3 = i0.ɵɵnextContext(2);
+        i0.ɵɵadvance(1);
+        i0.ɵɵproperty("ngForOf", ctx_r3.arrayBuiltInType);
+    }
+}
+function DrawPopupComponent_div_12_div_7_mat_option_6_Template(rf, ctx) {
+    if (rf & 1) {
+        i0.ɵɵelementStart(0, "mat-option", 3);
+        i0.ɵɵtext(1);
+        i0.ɵɵelementEnd();
+    }
+    if (rf & 2) {
+        const unit_r17 = ctx.$implicit;
+        i0.ɵɵproperty("value", unit_r17);
+        i0.ɵɵadvance(1);
+        i0.ɵɵtextInterpolate1(" ", unit_r17, " ");
+    }
+}
+function DrawPopupComponent_div_12_div_7_Template(rf, ctx) {
+    if (rf & 1) {
+        const _r19 = i0.ɵɵgetCurrentView();
+        i0.ɵɵelementStart(0, "div")(1, "mat-form-field", 14);
+        i0.ɵɵelement(2, "input", 15, 16);
+        i0.ɵɵelementEnd();
+        i0.ɵɵelementStart(4, "mat-form-field", 17)(5, "mat-select", 18);
+        i0.ɵɵlistener("selectionChange", function DrawPopupComponent_div_12_div_7_Template_mat_select_selectionChange_5_listener($event) { i0.ɵɵrestoreView(_r19); const ctx_r18 = i0.ɵɵnextContext(2); return i0.ɵɵresetView(ctx_r18.onChangeCoordinateUnit($event.value)); });
+        i0.ɵɵtemplate(6, DrawPopupComponent_div_12_div_7_mat_option_6_Template, 2, 2, "mat-option", 19);
+        i0.ɵɵelementEnd()()();
+    }
+    if (rf & 2) {
+        const ctx_r4 = i0.ɵɵnextContext(2);
+        i0.ɵɵadvance(2);
+        i0.ɵɵpropertyInterpolate("value", ctx_r4.currentCoordinates);
+        i0.ɵɵadvance(3);
+        i0.ɵɵproperty("value", ctx_r4.coordinatesMeasureUnit);
+        i0.ɵɵadvance(1);
+        i0.ɵɵproperty("ngForOf", ctx_r4.allCoordinatesUnits);
+    }
+}
+function DrawPopupComponent_div_12_div_8_mat_option_6_Template(rf, ctx) {
+    if (rf & 1) {
+        i0.ɵɵelementStart(0, "mat-option", 3);
+        i0.ɵɵtext(1);
+        i0.ɵɵelementEnd();
+    }
+    if (rf & 2) {
+        const unit_r22 = ctx.$implicit;
+        const ctx_r21 = i0.ɵɵnextContext(3);
+        i0.ɵɵproperty("value", unit_r22);
+        i0.ɵɵadvance(1);
+        i0.ɵɵtextInterpolate1(" ", ctx_r21.getLengthUnitEnum(unit_r22), " ");
+    }
+}
+function DrawPopupComponent_div_12_div_8_Template(rf, ctx) {
+    if (rf & 1) {
+        const _r24 = i0.ɵɵgetCurrentView();
+        i0.ɵɵelementStart(0, "div")(1, "mat-form-field", 14);
+        i0.ɵɵelement(2, "input", 20, 16);
+        i0.ɵɵelementEnd();
+        i0.ɵɵelementStart(4, "mat-form-field", 17)(5, "mat-select", 18);
+        i0.ɵɵlistener("selectionChange", function DrawPopupComponent_div_12_div_8_Template_mat_select_selectionChange_5_listener($event) { i0.ɵɵrestoreView(_r24); const ctx_r23 = i0.ɵɵnextContext(2); return i0.ɵɵresetView(ctx_r23.onChangeLengthUnit($event.value)); });
+        i0.ɵɵtemplate(6, DrawPopupComponent_div_12_div_8_mat_option_6_Template, 2, 2, "mat-option", 19);
+        i0.ɵɵelementEnd()()();
+    }
+    if (rf & 2) {
+        const ctx_r5 = i0.ɵɵnextContext(2);
+        i0.ɵɵadvance(2);
+        i0.ɵɵpropertyInterpolate("placeholder", ctx_r5.lengthLabelT);
+        i0.ɵɵpropertyInterpolate("value", ctx_r5.currentLength);
+        i0.ɵɵadvance(3);
+        i0.ɵɵproperty("value", ctx_r5.lengthMeasureUnit);
+        i0.ɵɵadvance(1);
+        i0.ɵɵproperty("ngForOf", ctx_r5.allLengthUnits);
+    }
+}
+function DrawPopupComponent_div_12_div_9_mat_option_7_Template(rf, ctx) {
+    if (rf & 1) {
+        i0.ɵɵelementStart(0, "mat-option", 3);
+        i0.ɵɵtext(1);
+        i0.ɵɵelementEnd();
+    }
+    if (rf & 2) {
+        const unit_r27 = ctx.$implicit;
+        const ctx_r26 = i0.ɵɵnextContext(3);
+        i0.ɵɵproperty("value", unit_r27);
+        i0.ɵɵadvance(1);
+        i0.ɵɵtextInterpolate1(" ", ctx_r26.getAreaUnitEnum(unit_r27), " ");
+    }
+}
+function DrawPopupComponent_div_12_div_9_Template(rf, ctx) {
+    if (rf & 1) {
+        const _r29 = i0.ɵɵgetCurrentView();
+        i0.ɵɵelementStart(0, "div")(1, "mat-form-field", 14);
+        i0.ɵɵelement(2, "input", 20, 16);
+        i0.ɵɵpipe(4, "translate");
+        i0.ɵɵelementEnd();
+        i0.ɵɵelementStart(5, "mat-form-field", 17)(6, "mat-select", 18);
+        i0.ɵɵlistener("selectionChange", function DrawPopupComponent_div_12_div_9_Template_mat_select_selectionChange_6_listener($event) { i0.ɵɵrestoreView(_r29); const ctx_r28 = i0.ɵɵnextContext(2); return i0.ɵɵresetView(ctx_r28.onChangeAreaUnit($event.value)); });
+        i0.ɵɵtemplate(7, DrawPopupComponent_div_12_div_9_mat_option_7_Template, 2, 2, "mat-option", 19);
+        i0.ɵɵelementEnd()()();
+    }
+    if (rf & 2) {
+        const ctx_r6 = i0.ɵɵnextContext(2);
+        i0.ɵɵadvance(2);
+        i0.ɵɵpropertyInterpolate("placeholder", i0.ɵɵpipeBind1(4, 4, "igo.geo.draw.labelType.Area"));
+        i0.ɵɵpropertyInterpolate("value", ctx_r6.currentArea);
+        i0.ɵɵadvance(4);
+        i0.ɵɵproperty("value", ctx_r6.areaMeasureUnit);
+        i0.ɵɵadvance(1);
+        i0.ɵɵproperty("ngForOf", ctx_r6.allAreaUnits);
+    }
+}
+function DrawPopupComponent_div_12_Template(rf, ctx) {
+    if (rf & 1) {
+        const _r31 = i0.ɵɵgetCurrentView();
+        i0.ɵɵelementStart(0, "div")(1, "div")(2, "p", 5);
+        i0.ɵɵtext(3);
+        i0.ɵɵpipe(4, "translate");
+        i0.ɵɵelementEnd();
+        i0.ɵɵtemplate(5, DrawPopupComponent_div_12_mat_radio_group_5_Template, 2, 1, "mat-radio-group", 6);
+        i0.ɵɵtemplate(6, DrawPopupComponent_div_12_ng_container_6_Template, 2, 1, "ng-container", 6);
+        i0.ɵɵtemplate(7, DrawPopupComponent_div_12_div_7_Template, 7, 3, "div", 4);
+        i0.ɵɵtemplate(8, DrawPopupComponent_div_12_div_8_Template, 7, 4, "div", 4);
+        i0.ɵɵtemplate(9, DrawPopupComponent_div_12_div_9_Template, 8, 6, "div", 4);
+        i0.ɵɵelementEnd();
+        i0.ɵɵelementStart(10, "div", 7)(11, "button", 8);
+        i0.ɵɵlistener("click", function DrawPopupComponent_div_12_Template_button_click_11_listener() { i0.ɵɵrestoreView(_r31); const ctx_r30 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r30.cancelDrawing()); });
+        i0.ɵɵtext(12);
+        i0.ɵɵpipe(13, "translate");
+        i0.ɵɵelementEnd();
+        i0.ɵɵelementStart(14, "button", 9);
+        i0.ɵɵlistener("click", function DrawPopupComponent_div_12_Template_button_click_14_listener() { i0.ɵɵrestoreView(_r31); const ctx_r32 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r32.confirm()); });
+        i0.ɵɵtext(15);
+        i0.ɵɵelementEnd()()();
+    }
+    if (rf & 2) {
+        const ctx_r0 = i0.ɵɵnextContext();
+        i0.ɵɵadvance(3);
+        i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(4, 8, "igo.geo.draw.builtInInstructions"));
+        i0.ɵɵadvance(2);
+        i0.ɵɵproperty("ngIf", ctx_r0.olGeometryType !== "Polygon");
+        i0.ɵɵadvance(1);
+        i0.ɵɵproperty("ngIf", ctx_r0.olGeometryType === "Polygon");
+        i0.ɵɵadvance(1);
+        i0.ɵɵproperty("ngIf", ctx_r0.labelFlag === ctx_r0.labelType.Coordinates);
+        i0.ɵɵadvance(1);
+        i0.ɵɵproperty("ngIf", ctx_r0.labelFlag === ctx_r0.labelType.Length || ctx_r0.polygonCheck === 2);
+        i0.ɵɵadvance(1);
+        i0.ɵɵproperty("ngIf", ctx_r0.labelFlag === ctx_r0.labelType.Area || ctx_r0.polygonCheck === 2);
+        i0.ɵɵadvance(3);
+        i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(13, 10, "igo.geo.draw.cancel"), " ");
+        i0.ɵɵadvance(3);
+        i0.ɵɵtextInterpolate1(" ", ctx_r0.noLabelButton(), " ");
+    }
+}
+function DrawPopupComponent_div_13_Template(rf, ctx) {
+    if (rf & 1) {
+        const _r36 = i0.ɵɵgetCurrentView();
+        i0.ɵɵelementStart(0, "div")(1, "div")(2, "p", 5);
+        i0.ɵɵtext(3);
+        i0.ɵɵpipe(4, "translate");
+        i0.ɵɵelementEnd();
+        i0.ɵɵelementStart(5, "mat-form-field", 21)(6, "input", 22, 16);
+        i0.ɵɵlistener("select", function DrawPopupComponent_div_13_Template_input_select_6_listener() { return true; })("input", function DrawPopupComponent_div_13_Template_input_input_6_listener($event) { i0.ɵɵrestoreView(_r36); const ctx_r35 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r35.getLabelLength($event.target.value)); });
+        i0.ɵɵpipe(8, "translate");
+        i0.ɵɵelementEnd()()();
+        i0.ɵɵelementStart(9, "div", 7)(10, "button", 8);
+        i0.ɵɵlistener("click", function DrawPopupComponent_div_13_Template_button_click_10_listener() { i0.ɵɵrestoreView(_r36); const ctx_r37 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r37.cancelDrawing()); });
+        i0.ɵɵtext(11);
+        i0.ɵɵpipe(12, "translate");
+        i0.ɵɵelementEnd();
+        i0.ɵɵelementStart(13, "button", 9);
+        i0.ɵɵlistener("click", function DrawPopupComponent_div_13_Template_button_click_13_listener() { i0.ɵɵrestoreView(_r36); const _r33 = i0.ɵɵreference(7); const ctx_r38 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r38.confirm(_r33.value)); });
+        i0.ɵɵtext(14);
+        i0.ɵɵelementEnd()()();
+    }
+    if (rf & 2) {
+        const ctx_r1 = i0.ɵɵnextContext();
+        i0.ɵɵadvance(3);
+        i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(4, 5, "igo.geo.draw.dialogInstruction"));
+        i0.ɵɵadvance(3);
+        i0.ɵɵpropertyInterpolate("placeholder", i0.ɵɵpipeBind1(8, 7, "igo.geo.draw.dialogTitle"));
+        i0.ɵɵpropertyInterpolate("value", ctx_r1.currentLabel);
+        i0.ɵɵadvance(5);
+        i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(12, 9, "igo.geo.draw.cancel"), " ");
+        i0.ɵɵadvance(3);
+        i0.ɵɵtextInterpolate1(" ", ctx_r1.noLabelButton(), " ");
+    }
+}
 class DrawPopupComponent {
-    constructor(dialogRef, data) {
+    constructor(languageService, dialogRef, data) {
+        var _a;
+        this.languageService = languageService;
         this.dialogRef = dialogRef;
         this.data = data;
         this.confirmFlag = false;
-    }
+        this.labelFlag = LabelType.Custom;
+        this.geometryType = GeometryType;
+        this.labelType = LabelType;
+        this.arrayBuiltInType = [];
+        this.olGeometryType = undefined;
+        this.polygonCheck = 0; // Count for polygon label types checkboxes
+        this.currentLabel = this.data.olGeometry.get('draw');
+        this.labelLength = this.currentLabel ? this.currentLabel.length : 0;
+        let olGeometry;
+        const projection = this.data.map.ol.getView().getProjection();
+        if (this.data.olGeometry instanceof OlFeature) {
+            if (this.data.olGeometry.get('rad')) {
+                const longitudeLatitude = [this.data.olGeometry.get('longitude'), this.data.olGeometry.get('latitude')];
+                this.olGeometryType = GeometryType.Circle;
+                olGeometry = new OlCircle(longitudeLatitude, this.data.olGeometry.get('rad'));
+            }
+            else {
+                this.olGeometryType = this.data.olGeometry.getGeometry().getType();
+                olGeometry = this.data.olGeometry.get('geometry');
+            }
+        }
+        else {
+            this.olGeometryType = this.data.olGeometry.getType();
+            olGeometry = this.data.olGeometry;
+        }
+        if (this.olGeometryType === GeometryType.Point || this.olGeometryType === GeometryType.Circle) {
+            if (this.data.olGeometry instanceof OlFeature) {
+                let longitude = this.data.olGeometry.get('longitude');
+                let latitude = this.data.olGeometry.get('latitude');
+                this.longlatDD = roundCoordTo([longitude, latitude], 5);
+                this.coordinatesInDD = '(' + latitude + ', '
+                    + longitude + ')';
+            }
+            else {
+                let point4326 = transform(this.data.olGeometry.getFlatCoordinates(), projection, 'EPSG:4326');
+                this.longlatDD = roundCoordTo([point4326[0], point4326[1]], 5);
+                this.coordinatesInDD =
+                    '(' + this.longlatDD[1] + ', ' + this.longlatDD[0] + ')';
+            }
+            this.currentCoordinates = this.coordinatesInDD;
+        }
+        if (this.olGeometryType === GeometryType.LineString) {
+            this.lengthInMeters = measureOlGeometryLength(olGeometry, projection.getCode()).toFixed(2);
+            this.currentLength = this.lengthInMeters;
+        }
+        else if (this.olGeometryType === GeometryType.Polygon) {
+            this.lengthInMeters = measureOlGeometryLength(olGeometry, projection.getCode()).toFixed(2);
+            this.currentLength = this.lengthInMeters;
+            this.areaInMetersSquare = measureOlGeometryArea(olGeometry, projection.getCode()).toFixed(2);
+            this.currentArea = this.areaInMetersSquare;
+        }
+        else if (this.olGeometryType === GeometryType.Circle) {
+            let circularPolygon = fromCircle(olGeometry, 10000);
+            const radius = this.getRadius(circularPolygon);
+            this.lengthInMeters = radius.toFixed(2);
+            this.currentLength = this.lengthInMeters;
+            this.areaInMetersSquare = measureOlGeometryArea(circularPolygon, projection.getCode()).toFixed(2);
+            this.currentArea = this.areaInMetersSquare;
+        }
+        if (data.olGeometry.get('labelType') === LabelType.Coordinates) {
+            this.onLabelTypeChange(LabelType.Predefined);
+            this.onLabelTypeChange(LabelType.Coordinates, true);
+            this.coordinatesMeasureUnit = data.olGeometry.get('measureUnit');
+        }
+        else if (data.olGeometry.get('labelType') === LabelType.Length) {
+            this.onLabelTypeChange(LabelType.Predefined);
+            this.onLabelTypeChange(LabelType.Length, true);
+            this.lengthMeasureUnit = data.olGeometry.get('measureUnit');
+        }
+        else if (data.olGeometry.get('labelType') === LabelType.Area) {
+            this.onLabelTypeChange(LabelType.Predefined);
+            this.onLabelTypeChange(LabelType.Area, true);
+            this.areaMeasureUnit = data.olGeometry.get('measureUnit');
+        }
+        else if (((_a = data.olGeometry.get('labelType')) === null || _a === void 0 ? void 0 : _a.length) === 2) {
+            this.onLabelTypeChange(LabelType.Predefined);
+            this.onLabelTypeChange(LabelType.Length, true);
+            this.onLabelTypeChange(LabelType.Area, true);
+            this.lengthMeasureUnit = data.olGeometry.get('measureUnit')[0];
+            this.areaMeasureUnit = data.olGeometry.get('measureUnit')[1];
+        }
+        this.buildArrayType();
+    }
+    /**
+     * HTML Interactions
+     */
     cancelDrawing() {
         this.dialogRef.close();
     }
-    confirm(labelString) {
+    confirm(input) {
         this.confirmFlag = true;
-        this.dialogRef.close(labelString);
+        if (this.labelFlag === LabelType.Predefined) {
+            this.dialogRef.close();
+        }
+        else if (this.labelFlag === LabelType.Custom) {
+            this.dialogRef.close({
+                label: input
+            });
+        }
+        else if (this.labelFlag === LabelType.Coordinates) {
+            this.dialogRef.close({
+                label: this.currentCoordinates,
+                measureUnit: this.coordinatesMeasureUnit
+            });
+        }
+        else if (this.olGeometryType === GeometryType.Polygon) {
+            if (this.polygonCheck === 2) {
+                this.labelFlag = [LabelType.Length, LabelType.Area];
+                this.dialogRef.close({
+                    label: 'P: ' + this.currentLength + ' ' + MeasureLengthUnitAbbreviation[MeasureLengthUnit.Meters] + '\n'
+                        + this.languageService.translate.instant('igo.geo.draw.labelType.A') + this.currentArea + ' ' +
+                        MeasureAreaUnitAbbreviation[MeasureAreaUnit.SquareMeters], measureUnit: [this.lengthMeasureUnit, this.areaMeasureUnit]
+                });
+            }
+            else {
+                this.labelFlag === LabelType.Length ?
+                    this.dialogRef.close({
+                        label: 'P: ' + this.currentLength + ' ' + MeasureLengthUnitAbbreviation[this.lengthMeasureUnit],
+                        measureUnit: this.lengthMeasureUnit
+                    }) :
+                    this.dialogRef.close({
+                        label: this.currentArea + ' ' + MeasureAreaUnitAbbreviation[this.areaMeasureUnit],
+                        measureUnit: this.areaMeasureUnit
+                    });
+            }
+        }
+        else if (this.labelFlag === LabelType.Length) {
+            if (this.olGeometryType === GeometryType.Circle) {
+                this.dialogRef.close({
+                    label: 'R: ' + this.currentLength + ' ' + MeasureLengthUnitAbbreviation[this.lengthMeasureUnit],
+                    measureUnit: this.lengthMeasureUnit
+                });
+            }
+            else if (this.olGeometryType === GeometryType.LineString) {
+                this.dialogRef.close({
+                    label: this.currentLength + ' ' + MeasureLengthUnitAbbreviation[this.lengthMeasureUnit],
+                    measureUnit: this.lengthMeasureUnit
+                });
+            }
+        }
+        else if (this.labelFlag === LabelType.Area) {
+            this.dialogRef.close({
+                label: this.currentArea + ' ' + MeasureAreaUnitAbbreviation[this.areaMeasureUnit],
+                measureUnit: this.areaMeasureUnit
+            });
+        }
+    }
+    onLabelTypeChange(labelType, checked) {
+        var _a;
+        if (labelType !== LabelType.Predefined &&
+            labelType !== LabelType.Custom &&
+            this.olGeometryType === GeometryType.Polygon) {
+            this.arrayBuiltInType.find(type => type.value === labelType) ?
+                this.arrayBuiltInType.find(type => type.value === labelType).checked = checked : this.labelFlag = undefined;
+            checked ? this.labelFlag = labelType : this.labelFlag = (_a = this.arrayBuiltInType.find(type => type.checked)) === null || _a === void 0 ? void 0 : _a.value;
+        }
+        else {
+            this.labelFlag = labelType;
+        }
+        if (labelType === LabelType.Predefined) {
+            if (this.olGeometryType === GeometryType.Point) {
+                this.labelFlag = LabelType.Coordinates;
+                this.currentCoordinates = this.coordinatesInDD;
+                this.coordinatesMeasureUnit = CoordinatesUnit.DecimalDegree;
+            }
+            else if (this.olGeometryType === GeometryType.LineString) {
+                this.labelFlag = LabelType.Length;
+                this.currentLength = this.lengthInMeters;
+                this.lengthMeasureUnit = MeasureLengthUnit.Meters;
+            }
+        }
+        else if (labelType === LabelType.Area) {
+            this.currentArea = this.areaInMetersSquare;
+            this.areaMeasureUnit = MeasureAreaUnit.SquareMeters;
+        }
+        else if (labelType === LabelType.Length) {
+            this.currentLength = this.lengthInMeters;
+            this.lengthMeasureUnit = MeasureLengthUnit.Meters;
+        }
+        else if (this.labelFlag === LabelType.Coordinates) {
+            this.currentCoordinates = this.coordinatesInDD;
+            this.coordinatesMeasureUnit = CoordinatesUnit.DecimalDegree;
+        }
+        const labeltypes = [this.labelType.Length, this.labelType.Area];
+        if (this.olGeometryType === GeometryType.Polygon &&
+            labeltypes.includes(labelType)) {
+            checked ? this.polygonCheck += 1 : this.polygonCheck -= 1;
+            ;
+        }
+        else {
+            this.polygonCheck = 0;
+        }
+    }
+    onChangeLengthUnit(lengthUnit) {
+        this.lengthMeasureUnit = lengthUnit;
+        this.currentLength = metersToUnit(Number(this.lengthInMeters), lengthUnit).toFixed(2);
+    }
+    onChangeAreaUnit(areaUnit) {
+        this.areaMeasureUnit = areaUnit;
+        this.currentArea = squareMetersToUnit(Number(this.areaInMetersSquare), areaUnit).toFixed(2);
+    }
+    onChangeCoordinateUnit(coordinatesUnit) {
+        this.coordinatesMeasureUnit = coordinatesUnit;
+        let coordinates = DDtoDMS(this.longlatDD, coordinatesUnit);
+        this.currentCoordinates = '(' + coordinates[1] + ', ' + coordinates[0] + ')';
+    }
+    buildArrayType() {
+        for (const labelType of Object.values(LabelType)) {
+            if (labelType !== LabelType.Custom && labelType !== LabelType.Predefined) {
+                this.arrayBuiltInType.push({
+                    value: labelType,
+                    checked: this.selectOptions(labelType) ||
+                        this.labelFlag === labelType ||
+                        (this.polygonCheck === 2 && labelType !== LabelType.Coordinates)
+                });
+            }
+        }
+    }
+    noLabelButton() {
+        if (this.labelFlag === LabelType.Predefined || (this.labelFlag === LabelType.Custom && this.labelLength === 0)) {
+            return this.languageService.translate.instant('igo.geo.draw.noLabel');
+        }
+        return 'OK';
+    }
+    get customOrPredefined() {
+        if (this.labelFlag === LabelType.Custom) {
+            return LabelType.Custom;
+        }
+        return LabelType.Predefined;
+    }
+    optionAvailable(currentOption) {
+        switch (this.olGeometryType) {
+            case GeometryType.Point:
+                if (currentOption === LabelType.Coordinates) {
+                    return false;
+                }
+                return true;
+            case GeometryType.LineString:
+                if (currentOption === LabelType.Length) {
+                    return false;
+                }
+                return true;
+            case GeometryType.Polygon:
+                if (currentOption === LabelType.Coordinates) {
+                    return true;
+                }
+                return false;
+            default:
+                return false;
+        }
+    }
+    get allLengthUnits() {
+        return Object.values(MeasureLengthUnit);
+    }
+    getLengthUnitEnum(lengthUnit) {
+        return MeasureLengthUnitAbbreviation[lengthUnit];
+    }
+    get allAreaUnits() {
+        return Object.values(MeasureAreaUnit);
+    }
+    get allCoordinatesUnits() {
+        return Object.values(CoordinatesUnit);
+    }
+    getAreaUnitEnum(areaUnit) {
+        return MeasureAreaUnitAbbreviation[areaUnit];
+    }
+    getRadius(olGeometry) {
+        const length = getLength(olGeometry);
+        return Number(length / (2 * Math.PI));
+    }
+    get lengthLabelT() {
+        if (this.olGeometryType === GeometryType.Polygon) {
+            return this.languageService.translate.instant('igo.geo.measure.perimeter');
+        }
+        if (this.olGeometryType === GeometryType.Circle) {
+            return this.languageService.translate.instant('igo.geo.search.coordinates.radius');
+        }
+        return this.languageService.translate.instant('igo.geo.draw.labelType.Length');
+    }
+    getLabelLength(event) {
+        this.labelLength = event.length;
+    }
+    selectOptions(option) {
+        if (this.olGeometryType === GeometryType.Point) {
+            return option === LabelType.Coordinates;
+        }
+        else if (this.olGeometryType === GeometryType.LineString) {
+            return option === LabelType.Length;
+        }
+    }
+    getProperLengthLabel(option) {
+        if (option === LabelType.Length) {
+            if (this.olGeometryType === GeometryType.Polygon) {
+                return this.languageService.translate.instant('igo.geo.measure.perimeter');
+            }
+            if (this.olGeometryType === GeometryType.Circle) {
+                return this.languageService.translate.instant('igo.geo.search.coordinates.radius');
+            }
+            return this.languageService.translate.instant('igo.geo.draw.labelType.Length');
+        }
+        return this.languageService.translate.instant('igo.geo.draw.labelType.' + option);
     }
 }
-DrawPopupComponent.ɵfac = function DrawPopupComponent_Factory(t) { return new (t || DrawPopupComponent)(i0.ɵɵdirectiveInject(i1.MatDialogRef), i0.ɵɵdirectiveInject(MAT_DIALOG_DATA)); };
-DrawPopupComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: DrawPopupComponent, selectors: [["igo-draw-popup-component"]], inputs: { confirmFlag: "confirmFlag" }, decls: 14, vars: 10, consts: [["mat-dialog-content", ""], [1, "mat-typography"], [1, "example-full-width"], ["matInput", "", 3, "placeholder", "value"], ["input", ""], ["mat-dialog-actions", ""], ["mat-raised-button", "", 3, "click"], ["mat-raised-button", "", "color", "primary", 3, "click"]], template: function DrawPopupComponent_Template(rf, ctx) {
+DrawPopupComponent.ɵfac = function DrawPopupComponent_Factory(t) { return new (t || DrawPopupComponent)(i0.ɵɵdirectiveInject(i2$1.LanguageService), i0.ɵɵdirectiveInject(i1.MatDialogRef), i0.ɵɵdirectiveInject(MAT_DIALOG_DATA)); };
+DrawPopupComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: DrawPopupComponent, selectors: [["igo-draw-popup-component"]], inputs: { confirmFlag: "confirmFlag", labelFlag: "labelFlag", coordinatesMeasureUnit: "coordinatesMeasureUnit", lengthMeasureUnit: "lengthMeasureUnit", areaMeasureUnit: "areaMeasureUnit" }, decls: 14, vars: 14, consts: [["mat-dialog-title", ""], [1, "geometry-type-toggle", "mat-typography"], [3, "value", "change"], [3, "value"], [4, "ngIf"], [1, "mat-typography"], ["class", "mat-typography", 4, "ngIf"], ["mat-dialog-actions", ""], ["mat-raised-button", "", 3, "click"], ["mat-raised-button", "", "color", "primary", 3, "click"], [3, "value", "disabled", "checked", "change", 4, "ngFor", "ngForOf"], [3, "value", "disabled", "checked", "change"], ["class", "mat-typography", 3, "value", "disabled", "checked", "change", 4, "ngFor", "ngForOf"], [1, "mat-typography", 3, "value", "disabled", "checked", "change"], [1, "readOnly-Input"], ["matInput", "", "placeholder", "(Latitude, Longitude)", "readonly", "", 3, "value"], ["input", ""], [1, "unit-field"], [3, "value", "selectionChange"], [3, "value", 4, "ngFor", "ngForOf"], ["matInput", "", "readonly", "", 3, "placeholder", "value"], [1, "input"], ["matInput", "", "cdkFocusInitial", "", 3, "placeholder", "value", "select", "input"]], template: function DrawPopupComponent_Template(rf, ctx) {
         if (rf & 1) {
-            const _r1 = i0.ɵɵgetCurrentView();
-            i0.ɵɵelementStart(0, "div", 0)(1, "p", 1);
+            i0.ɵɵelementStart(0, "div")(1, "h2", 0);
             i0.ɵɵtext(2);
             i0.ɵɵpipe(3, "translate");
-            i0.ɵɵelementEnd();
-            i0.ɵɵelementStart(4, "mat-form-field", 2);
-            i0.ɵɵelement(5, "input", 3, 4);
-            i0.ɵɵpipe(7, "translate");
             i0.ɵɵelementEnd()();
-            i0.ɵɵelementStart(8, "div", 5)(9, "button", 6);
-            i0.ɵɵlistener("click", function DrawPopupComponent_Template_button_click_9_listener() { return ctx.cancelDrawing(); });
+            i0.ɵɵelementStart(4, "div", 1)(5, "mat-button-toggle-group", 2);
+            i0.ɵɵlistener("change", function DrawPopupComponent_Template_mat_button_toggle_group_change_5_listener($event) { return ctx.onLabelTypeChange($event.value); });
+            i0.ɵɵelementStart(6, "mat-button-toggle", 3);
+            i0.ɵɵtext(7);
+            i0.ɵɵpipe(8, "translate");
+            i0.ɵɵelementEnd();
+            i0.ɵɵelementStart(9, "mat-button-toggle", 3);
             i0.ɵɵtext(10);
             i0.ɵɵpipe(11, "translate");
-            i0.ɵɵelementEnd();
-            i0.ɵɵelementStart(12, "button", 7);
-            i0.ɵɵlistener("click", function DrawPopupComponent_Template_button_click_12_listener() { i0.ɵɵrestoreView(_r1); const _r0 = i0.ɵɵreference(6); return i0.ɵɵresetView(ctx.confirm(_r0.value)); });
-            i0.ɵɵtext(13, "OK ");
-            i0.ɵɵelementEnd()();
+            i0.ɵɵelementEnd()()();
+            i0.ɵɵtemplate(12, DrawPopupComponent_div_12_Template, 16, 12, "div", 4);
+            i0.ɵɵtemplate(13, DrawPopupComponent_div_13_Template, 15, 11, "div", 4);
         }
         if (rf & 2) {
             i0.ɵɵadvance(2);
-            i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(3, 4, "igo.geo.draw.dialogInstruction"));
+            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(3, 8, "igo.geo.draw.popupTitle"), " ");
             i0.ɵɵadvance(3);
-            i0.ɵɵpropertyInterpolate("placeholder", i0.ɵɵpipeBind1(7, 6, "igo.geo.draw.dialogTitle"));
-            i0.ɵɵpropertyInterpolate("value", ctx.data.currentLabel);
-            i0.ɵɵadvance(5);
-            i0.ɵɵtextInterpolate1("", i0.ɵɵpipeBind1(11, 8, "igo.geo.draw.cancel"), " ");
+            i0.ɵɵproperty("value", ctx.customOrPredefined);
+            i0.ɵɵadvance(1);
+            i0.ɵɵproperty("value", ctx.labelType.Custom);
+            i0.ɵɵadvance(1);
+            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(8, 10, "igo.geo.draw.labelType.custom"), " ");
+            i0.ɵɵadvance(2);
+            i0.ɵɵproperty("value", ctx.labelType.Predefined);
+            i0.ɵɵadvance(1);
+            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(11, 12, "igo.geo.draw.labelType.predefined"), " ");
+            i0.ɵɵadvance(2);
+            i0.ɵɵproperty("ngIf", ctx.labelFlag !== ctx.labelType.Custom);
+            i0.ɵɵadvance(1);
+            i0.ɵɵproperty("ngIf", ctx.labelFlag === ctx.labelType.Custom);
         }
-    }, dependencies: [i3.MatButton, i13.MatFormField, i14.MatInput, i1.MatDialogContent, i1.MatDialogActions, i7.TranslatePipe] });
+    }, dependencies: [i1$1.NgForOf, i1$1.NgIf, i3.MatButton, i18.MatButtonToggleGroup, i18.MatButtonToggle, i13.MatFormField, i14.MatInput, i15.MatSelect, i9.MatOption, i1.MatDialogTitle, i1.MatDialogActions, i17.MatRadioGroup, i17.MatRadioButton, i12.MatCheckbox, i7.TranslatePipe], styles: [".mat-radio-button[_ngcontent-%COMP%] ~ .mat-radio-button[_ngcontent-%COMP%]{margin-left:16px}.readOnly-Input[_ngcontent-%COMP%]{width:200px!important}.unit-field[_ngcontent-%COMP%]{width:50px;margin-left:10px;margin-top:10px}.mat-form-field[_ngcontent-%COMP%]{position:-webkit-sticky!important;position:sticky!important}.coordinatesInputView[_ngcontent-%COMP%]{top:5em!important}  .mat-form-field-wrapper{margin-bottom:-1.25em;margin-top:.25em}.geometry-type-toggle[_ngcontent-%COMP%], .mat-dialog-actions[_ngcontent-%COMP%]{display:flex!important;justify-content:center}.input[_ngcontent-%COMP%]{width:auto!important}.mat-button-toggle-group[_ngcontent-%COMP%], .mat-button-toggle[_ngcontent-%COMP%]{width:100%}mat-checkbox[_ngcontent-%COMP%]{margin-right:10px}"] });
 (function () {
     (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(DrawPopupComponent, [{
             type: Component,
-            args: [{ selector: 'igo-draw-popup-component', template: "<div mat-dialog-content>\n  <p class=\"mat-typography\">{{ 'igo.geo.draw.dialogInstruction' | translate }}</p>\n  <mat-form-field class=\"example-full-width\">\n    <input\n      #input\n      matInput\n      placeholder=\"{{'igo.geo.draw.dialogTitle' | translate}}\"\n      value=\"{{data.currentLabel}}\"/>\n  </mat-form-field>\n</div>\n<div mat-dialog-actions>\n  <button \n    mat-raised-button \n    (click)=\"cancelDrawing()\">{{'igo.geo.draw.cancel' | translate}}\n  </button>\n  <button \n    mat-raised-button \n    color=\"primary\" \n    (click)=\"confirm(input.value)\">OK\n  </button>\n</div>\n" }]
+            args: [{ selector: 'igo-draw-popup-component', template: "<div>\n  <h2 mat-dialog-title>\n    {{ 'igo.geo.draw.popupTitle' | translate }}\n  </h2>\n</div>\n\n\n<div class=\"geometry-type-toggle mat-typography\">\n  <mat-button-toggle-group\n    (change)=\"onLabelTypeChange($event.value)\" [value]=\"customOrPredefined\">\n    <mat-button-toggle [value]=\"labelType.Custom\" >\n      {{ 'igo.geo.draw.labelType.custom' | translate }}\n    </mat-button-toggle>\n    <mat-button-toggle [value]=\"labelType.Predefined\">\n      {{ 'igo.geo.draw.labelType.predefined' | translate }}\n    </mat-button-toggle>\n  </mat-button-toggle-group>\n</div>\n\n<div *ngIf=\"labelFlag !== labelType.Custom\">\n  <div>\n    <p class=\"mat-typography\">{{ 'igo.geo.draw.builtInInstructions' | translate }}</p>\n    <mat-radio-group *ngIf=\"olGeometryType !== 'Polygon'\" class=\"mat-typography\">\n      <mat-radio-button *ngFor=\"let option of arrayBuiltInType\" [value]=\"option.value\" [disabled]=\"optionAvailable(option.value)\" \n      (change)=\"onLabelTypeChange($event.value)\" [checked]=\"option.checked\">\n        {{getProperLengthLabel(option.value)}}\n      </mat-radio-button>\n    </mat-radio-group>\n    <ng-container class=\"mat-typography\" *ngIf=\"olGeometryType === 'Polygon'\">\n      <mat-checkbox\n        *ngFor=\"let option of arrayBuiltInType\"\n        class=\"mat-typography\"\n        [value]=\"option.value\"\n        [disabled]=\"optionAvailable(option.value)\"\n        (change)=\"onLabelTypeChange($event.source.value, $event.checked)\"\n        [checked]=\"option.checked\">\n        {{getProperLengthLabel(option.value)}}\n      </mat-checkbox>\n    </ng-container>\n    <div *ngIf=\"labelFlag === labelType.Coordinates\">\n      <mat-form-field class=\"readOnly-Input\">\n        <input\n          #input\n          matInput\n          placeholder=\"(Latitude, Longitude)\"\n          value=\"{{currentCoordinates}}\" readonly>\n      </mat-form-field>\n      <mat-form-field class=\"unit-field\">\n        <mat-select [value]=\"coordinatesMeasureUnit\" (selectionChange)=\"onChangeCoordinateUnit($event.value)\">\n          <mat-option *ngFor=\"let unit of allCoordinatesUnits\" [value]=\"unit\">\n            {{unit}}\n          </mat-option>\n        </mat-select>  \n      </mat-form-field>\n    </div>\n    <div *ngIf=\"labelFlag === labelType.Length || polygonCheck === 2\">\n      <mat-form-field class=\"readOnly-Input\">\n        <input\n          #input\n          matInput\n          placeholder={{lengthLabelT}}\n          value=\"{{currentLength}}\" readonly>\n      </mat-form-field>\n      <mat-form-field class=\"unit-field\">\n        <mat-select [value]=\"lengthMeasureUnit\" (selectionChange)=\"onChangeLengthUnit($event.value)\">\n          <mat-option *ngFor=\"let unit of allLengthUnits\" [value]=\"unit\">\n            {{getLengthUnitEnum(unit)}}\n          </mat-option>\n        </mat-select>  \n      </mat-form-field>\n    </div>\n    <div *ngIf=\"labelFlag === labelType.Area || polygonCheck === 2\">\n      <mat-form-field class=\"readOnly-Input\">\n        <input\n          #input\n          matInput\n          placeholder=\"{{ 'igo.geo.draw.labelType.Area' | translate }}\"\n          value=\"{{currentArea}}\" readonly>\n      </mat-form-field>\n      <mat-form-field class=\"unit-field\">\n        <mat-select [value]=\"areaMeasureUnit\" (selectionChange)=\"onChangeAreaUnit($event.value)\">\n          <mat-option *ngFor=\"let unit of allAreaUnits\" [value]=\"unit\">\n            {{getAreaUnitEnum(unit)}}\n          </mat-option>\n        </mat-select>\n      </mat-form-field>\n    </div>\n  </div>\n\n\n  <div mat-dialog-actions>\n    <button mat-raised-button (click)=\"cancelDrawing()\" >\n      {{'igo.geo.draw.cancel' | translate}}\n    </button>\n    <button \n      mat-raised-button \n      color=\"primary\" \n      (click)=\"confirm()\"> \n      {{noLabelButton()}} \n    </button>\n  </div>\n</div>\n\n<div *ngIf=\"labelFlag === labelType.Custom\">\n  <div>\n    <p class=\"mat-typography\">{{ 'igo.geo.draw.dialogInstruction' | translate }}</p>\n    <mat-form-field class=\"input\">\n      <input\n        #input\n        matInput\n        (select)=\"true\"\n        (input)=\"getLabelLength($event.target.value)\"\n        placeholder=\"{{'igo.geo.draw.dialogTitle' | translate}}\"\n        value=\"{{ currentLabel }}\"\n        cdkFocusInitial/>\n    </mat-form-field>\n  </div>\n  \n  <div mat-dialog-actions>\n    <button mat-raised-button (click)=\"cancelDrawing()\" >\n      {{'igo.geo.draw.cancel' | translate}}\n    </button>\n    <button \n      mat-raised-button \n      color=\"primary\" \n      (click)=\"confirm(input.value)\">\n      {{noLabelButton()}}\n    </button>\n  </div>\n</div>\n", styles: [".mat-radio-button~.mat-radio-button{margin-left:16px}.readOnly-Input{width:200px!important}.unit-field{width:50px;margin-left:10px;margin-top:10px}.mat-form-field{position:-webkit-sticky!important;position:sticky!important}.coordinatesInputView{top:5em!important}::ng-deep .mat-form-field-wrapper{margin-bottom:-1.25em;margin-top:.25em}.geometry-type-toggle,.mat-dialog-actions{display:flex!important;justify-content:center}.input{width:auto!important}.mat-button-toggle-group,.mat-button-toggle{width:100%}mat-checkbox{margin-right:10px}\n"] }]
         }], function () {
-        return [{ type: i1.MatDialogRef }, { type: undefined, decorators: [{
+        return [{ type: i2$1.LanguageService }, { type: i1.MatDialogRef }, { type: undefined, decorators: [{
                         type: Inject,
                         args: [MAT_DIALOG_DATA]
                     }] }];
     }, { confirmFlag: [{
                 type: Input
+            }], labelFlag: [{
+                type: Input
+            }], coordinatesMeasureUnit: [{
+                type: Input
+            }], lengthMeasureUnit: [{
+                type: Input
+            }], areaMeasureUnit: [{
+                type: Input
             }] });
 })();
 
@@ -17793,127 +18426,180 @@ DrawLayerPopupComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: Dra
 })();
 
 const _c0$c = ["selectedLayer"];
-function DrawComponent_mat_option_30_Template(rf, ctx) {
+function DrawComponent_mat_slide_toggle_22_Template(rf, ctx) {
+    if (rf & 1) {
+        const _r10 = i0.ɵɵgetCurrentView();
+        i0.ɵɵelementStart(0, "mat-slide-toggle", 5);
+        i0.ɵɵlistener("change", function DrawComponent_mat_slide_toggle_22_Template_mat_slide_toggle_change_0_listener($event) { i0.ɵɵrestoreView(_r10); const ctx_r9 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r9.onToggleFreehandMode($event)); });
+        i0.ɵɵtext(1);
+        i0.ɵɵpipe(2, "translate");
+        i0.ɵɵelementEnd();
+    }
+    if (rf & 2) {
+        const ctx_r0 = i0.ɵɵnextContext();
+        i0.ɵɵproperty("checked", ctx_r0.freehandMode)("labelPosition", "before");
+        i0.ɵɵadvance(1);
+        i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(2, 3, "igo.geo.draw.freehandMode"), " ");
+    }
+}
+function DrawComponent_div_23_mat_option_7_Template(rf, ctx) {
     if (rf & 1) {
         i0.ɵɵelementStart(0, "mat-option", 2);
         i0.ɵɵtext(1);
+        i0.ɵɵpipe(2, "translate");
         i0.ɵɵelementEnd();
     }
     if (rf & 2) {
-        const layer_r7 = ctx.$implicit;
-        i0.ɵɵproperty("value", layer_r7);
+        const measureUnit_r12 = ctx.$implicit;
+        i0.ɵɵproperty("value", measureUnit_r12);
         i0.ɵɵadvance(1);
-        i0.ɵɵtextInterpolate1(" ", layer_r7.title, " ");
+        i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(2, 2, "igo.geo.measure." + measureUnit_r12), " ");
     }
 }
-function DrawComponent_button_34_Template(rf, ctx) {
+function DrawComponent_div_23_Template(rf, ctx) {
     if (rf & 1) {
-        const _r9 = i0.ɵɵgetCurrentView();
-        i0.ɵɵelementStart(0, "button", 20);
-        i0.ɵɵlistener("click", function DrawComponent_button_34_Template_button_click_0_listener() { i0.ɵɵrestoreView(_r9); const ctx_r8 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r8.activeDrawingLayer.visible = !ctx_r8.activeDrawingLayer.visible); });
+        const _r14 = i0.ɵɵgetCurrentView();
+        i0.ɵɵelementStart(0, "div", 22)(1, "form", 23)(2, "mat-form-field", 24);
+        i0.ɵɵelement(3, "input", 25);
+        i0.ɵɵpipe(4, "translate");
+        i0.ɵɵelementEnd()();
+        i0.ɵɵelementStart(5, "mat-form-field", 26)(6, "mat-select", 9);
+        i0.ɵɵlistener("selectionChange", function DrawComponent_div_23_Template_mat_select_selectionChange_6_listener($event) { i0.ɵɵrestoreView(_r14); const ctx_r13 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r13.onMeasureUnitChange($event.value)); });
+        i0.ɵɵtemplate(7, DrawComponent_div_23_mat_option_7_Template, 3, 4, "mat-option", 11);
+        i0.ɵɵelementEnd()()();
+    }
+    if (rf & 2) {
+        const ctx_r1 = i0.ɵɵnextContext();
+        i0.ɵɵadvance(3);
+        i0.ɵɵpropertyInterpolate("placeholder", i0.ɵɵpipeBind1(4, 5, "igo.geo.spatialFilter.radius"));
+        i0.ɵɵproperty("formControl", ctx_r1.radiusFormControl)("readonly", ctx_r1.freehandMode);
+        i0.ɵɵadvance(3);
+        i0.ɵɵproperty("value", ctx_r1.measureUnit);
+        i0.ɵɵadvance(1);
+        i0.ɵɵproperty("ngForOf", ctx_r1.measureUnits);
+    }
+}
+function DrawComponent_mat_option_32_Template(rf, ctx) {
+    if (rf & 1) {
+        i0.ɵɵelementStart(0, "mat-option", 2);
+        i0.ɵɵtext(1);
+        i0.ɵɵelementEnd();
+    }
+    if (rf & 2) {
+        const layer_r15 = ctx.$implicit;
+        i0.ɵɵproperty("value", layer_r15);
+        i0.ɵɵadvance(1);
+        i0.ɵɵtextInterpolate1(" ", layer_r15.title, " ");
+    }
+}
+function DrawComponent_button_36_Template(rf, ctx) {
+    if (rf & 1) {
+        const _r17 = i0.ɵɵgetCurrentView();
+        i0.ɵɵelementStart(0, "button", 27);
+        i0.ɵɵlistener("click", function DrawComponent_button_36_Template_button_click_0_listener() { i0.ɵɵrestoreView(_r17); const ctx_r16 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r16.activeDrawingLayer.visible = !ctx_r16.activeDrawingLayer.visible); });
         i0.ɵɵpipe(1, "translate");
         i0.ɵɵpipe(2, "translate");
-        i0.ɵɵelement(3, "mat-icon", 21);
+        i0.ɵɵelement(3, "mat-icon", 28);
         i0.ɵɵelementEnd();
     }
     if (rf & 2) {
-        const ctx_r2 = i0.ɵɵnextContext();
-        i0.ɵɵproperty("color", ctx_r2.activeDrawingLayer.visible ? "primary" : "default")("matTooltip", ctx_r2.activeDrawingLayer.visible ? i0.ɵɵpipeBind1(1, 3, "igo.geo.layer.hideLayer") : i0.ɵɵpipeBind1(2, 5, "igo.geo.layer.showLayer"));
+        const ctx_r4 = i0.ɵɵnextContext();
+        i0.ɵɵproperty("color", ctx_r4.activeDrawingLayer.visible ? "primary" : "default")("matTooltip", ctx_r4.activeDrawingLayer.visible ? i0.ɵɵpipeBind1(1, 3, "igo.geo.layer.hideLayer") : i0.ɵɵpipeBind1(2, 5, "igo.geo.layer.showLayer"));
         i0.ɵɵadvance(3);
-        i0.ɵɵproperty("svgIcon", ctx_r2.activeDrawingLayer.visible ? "eye" : "eye-off");
+        i0.ɵɵproperty("svgIcon", ctx_r4.activeDrawingLayer.visible ? "eye" : "eye-off");
     }
 }
-function DrawComponent_button_37_Template(rf, ctx) {
+function DrawComponent_button_39_Template(rf, ctx) {
     if (rf & 1) {
-        const _r11 = i0.ɵɵgetCurrentView();
-        i0.ɵɵelementStart(0, "button", 22);
-        i0.ɵɵlistener("click", function DrawComponent_button_37_Template_button_click_0_listener() { i0.ɵɵrestoreView(_r11); const ctx_r10 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r10.deleteDrawings()); });
+        const _r19 = i0.ɵɵgetCurrentView();
+        i0.ɵɵelementStart(0, "button", 29);
+        i0.ɵɵlistener("click", function DrawComponent_button_39_Template_button_click_0_listener() { i0.ɵɵrestoreView(_r19); const ctx_r18 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r18.deleteDrawings()); });
         i0.ɵɵpipe(1, "translate");
         i0.ɵɵpipe(2, "async");
-        i0.ɵɵelement(3, "mat-icon", 23);
+        i0.ɵɵelement(3, "mat-icon", 30);
         i0.ɵɵelementEnd();
     }
     if (rf & 2) {
-        const ctx_r3 = i0.ɵɵnextContext();
-        i0.ɵɵproperty("matTooltip", i0.ɵɵpipeBind1(1, 2, "igo.geo.draw.delete"))("disabled", i0.ɵɵpipeBind1(2, 4, ctx_r3.selectedFeatures$).length === 0);
+        const ctx_r5 = i0.ɵɵnextContext();
+        i0.ɵɵproperty("matTooltip", i0.ɵɵpipeBind1(1, 2, "igo.geo.draw.delete"))("disabled", i0.ɵɵpipeBind1(2, 4, ctx_r5.selectedFeatures$).length === 0);
     }
 }
-function DrawComponent_mat_form_field_42_div_6_Template(rf, ctx) {
+function DrawComponent_mat_form_field_44_div_6_Template(rf, ctx) {
     if (rf & 1) {
-        i0.ɵɵelementStart(0, "div", 27);
-        i0.ɵɵelement(1, "img", 28);
+        i0.ɵɵelementStart(0, "div", 34);
+        i0.ɵɵelement(1, "img", 35);
         i0.ɵɵelementEnd();
     }
     if (rf & 2) {
-        const ctx_r12 = i0.ɵɵnextContext(2);
+        const ctx_r20 = i0.ɵɵnextContext(2);
         i0.ɵɵadvance(1);
-        i0.ɵɵpropertyInterpolate("src", ctx_r12.icon, i0.ɵɵsanitizeUrl);
+        i0.ɵɵpropertyInterpolate("src", ctx_r20.icon, i0.ɵɵsanitizeUrl);
     }
 }
-function DrawComponent_mat_form_field_42_mat_option_10_Template(rf, ctx) {
+function DrawComponent_mat_form_field_44_mat_option_10_Template(rf, ctx) {
     if (rf & 1) {
-        const _r16 = i0.ɵɵgetCurrentView();
-        i0.ɵɵelementStart(0, "mat-option", 29);
-        i0.ɵɵlistener("click", function DrawComponent_mat_form_field_42_mat_option_10_Template_mat_option_click_0_listener() { const restoredCtx = i0.ɵɵrestoreView(_r16); const icon_html_r14 = restoredCtx.$implicit; const ctx_r15 = i0.ɵɵnextContext(2); return i0.ɵɵresetView(ctx_r15.onIconChange(icon_html_r14)); });
-        i0.ɵɵelementStart(1, "div", 27);
-        i0.ɵɵelement(2, "img", 28);
+        const _r24 = i0.ɵɵgetCurrentView();
+        i0.ɵɵelementStart(0, "mat-option", 36);
+        i0.ɵɵlistener("click", function DrawComponent_mat_form_field_44_mat_option_10_Template_mat_option_click_0_listener() { const restoredCtx = i0.ɵɵrestoreView(_r24); const icon_html_r22 = restoredCtx.$implicit; const ctx_r23 = i0.ɵɵnextContext(2); return i0.ɵɵresetView(ctx_r23.onIconChange(icon_html_r22)); });
+        i0.ɵɵelementStart(1, "div", 34);
+        i0.ɵɵelement(2, "img", 35);
         i0.ɵɵelementEnd()();
     }
     if (rf & 2) {
-        const icon_html_r14 = ctx.$implicit;
-        i0.ɵɵproperty("value", icon_html_r14);
+        const icon_html_r22 = ctx.$implicit;
+        i0.ɵɵproperty("value", icon_html_r22);
         i0.ɵɵadvance(2);
-        i0.ɵɵpropertyInterpolate("src", icon_html_r14, i0.ɵɵsanitizeUrl);
+        i0.ɵɵpropertyInterpolate("src", icon_html_r22, i0.ɵɵsanitizeUrl);
     }
 }
-function DrawComponent_mat_form_field_42_Template(rf, ctx) {
+function DrawComponent_mat_form_field_44_Template(rf, ctx) {
     if (rf & 1) {
-        const _r18 = i0.ɵɵgetCurrentView();
+        const _r26 = i0.ɵɵgetCurrentView();
         i0.ɵɵelementStart(0, "mat-form-field")(1, "mat-label");
         i0.ɵɵtext(2);
         i0.ɵɵpipe(3, "translate");
         i0.ɵɵelementEnd();
         i0.ɵɵelementStart(4, "mat-select")(5, "mat-select-trigger");
-        i0.ɵɵtemplate(6, DrawComponent_mat_form_field_42_div_6_Template, 2, 1, "div", 24);
+        i0.ɵɵtemplate(6, DrawComponent_mat_form_field_44_div_6_Template, 2, 1, "div", 31);
         i0.ɵɵelementEnd();
-        i0.ɵɵelementStart(7, "mat-option", 25);
-        i0.ɵɵlistener("click", function DrawComponent_mat_form_field_42_Template_mat_option_click_7_listener() { i0.ɵɵrestoreView(_r18); const ctx_r17 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r17.onIconChange()); });
+        i0.ɵɵelementStart(7, "mat-option", 32);
+        i0.ɵɵlistener("click", function DrawComponent_mat_form_field_44_Template_mat_option_click_7_listener() { i0.ɵɵrestoreView(_r26); const ctx_r25 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r25.onIconChange()); });
         i0.ɵɵtext(8);
         i0.ɵɵpipe(9, "translate");
         i0.ɵɵelementEnd();
-        i0.ɵɵtemplate(10, DrawComponent_mat_form_field_42_mat_option_10_Template, 3, 2, "mat-option", 26);
+        i0.ɵɵtemplate(10, DrawComponent_mat_form_field_44_mat_option_10_Template, 3, 2, "mat-option", 33);
         i0.ɵɵelementEnd()();
     }
     if (rf & 2) {
-        const ctx_r5 = i0.ɵɵnextContext();
+        const ctx_r7 = i0.ɵɵnextContext();
         i0.ɵɵadvance(2);
         i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(3, 4, "igo.geo.draw.icon"));
         i0.ɵɵadvance(4);
-        i0.ɵɵproperty("ngIf", ctx_r5.icon);
+        i0.ɵɵproperty("ngIf", ctx_r7.icon);
         i0.ɵɵadvance(2);
         i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(9, 6, "igo.geo.draw.noIcon"));
         i0.ɵɵadvance(2);
-        i0.ɵɵproperty("ngForOf", ctx_r5.icons);
+        i0.ɵɵproperty("ngForOf", ctx_r7.icons);
     }
 }
-function DrawComponent_button_46_Template(rf, ctx) {
+function DrawComponent_button_48_Template(rf, ctx) {
     if (rf & 1) {
-        const _r20 = i0.ɵɵgetCurrentView();
-        i0.ɵɵelementStart(0, "button", 30);
-        i0.ɵɵlistener("click", function DrawComponent_button_46_Template_button_click_0_listener() { i0.ɵɵrestoreView(_r20); const ctx_r19 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r19.openStyleModalDialog()); });
+        const _r28 = i0.ɵɵgetCurrentView();
+        i0.ɵɵelementStart(0, "button", 37);
+        i0.ɵɵlistener("click", function DrawComponent_button_48_Template_button_click_0_listener() { i0.ɵɵrestoreView(_r28); const ctx_r27 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r27.openStyleModalDialog()); });
         i0.ɵɵpipe(1, "translate");
         i0.ɵɵtext(2);
         i0.ɵɵpipe(3, "translate");
-        i0.ɵɵelement(4, "mat-icon", 31);
+        i0.ɵɵelement(4, "mat-icon", 38);
         i0.ɵɵelementEnd();
     }
     if (rf & 2) {
-        const ctx_r6 = i0.ɵɵnextContext();
+        const ctx_r8 = i0.ɵɵnextContext();
         i0.ɵɵproperty("matTooltip", i0.ɵɵpipeBind1(1, 3, "igo.geo.layer.style.styleModalTooltip"));
         i0.ɵɵadvance(2);
         i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(3, 5, "igo.geo.layer.style.styleModal"), " ");
         i0.ɵɵadvance(2);
-        i0.ɵɵproperty("matBadge", ctx_r6.selectedFeatures$.value.length);
+        i0.ɵɵproperty("matBadge", ctx_r8.selectedFeatures$.value.length);
     }
 }
 class DrawComponent {
@@ -17938,10 +18624,24 @@ class DrawComponent {
                 {
                     name: 'Drawing',
                     title: this.languageService.translate.instant('igo.geo.draw.labels'),
-                    tooltip: this.languageService.translate.instant('igo.geo.draw.changeLabel'),
                     valueAccessor: (feature) => {
                         return feature.properties.draw;
                     }
+                },
+                {
+                    name: 'Edition',
+                    title: '',
+                    sort: false,
+                    valueAccessor: (feature) => {
+                        return [{
+                                editMode: false,
+                                icon: 'pencil',
+                                color: 'primary',
+                                click: () => { this.editLabelDrawing(feature); },
+                                style: 'mat-icon-button'
+                            }];
+                    },
+                    renderer: EntityTableColumnRenderer.ButtonGroup,
                 }
             ]
         };
@@ -17957,8 +18657,14 @@ class DrawComponent {
         this.selectedFeatures$ = new BehaviorSubject([]);
         this.drawControlIsDisabled = true;
         this.drawControlIsActive = false;
+        this.freehandMode = false;
         this.subscriptions$$ = [];
         this.position = 'bottom';
+        this.radiusFormControl = new UntypedFormControl(1000);
+        this.measureUnit = MeasureLengthUnit.Meters;
+        this.radiusFormControlChange$$ = new Subscription();
+        this.predefinedRadius$ = new BehaviorSubject(undefined);
+        this.radiusDrawEnd$ = new BehaviorSubject(undefined);
         this.isCreatingNewLayer = false;
         this.currGeometryType = this.geometryType.Point;
         this.buildForm();
@@ -17989,6 +18695,13 @@ class DrawComponent {
     set activeDrawingLayer(value) {
         this._activeDrawingLayer = value;
     }
+    /**
+     * Available measure units for the measure type given
+     * @internal
+     */
+    get measureUnits() {
+        return [MeasureLengthUnit.Meters, MeasureLengthUnit.Kilometers];
+    }
     // Initialize the store that will contain the entities and create the Draw control
     ngOnInit() {
         if (!this.stores.length) {
@@ -18041,6 +18754,11 @@ class DrawComponent {
             });
             this.onLayerChange(this.activeDrawingLayer);
         }
+        this.radiusFormControlChange$$ = this.radiusFormControl.valueChanges.subscribe(value => {
+            if (this.activeDrawControl.ispredefinedRadius$.getValue()) {
+                this.changeRadius(value);
+            }
+        });
     }
     /**
      * Remove the drawing layer and the interactions
@@ -18051,6 +18769,7 @@ class DrawComponent {
         this.activeStore.state.updateAll({ selected: false });
         this.deactivateDrawControl();
         this.subscriptions$$.map((s) => s.unsubscribe());
+        this.radiusFormControlChange$$.unsubscribe();
     }
     /**
      * Create a Draw Control
@@ -18124,30 +18843,21 @@ class DrawComponent {
             // open the dialog box used to enter label
             const dialogRef = this.dialog.open(DrawPopupComponent, {
                 disableClose: false,
-                data: { currentLabel: olGeometry.get('draw') }
+                data: { olGeometry: olGeometry, map: this.map }
             });
             // when dialog box is closed, get label and set it to geometry
-            dialogRef.afterClosed().subscribe((label) => {
+            dialogRef.afterClosed().subscribe((result) => {
                 // checks if the user clicked ok
                 if (dialogRef.componentInstance.confirmFlag) {
-                    this.updateLabelOfOlGeometry(olGeometry, label);
-                    if (!olGeometry.values_.fontStyle) {
-                        this.updateFontSizeAndStyle(olGeometry, '20', FontType.Arial);
-                    }
-                    if (!olGeometry.values_.drawingStyle) {
+                    this.updateLabelOfOlGeometry(olGeometry, result.label);
+                    this.updateLabelType(olGeometry, dialogRef.componentInstance.labelFlag);
+                    this.updateMeasureUnit(olGeometry, result.measureUnit);
+                    if (!(olGeometry instanceof OlFeature)) {
+                        this.updateFontSizeAndStyle(olGeometry, '15', FontType.Arial);
                         this.updateFillAndStrokeColor(olGeometry, 'rgba(255,255,255,0.4)', 'rgba(143,7,7,1)');
+                        this.updateOffset(olGeometry, 0, (olGeometry instanceof OlPoint) ? -15 : 0);
                     }
-                    if (!(olGeometry.values_.offsetX || olGeometry.values_.offsetY)) {
-                        this.updateOffset(olGeometry, 0, olGeometry instanceof OlPoint ? -15 : 0);
-                    }
-                    // if event was fired at draw end
-                    if (isDrawEnd) {
-                        this.onDrawEnd(olGeometry);
-                        // if event was fired at select
-                    }
-                    else {
-                        this.onSelectDraw(olGeometry, label);
-                    }
+                    isDrawEnd ? this.onDrawEnd(olGeometry) : this.onSelectDraw(olGeometry, result.label, [dialogRef.componentInstance.labelFlag, result.measureUnit]);
                     this.updateHeightTable();
                 }
                 // deletes the feature
@@ -18179,7 +18889,55 @@ class DrawComponent {
             const entityId = entity.properties.id;
             const olGeometryId = olGeometry.ol_uid;
             if (entityId === olGeometryId) {
-                this.updateLabelOfOlGeometry(olGeometry, entity.properties.draw);
+                if (entity.properties.labelType === LabelType.Coordinates) {
+                    let longLat = DDtoDMS([entity.properties.longitude, entity.properties.latitude], entity.properties.measureUnit);
+                    this.updateLabelOfOlGeometry(olGeometry, '(' + longLat[1] + ', ' + longLat[0] + ')');
+                }
+                else if (entity.properties.labelType === LabelType.Length) {
+                    if (olGeometry instanceof OlCircle) {
+                        let circularPolygon = fromCircle(olGeometry, 10000);
+                        const radius = metersToUnit(this.getRadius(circularPolygon), entity.properties.measureUnit);
+                        const unit = MeasureLengthUnitAbbreviation[entity.properties.measureUnit];
+                        const radiusLabel = 'R: ' + radius.toFixed(2).toString() + ' ' + unit;
+                        this.updateLabelOfOlGeometry(olGeometry, radiusLabel);
+                    }
+                    else {
+                        let olGeometryLength = measureOlGeometryLength(olGeometry, this.map.ol.getView().getProjection().getCode());
+                        let measureUnit;
+                        const temp = entity.properties.measureUnit;
+                        measureUnit = MeasureLengthUnitAbbreviation[entity.properties.measureUnit];
+                        olGeometryLength = metersToUnit(olGeometryLength, temp);
+                        let lengthLabel = olGeometry instanceof OlPolygon ?
+                            'P: ' + olGeometryLength.toFixed(2).toString() + ' ' + measureUnit
+                            : olGeometryLength.toFixed(2).toString() + ' ' + measureUnit;
+                        this.updateLabelOfOlGeometry(olGeometry, lengthLabel);
+                    }
+                }
+                else if (entity.properties.labelType === LabelType.Area) {
+                    if (olGeometry instanceof OlCircle) {
+                        let circularPolygon = fromCircle(olGeometry, 10000);
+                        let circleArea = measureOlGeometryArea(circularPolygon, this.map.ol.getView().getProjection().getCode());
+                        const unit = MeasureAreaUnitAbbreviation[entity.properties.measureUnit];
+                        const temp = entity.properties.measureUnit;
+                        circleArea = squareMetersToUnit(circleArea, temp);
+                        const areaLabel = circleArea.toFixed(2).toString() + ' ' + unit;
+                        this.updateLabelOfOlGeometry(olGeometry, areaLabel);
+                    }
+                    else {
+                        let olGeometryArea = measureOlGeometryArea(olGeometry, this.map.ol.getView().getProjection().getCode());
+                        let measureUnit;
+                        const temp = entity.properties.measureUnit;
+                        measureUnit = MeasureAreaUnitAbbreviation[entity.properties.measureUnit];
+                        olGeometryArea = squareMetersToUnit(olGeometryArea, temp);
+                        const lengthLabel = olGeometryArea.toFixed(2).toString() + ' ' + measureUnit;
+                        this.updateLabelOfOlGeometry(olGeometry, lengthLabel);
+                    }
+                }
+                else {
+                    this.updateLabelOfOlGeometry(olGeometry, entity.properties.draw);
+                }
+                this.updateLabelType(olGeometry, entity.properties.labelType);
+                this.updateMeasureUnit(olGeometry, entity.properties.measureUnit);
                 this.updateFontSizeAndStyle(olGeometry, entity.properties.fontStyle.split(' ')[0].replace('px', ''), entity.properties.fontStyle.substring(entity.properties.fontStyle.indexOf(' ') + 1));
                 this.updateFillAndStrokeColor(olGeometry, entity.properties.drawingStyle.fill, entity.properties.drawingStyle.stroke);
                 this.updateOffset(olGeometry, entity.properties.offsetX, entity.properties.offsetY);
@@ -18187,7 +18945,7 @@ class DrawComponent {
             }
         });
     }
-    onSelectDraw(olFeature, label) {
+    onSelectDraw(olFeature, label, labelTypeAndUnit) {
         const entities = this.activeStore.all();
         const olGeometry = olFeature.getGeometry();
         olGeometry.ol_uid = olFeature.get('id');
@@ -18213,6 +18971,8 @@ class DrawComponent {
                 this.updateFontSizeAndStyle(olGeometry, fontSize, fontStyle);
                 this.updateFillAndStrokeColor(olGeometry, fillColor, strokeColor);
                 this.updateOffset(olGeometry, offsetX, offsetY);
+                this.updateLabelType(olGeometry, labelTypeAndUnit[0]);
+                this.updateMeasureUnit(olGeometry, labelTypeAndUnit[1]);
                 this.replaceFeatureInStore(entity, olGeometry, rad);
             }
         });
@@ -18252,8 +19012,12 @@ class DrawComponent {
                 lon4326 = center4326[0];
                 lat4326 = center4326[1];
                 rad = getDistance(center4326, extent4326);
+                this.radiusFormControl.setValue(Math.round(rad));
             }
         }
+        if (this.activeDrawControl.radiusDrawEnd$.getValue()) {
+            rad = this.activeDrawControl.radiusDrawEnd$.getValue();
+        }
         if (olGeometry instanceof OlPoint) {
             point4326 = transform(olGeometry.getFlatCoordinates(), projection, 'EPSG:4326');
             lon4326 = point4326[0];
@@ -18275,12 +19039,17 @@ class DrawComponent {
                     stroke: olGeometry.get('strokeColor_')
                 },
                 offsetX: olGeometry.get('offsetX_'),
-                offsetY: olGeometry.get('offsetY_')
+                offsetY: olGeometry.get('offsetY_'),
+                labelType: olGeometry.get('labelType_'),
+                measureUnit: olGeometry.get('measureUnit_')
             },
             meta: {
                 id: featureId
             }
         });
+        this.activeStore.setLayerExtent();
+        this.activeDrawControl.predefinedRadius$.next(undefined);
+        this.activeDrawControl.radiusDrawEnd$.next(undefined);
     }
     buildForm() {
         this.form = this.formBuilder.group({
@@ -18325,11 +19094,9 @@ class DrawComponent {
     /**
      * Called when the user double-clicks the selected drawing
      */
-    editLabelDrawing() {
-        if (this.selectedFeatures$.value.length) {
-            const olGeometry = featureToOl(this.selectedFeatures$.value[0], this.map.ol.getView().getProjection().getCode());
-            this.openDrawDialog(olGeometry, false);
-        }
+    editLabelDrawing(feature) {
+        const olGeometryFeature = featureToOl(feature, this.map.ol.getView().getProjection().getCode());
+        this.openDrawDialog(olGeometryFeature, false);
     }
     openShorcutsDialog() {
         this.dialog.open(DrawShorcutsComponent);
@@ -18347,6 +19114,7 @@ class DrawComponent {
             });
         });
         this.updateHeightTable();
+        this.activeStore.setLayerExtent();
     }
     /**
      * Called when the user toggles the labels toggle
@@ -18366,6 +19134,19 @@ class DrawComponent {
     onToggleDrawControl(toggleIsChecked) {
         toggleIsChecked ? this.toggleDrawControl() : this.deactivateDrawControl();
     }
+    onToggleFreehandMode(event) {
+        if (this.isCircle() && !event.checked) {
+            this.activeDrawControl.ispredefinedRadius$.next(true);
+            this.changeRadius(this.radiusFormControl.value);
+        }
+        else {
+            this.activeDrawControl.setOlInteractionStyle(createInteractionStyle(this.fillColor, this.strokeColor, this.strokeWidth));
+            this.activeDrawControl.ispredefinedRadius$.next(false);
+        }
+        this.freehandMode = event.checked;
+        this.activeDrawControl.freehand$.next(event.checked);
+        this.toggleDrawControl();
+    }
     // User changes properties of a drawing element
     /**
      * Display the current layer with the current store and the current layerSource
@@ -18516,16 +19297,19 @@ class DrawComponent {
     onGeometryTypeChange(geometryType) {
         this.currGeometryType = geometryType;
         this.activeDrawControl.setGeometryType(geometryType);
+        this.freehandMode ?
+            this.onToggleFreehandMode({ checked: true }) :
+            this.onToggleFreehandMode({ checked: false });
         this.toggleDrawControl();
     }
     // Updates the properties of olFeature inputted
     /**
      * Update the label of a geometry when a label is entered in a dialog box
-     * @param olGeometry the geometry
+     * @param OlFeature the feature
      * @param label the label
      */
-    updateLabelOfOlGeometry(olGeometry, label) {
-        olGeometry.setProperties({
+    updateLabelOfOlGeometry(OlFeature, label) {
+        OlFeature.setProperties({
             _label: label
         }, true);
     }
@@ -18546,13 +19330,23 @@ class DrawComponent {
             offsetY_: offsetY
         }, true);
     }
+    updateLabelType(olFeature, typeOfLabel) {
+        olFeature.setProperties({
+            labelType_: typeOfLabel
+        }, true);
+    }
+    updateMeasureUnit(olFeature, measureUnit) {
+        olFeature.setProperties({
+            measureUnit_: measureUnit
+        }, true);
+    }
     // Updates values of the selected element on the HTML view
     getFeatureFontSize() {
         return this.selectedFeatures$.value.length > 0
             ? this.selectedFeatures$.value[0].properties.fontStyle
                 .split(' ')[0]
                 .replace('px', '')
-            : '20';
+            : '15';
     }
     getFeatureFontStyle() {
         return this.selectedFeatures$.value.length > 0
@@ -18656,6 +19450,66 @@ class DrawComponent {
         }
         this.activeDrawControl.setOlMap(this.map.ol, true);
     }
+    /**
+     * get the geometry of design
+     *
+     */
+    isPoint() {
+        return this.activeDrawControl.getGeometryType() === this.geometryType.Point;
+    }
+    isLineString() {
+        return this.activeDrawControl.getGeometryType() === this.geometryType.LineString;
+    }
+    isPolygon() {
+        return this.activeDrawControl.getGeometryType() === this.geometryType.Polygon;
+    }
+    isCircle() {
+        return this.activeDrawControl.getGeometryType() === this.geometryType.Circle;
+    }
+    /**
+     * The fonction to predefine the radius of the user
+     *
+     */
+    changeRadius(radius) {
+        let radiusMeters;
+        if (radius) {
+            this.measureUnit === MeasureLengthUnit.Meters ? radiusMeters = radius :
+                radiusMeters = radius * 1000;
+        }
+        else {
+            radiusMeters = undefined;
+        }
+        const pointStyle = (feature, resolution) => {
+            const geom = feature.getGeometry();
+            const coordinates = olproj.transform(geom.getCoordinates(), this.map.projection, 'EPSG:4326');
+            const radius = radiusMeters / (Math.cos((Math.PI / 180) * coordinates[1])) / resolution;
+            this.activeDrawControl.predefinedRadius$.next(radiusMeters);
+            return new olstyle.Style({
+                image: new olstyle.Circle({
+                    radius: radius,
+                    stroke: new olstyle.Stroke({
+                        width: 1,
+                        color: 'rgba(143,7,7,1)'
+                    }),
+                    fill: new olstyle.Fill({
+                        color: 'rgba(255,255,255,0.4)'
+                    })
+                })
+            });
+        };
+        this.activeDrawControl.setOlInteractionStyle(pointStyle);
+        this.toggleDrawControl();
+    }
+    onMeasureUnitChange(selectedMeasureUnit) {
+        if (selectedMeasureUnit === this.measureUnit) {
+            return;
+        }
+        else {
+            this.measureUnit = selectedMeasureUnit;
+            this.measureUnit === MeasureLengthUnit.Meters ? this.radiusFormControl.setValue(this.radiusFormControl.value * 1000) :
+                this.radiusFormControl.setValue(this.radiusFormControl.value / 1000);
+        }
+    }
     /**
      * Recreates the style of the feature stored
      */
@@ -18671,6 +19525,10 @@ class DrawComponent {
             });
         }
     }
+    getRadius(olGeometry) {
+        const length = getLength(olGeometry);
+        return Number(length / (2 * Math.PI));
+    }
 }
 DrawComponent.ɵfac = function DrawComponent_Factory(t) { return new (t || DrawComponent)(i0.ɵɵdirectiveInject(i2$1.LanguageService), i0.ɵɵdirectiveInject(i2$2.UntypedFormBuilder), i0.ɵɵdirectiveInject(DrawStyleService), i0.ɵɵdirectiveInject(i1.MatDialog), i0.ɵɵdirectiveInject(DrawIconService)); };
 DrawComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: DrawComponent, selectors: [["igo-draw"]], viewQuery: function DrawComponent_Query(rf, ctx) {
@@ -18681,9 +19539,9 @@ DrawComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: DrawComponent
             let _t;
             i0.ɵɵqueryRefresh(_t = i0.ɵɵloadQuery()) && (ctx.select = _t.first);
         }
-    }, inputs: { map: "map", stores: "stores", drawControls: "drawControls", activeDrawingLayer: "activeDrawingLayer" }, outputs: { activeLayerChange: "activeLayerChange", drawControlsEvent: "drawControlsEvent", layersIDEvent: "layersIDEvent", fillColor: "fillColor", strokeColor: "strokeColor", strokeWidth: "strokeWidth", fontSize: "fontSize", fontStyle: "fontStyle" }, decls: 47, vars: 45, consts: [[1, "geometry-type-toggle", "mat-typography"], [3, "value", "change"], [3, "value"], [1, "draw-options", "mat-typography"], [3, "disabled", "checked", "labelPosition", "change"], [3, "checked", "labelPosition", "change"], ["appearance", "outline", 1, "layer-select"], [3, "value", "selectionChange"], ["selectedLayer", ""], [3, "value", 4, "ngFor", "ngForOf"], ["id", "createNewLayer"], ["mat-icon-button", "", "collapsibleButton", "", "tooltip-position", "below", "matTooltipShowDelay", "500", 3, "color", "matTooltip", "click", 4, "ngIf"], ["class", "deleteBtn", "mat-icon-button", "", "color", "warn", "tooltip-position", "below", "matTooltipShowDelay", "500", 3, "matTooltip", "disabled", "click", 4, "ngIf"], [1, "table-compact", 3, "store", "template", "dblclick"], ["table", ""], [1, "icon-options"], [4, "ngIf"], ["mat-icon-button", "", "color", "accent", "disableRipple", "true", 3, "click"], ["svgIcon", "keyboard-outline", "tooltip-position", "below", "matTooltipShowDelay", "500", 1, "shortcuts-icon", 3, "matTooltip"], ["mat-raised-button", "", "color", "primary", 3, "matTooltip", "click", 4, "ngIf"], ["mat-icon-button", "", "collapsibleButton", "", "tooltip-position", "below", "matTooltipShowDelay", "500", 3, "color", "matTooltip", "click"], [3, "svgIcon"], ["mat-icon-button", "", "color", "warn", "tooltip-position", "below", "matTooltipShowDelay", "500", 1, "deleteBtn", 3, "matTooltip", "disabled", "click"], ["svgIcon", "delete"], ["class", "box", 4, "ngIf"], ["value", "", 3, "click"], [3, "value", "click", 4, "ngFor", "ngForOf"], [1, "box"], [3, "src"], [3, "value", "click"], ["mat-raised-button", "", "color", "primary", 3, "matTooltip", "click"], ["svgIcon", "palette", "matBadgeColor", "warn", "matBadgeSize", "medium", 1, "style-icon", 3, "matBadge"]], template: function DrawComponent_Template(rf, ctx) {
+    }, inputs: { map: "map", stores: "stores", drawControls: "drawControls", activeDrawingLayer: "activeDrawingLayer" }, outputs: { activeLayerChange: "activeLayerChange", drawControlsEvent: "drawControlsEvent", layersIDEvent: "layersIDEvent", fillColor: "fillColor", strokeColor: "strokeColor", strokeWidth: "strokeWidth", fontSize: "fontSize", fontStyle: "fontStyle" }, decls: 49, vars: 47, consts: [[1, "geometry-type-toggle", "mat-typography"], [3, "value", "change"], [3, "value"], [1, "draw-options", "mat-typography"], [3, "disabled", "checked", "labelPosition", "change"], [3, "checked", "labelPosition", "change"], [3, "checked", "labelPosition", "change", 4, "ngIf"], ["class", "radius-unit", 4, "ngIf"], ["appearance", "outline", 1, "layer-select"], [3, "value", "selectionChange"], ["selectedLayer", ""], [3, "value", 4, "ngFor", "ngForOf"], ["id", "createNewLayer"], ["mat-icon-button", "", "collapsibleButton", "", "tooltip-position", "below", "matTooltipShowDelay", "500", 3, "color", "matTooltip", "click", 4, "ngIf"], ["class", "deleteBtn", "mat-icon-button", "", "color", "warn", "tooltip-position", "below", "matTooltipShowDelay", "500", 3, "matTooltip", "disabled", "click", 4, "ngIf"], [1, "table-compact", 3, "store", "template"], ["table", ""], [1, "icon-options"], [4, "ngIf"], ["mat-icon-button", "", "color", "accent", "disableRipple", "true", 3, "click"], ["svgIcon", "keyboard-outline", "tooltip-position", "below", "matTooltipShowDelay", "500", 1, "shortcuts-icon", 3, "matTooltip"], ["mat-raised-button", "", "color", "primary", 3, "matTooltip", "click", 4, "ngIf"], [1, "radius-unit"], [1, "radius-form"], [1, "radius"], ["matInput", "", "type", "number", "min", "0", 3, "placeholder", "formControl", "readonly"], [1, "unit-field"], ["mat-icon-button", "", "collapsibleButton", "", "tooltip-position", "below", "matTooltipShowDelay", "500", 3, "color", "matTooltip", "click"], [3, "svgIcon"], ["mat-icon-button", "", "color", "warn", "tooltip-position", "below", "matTooltipShowDelay", "500", 1, "deleteBtn", 3, "matTooltip", "disabled", "click"], ["svgIcon", "delete"], ["class", "box", 4, "ngIf"], ["value", "", 3, "click"], [3, "value", "click", 4, "ngFor", "ngForOf"], [1, "box"], [3, "src"], [3, "value", "click"], ["mat-raised-button", "", "color", "primary", 3, "matTooltip", "click"], ["svgIcon", "palette", "matBadgeColor", "warn", "matBadgeSize", "medium", 1, "style-icon", 3, "matBadge"]], template: function DrawComponent_Template(rf, ctx) {
         if (rf & 1) {
-            const _r21 = i0.ɵɵgetCurrentView();
+            const _r29 = i0.ɵɵgetCurrentView();
             i0.ɵɵelementStart(0, "div")(1, "div", 0)(2, "mat-button-toggle-group", 1);
             i0.ɵɵlistener("change", function DrawComponent_Template_mat_button_toggle_group_change_2_listener($event) { return ctx.onGeometryTypeChange($event.value); });
             i0.ɵɵelementStart(3, "mat-button-toggle", 2);
@@ -18711,36 +19569,39 @@ DrawComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: DrawComponent
             i0.ɵɵlistener("change", function DrawComponent_Template_mat_slide_toggle_change_19_listener() { return ctx.onToggleLabels(); });
             i0.ɵɵtext(20);
             i0.ɵɵpipe(21, "translate");
-            i0.ɵɵelementEnd()();
-            i0.ɵɵelement(22, "mat-divider");
-            i0.ɵɵelementStart(23, "div")(24, "mat-form-field", 6)(25, "mat-label");
-            i0.ɵɵtext(26);
-            i0.ɵɵpipe(27, "translate");
             i0.ɵɵelementEnd();
-            i0.ɵɵelementStart(28, "mat-select", 7, 8);
-            i0.ɵɵlistener("selectionChange", function DrawComponent_Template_mat_select_selectionChange_28_listener() { i0.ɵɵrestoreView(_r21); const _r0 = i0.ɵɵreference(29); return i0.ɵɵresetView(ctx.onLayerChange(_r0.value)); });
-            i0.ɵɵtemplate(30, DrawComponent_mat_option_30_Template, 2, 2, "mat-option", 9);
-            i0.ɵɵelementStart(31, "mat-option", 10);
-            i0.ɵɵtext(32);
-            i0.ɵɵpipe(33, "translate");
-            i0.ɵɵelementEnd()()();
-            i0.ɵɵtemplate(34, DrawComponent_button_34_Template, 4, 7, "button", 11);
+            i0.ɵɵtemplate(22, DrawComponent_mat_slide_toggle_22_Template, 3, 5, "mat-slide-toggle", 6);
+            i0.ɵɵtemplate(23, DrawComponent_div_23_Template, 8, 7, "div", 7);
             i0.ɵɵelementEnd();
-            i0.ɵɵelement(35, "mat-divider");
-            i0.ɵɵelementStart(36, "div");
-            i0.ɵɵtemplate(37, DrawComponent_button_37_Template, 4, 6, "button", 12);
-            i0.ɵɵelementStart(38, "div")(39, "igo-entity-table", 13, 14);
-            i0.ɵɵlistener("dblclick", function DrawComponent_Template_igo_entity_table_dblclick_39_listener() { return ctx.editLabelDrawing(); });
+            i0.ɵɵelement(24, "mat-divider");
+            i0.ɵɵelementStart(25, "div")(26, "mat-form-field", 8)(27, "mat-label");
+            i0.ɵɵtext(28);
+            i0.ɵɵpipe(29, "translate");
+            i0.ɵɵelementEnd();
+            i0.ɵɵelementStart(30, "mat-select", 9, 10);
+            i0.ɵɵlistener("selectionChange", function DrawComponent_Template_mat_select_selectionChange_30_listener() { i0.ɵɵrestoreView(_r29); const _r2 = i0.ɵɵreference(31); return i0.ɵɵresetView(ctx.onLayerChange(_r2.value)); });
+            i0.ɵɵtemplate(32, DrawComponent_mat_option_32_Template, 2, 2, "mat-option", 11);
+            i0.ɵɵelementStart(33, "mat-option", 12);
+            i0.ɵɵtext(34);
+            i0.ɵɵpipe(35, "translate");
             i0.ɵɵelementEnd()()();
-            i0.ɵɵelementStart(41, "div", 15);
-            i0.ɵɵtemplate(42, DrawComponent_mat_form_field_42_Template, 11, 8, "mat-form-field", 16);
+            i0.ɵɵtemplate(36, DrawComponent_button_36_Template, 4, 7, "button", 13);
             i0.ɵɵelementEnd();
-            i0.ɵɵelementStart(43, "button", 17);
-            i0.ɵɵlistener("click", function DrawComponent_Template_button_click_43_listener() { return ctx.openShorcutsDialog(); });
-            i0.ɵɵelement(44, "mat-icon", 18);
-            i0.ɵɵpipe(45, "translate");
+            i0.ɵɵelement(37, "mat-divider");
+            i0.ɵɵelementStart(38, "div");
+            i0.ɵɵtemplate(39, DrawComponent_button_39_Template, 4, 6, "button", 14);
+            i0.ɵɵelementStart(40, "div");
+            i0.ɵɵelement(41, "igo-entity-table", 15, 16);
+            i0.ɵɵelementEnd()();
+            i0.ɵɵelementStart(43, "div", 17);
+            i0.ɵɵtemplate(44, DrawComponent_mat_form_field_44_Template, 11, 8, "mat-form-field", 18);
+            i0.ɵɵelementEnd();
+            i0.ɵɵelementStart(45, "button", 19);
+            i0.ɵɵlistener("click", function DrawComponent_Template_button_click_45_listener() { return ctx.openShorcutsDialog(); });
+            i0.ɵɵelement(46, "mat-icon", 20);
+            i0.ɵɵpipe(47, "translate");
             i0.ɵɵelementEnd();
-            i0.ɵɵtemplate(46, DrawComponent_button_46_Template, 5, 7, "button", 19);
+            i0.ɵɵtemplate(48, DrawComponent_button_48_Template, 5, 7, "button", 21);
             i0.ɵɵelementEnd();
         }
         if (rf & 2) {
@@ -18749,35 +19610,39 @@ DrawComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: DrawComponent
             i0.ɵɵadvance(1);
             i0.ɵɵproperty("value", ctx.geometryType.Point);
             i0.ɵɵadvance(1);
-            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(5, 27, "igo.geo.draw." + ctx.geometryType.Point), " ");
+            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(5, 29, "igo.geo.draw." + ctx.geometryType.Point), " ");
             i0.ɵɵadvance(2);
             i0.ɵɵproperty("value", ctx.geometryType.LineString);
             i0.ɵɵadvance(1);
-            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(8, 29, "igo.geo.draw." + ctx.geometryType.LineString), " ");
+            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(8, 31, "igo.geo.draw." + ctx.geometryType.LineString), " ");
             i0.ɵɵadvance(2);
             i0.ɵɵproperty("value", ctx.geometryType.Polygon);
             i0.ɵɵadvance(1);
-            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(11, 31, "igo.geo.draw." + ctx.geometryType.Polygon), " ");
+            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(11, 33, "igo.geo.draw." + ctx.geometryType.Polygon), " ");
             i0.ɵɵadvance(2);
             i0.ɵɵproperty("value", ctx.geometryType.Circle);
             i0.ɵɵadvance(1);
-            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(14, 33, "igo.geo.draw." + ctx.geometryType.Circle), " ");
+            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(14, 35, "igo.geo.draw." + ctx.geometryType.Circle), " ");
             i0.ɵɵadvance(3);
             i0.ɵɵproperty("disabled", ctx.drawControlIsDisabled)("checked", ctx.drawControlIsActive)("labelPosition", "before");
             i0.ɵɵadvance(1);
-            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(18, 35, "igo.geo.spatialFilter.drawControl"), " ");
+            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(18, 37, "igo.geo.spatialFilter.drawControl"), " ");
             i0.ɵɵadvance(2);
             i0.ɵɵproperty("checked", ctx.labelsAreShown)("labelPosition", "before");
             i0.ɵɵadvance(1);
-            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(21, 37, "igo.geo.draw.toggleMapTooltips"), " ");
-            i0.ɵɵadvance(6);
-            i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(27, 39, "igo.geo.draw.layer.title"));
+            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(21, 39, "igo.geo.draw.toggleMapTooltips"), " ");
+            i0.ɵɵadvance(2);
+            i0.ɵɵproperty("ngIf", !ctx.isPoint());
+            i0.ɵɵadvance(1);
+            i0.ɵɵproperty("ngIf", ctx.isCircle());
+            i0.ɵɵadvance(5);
+            i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(29, 41, "igo.geo.draw.layer.title"));
             i0.ɵɵadvance(2);
             i0.ɵɵproperty("value", ctx.updateActiveLayer());
             i0.ɵɵadvance(2);
             i0.ɵɵproperty("ngForOf", ctx.allLayers);
             i0.ɵɵadvance(2);
-            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(33, 41, "igo.geo.draw.layer.createNewLayer"), " ");
+            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(35, 43, "igo.geo.draw.layer.createNewLayer"), " ");
             i0.ɵɵadvance(2);
             i0.ɵɵproperty("ngIf", ctx.activeDrawingLayer);
             i0.ɵɵadvance(3);
@@ -18787,11 +19652,11 @@ DrawComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: DrawComponent
             i0.ɵɵadvance(3);
             i0.ɵɵproperty("ngIf", ctx.icons.length >= 1);
             i0.ɵɵadvance(2);
-            i0.ɵɵproperty("matTooltip", i0.ɵɵpipeBind1(45, 43, "igo.geo.draw.shortcuts"));
+            i0.ɵɵproperty("matTooltip", i0.ɵɵpipeBind1(47, 45, "igo.geo.draw.shortcuts"));
             i0.ɵɵadvance(2);
             i0.ɵɵproperty("ngIf", ctx.selectedFeatures$.value.length);
         }
-    }, dependencies: [i1$1.NgForOf, i1$1.NgIf, i3.MatButton, i18.MatButtonToggleGroup, i18.MatButtonToggle, i11.MatDivider, i13.MatFormField, i13.MatLabel, i2.MatIcon, i7$1.MatBadge, i4.MatTooltip, i15.MatSelect, i15.MatSelectTrigger, i9.MatOption, i23.MatSlideToggle, i5$1.EntityTableComponent, i1$1.AsyncPipe, i7.TranslatePipe], styles: [".geometry-type-toggle[_ngcontent-%COMP%]{padding:10px;text-align:center}.geometry-type-toggle[_ngcontent-%COMP%]   mat-button-toggle-group[_ngcontent-%COMP%]{width:100%}.geometry-type-toggle[_ngcontent-%COMP%]   mat-button-toggle-group[_ngcontent-%COMP%]   mat-button-toggle[_ngcontent-%COMP%]{width:25%}.draw-options[_ngcontent-%COMP%]{overflow-x:hidden}.draw-options[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%]{width:100%;margin:10px}.draw-options[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%]     .mat-slide-toggle-content{width:calc(100% - 60px)}.icon-options[_ngcontent-%COMP%]{margin:5px 5px 0}.edition-drawing[_ngcontent-%COMP%]{padding:10px 0}img[_ngcontent-%COMP%]{width:100%;height:100%}.deleteBtn[_ngcontent-%COMP%]{margin-left:12px}.storeTable[_ngcontent-%COMP%]{height:auto!important}.layer-select[_ngcontent-%COMP%]{width:85%;padding:10px 10px 0%}.input-button-container[_ngcontent-%COMP%]{padding:10px}.input-button-container[_ngcontent-%COMP%]   mat-form-field[_ngcontent-%COMP%]{width:25%}.input-button-container[_ngcontent-%COMP%]   button[_ngcontent-%COMP%]{left:8px;bottom:10px}"], data: { animation: [
+    }, dependencies: [i2$2.ɵNgNoValidate, i2$2.DefaultValueAccessor, i2$2.NumberValueAccessor, i2$2.NgControlStatus, i2$2.NgControlStatusGroup, i2$2.MinValidator, i2$2.NgForm, i2$2.FormControlDirective, i1$1.NgForOf, i1$1.NgIf, i3.MatButton, i18.MatButtonToggleGroup, i18.MatButtonToggle, i11.MatDivider, i13.MatFormField, i13.MatLabel, i2.MatIcon, i7$1.MatBadge, i4.MatTooltip, i14.MatInput, i15.MatSelect, i15.MatSelectTrigger, i9.MatOption, i23.MatSlideToggle, i5$1.EntityTableComponent, i1$1.AsyncPipe, i7.TranslatePipe], styles: [".geometry-type-toggle[_ngcontent-%COMP%]{padding:10px;text-align:center}.geometry-type-toggle[_ngcontent-%COMP%]   mat-button-toggle-group[_ngcontent-%COMP%]{width:100%}.geometry-type-toggle[_ngcontent-%COMP%]   mat-button-toggle-group[_ngcontent-%COMP%]   mat-button-toggle[_ngcontent-%COMP%]{width:25%}.draw-options[_ngcontent-%COMP%]{overflow-x:hidden}.draw-options[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%]{width:100%;margin:10px}.draw-options[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%]     .mat-slide-toggle-content{width:calc(100% - 60px)}.icon-options[_ngcontent-%COMP%]{margin:5px 5px 0}.edition-drawing[_ngcontent-%COMP%]{padding:10px 0}img[_ngcontent-%COMP%]{width:100%;height:100%}.deleteBtn[_ngcontent-%COMP%]{margin-left:12px}.storeTable[_ngcontent-%COMP%]{height:auto!important}.layer-select[_ngcontent-%COMP%]{width:85%;padding:10px 10px 0%}.input-button-container[_ngcontent-%COMP%]{padding:10px}.input-button-container[_ngcontent-%COMP%]   mat-form-field[_ngcontent-%COMP%]{width:25%}.input-button-container[_ngcontent-%COMP%]   button[_ngcontent-%COMP%]{left:8px;bottom:10px}.radius[_ngcontent-%COMP%]{display:flex;flex-flow:column nowrap;width:110%}.unit-field[_ngcontent-%COMP%]{width:110px;margin-left:30px}.radius-unit[_ngcontent-%COMP%]{display:flex;width:100%;margin-left:2px;padding:5px}  igo-entity-table td:last-child{text-align:right!important}  igo-entity-table td:last-child button{margin:0%!important}"], data: { animation: [
             trigger('openClose', [
                 state('open', style({
                     opacity: 1
@@ -18817,7 +19682,7 @@ DrawComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: DrawComponent
                             transition('open => closed', [animate('600ms ease')]),
                             transition('closed => open', [animate('800ms ease')])
                         ])
-                    ], changeDetection: ChangeDetectionStrategy.OnPush, template: "<div>\n  <div class=\"geometry-type-toggle mat-typography\">\n    <mat-button-toggle-group\n      (change)=\"onGeometryTypeChange($event.value)\" [value]=\"geometryType.Point\">\n      <mat-button-toggle [value]=\"geometryType.Point\">\n        {{'igo.geo.draw.' + geometryType.Point | translate}}\n      </mat-button-toggle>\n\n      <mat-button-toggle [value]=\"geometryType.LineString\">\n        {{'igo.geo.draw.' + geometryType.LineString | translate}}\n      </mat-button-toggle>\n\n      <mat-button-toggle [value]=\"geometryType.Polygon\">\n        {{'igo.geo.draw.' + geometryType.Polygon | translate}}\n      </mat-button-toggle>\n\n      <mat-button-toggle [value]=\"geometryType.Circle\">\n        {{'igo.geo.draw.' + geometryType.Circle | translate}}\n      </mat-button-toggle>\n    </mat-button-toggle-group>\n  </div>\n\n  <div class=\"draw-options mat-typography\">\n    <mat-slide-toggle\n      [disabled]=\"drawControlIsDisabled\"\n      [checked]=\"drawControlIsActive\"\n      [labelPosition]=\"'before'\"\n      (change)=\"onToggleDrawControl($event.checked)\">\n      {{'igo.geo.spatialFilter.drawControl' | translate}}\n    </mat-slide-toggle>\n\n    <mat-slide-toggle\n      [checked]=\"labelsAreShown\"\n      [labelPosition]=\"'before'\"\n      (change)=\"onToggleLabels()\"\n    >\n      {{ 'igo.geo.draw.toggleMapTooltips' | translate }}\n    </mat-slide-toggle>\n  </div>\n\n  <mat-divider></mat-divider>\n\n  <div>\n    <mat-form-field appearance=\"outline\" class=\"layer-select\">\n      <mat-label>{{'igo.geo.draw.layer.title' | translate}}</mat-label>\n      <mat-select #selectedLayer (selectionChange)=\"onLayerChange(selectedLayer.value)\" [value]=\"updateActiveLayer()\">\n        <mat-option *ngFor=\"let layer of allLayers\" [value]=\"layer\">\n          {{ layer.title }}\n        </mat-option>\n        <mat-option id=\"createNewLayer\" >\n          {{'igo.geo.draw.layer.createNewLayer' | translate}}\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n    <button\n      *ngIf=\"activeDrawingLayer\"\n      mat-icon-button\n      [color]=\"activeDrawingLayer.visible ? 'primary' : 'default'\"\n      collapsibleButton\n      tooltip-position=\"below\"\n      matTooltipShowDelay=\"500\"\n      [matTooltip]=\"activeDrawingLayer.visible ?\n                    ('igo.geo.layer.hideLayer' | translate) :\n                    ('igo.geo.layer.showLayer' | translate)\"\n      (click)=\"activeDrawingLayer.visible = !activeDrawingLayer.visible\">\n      <mat-icon\n        [svgIcon]=\"activeDrawingLayer.visible ? 'eye' : 'eye-off'\">\n      </mat-icon>\n    </button>\n  </div>\n  <mat-divider></mat-divider>\n  <div>\n    <button\n      *ngIf=\"activeStore.count$.getValue() > 0\"\n      class=\"deleteBtn\"\n      mat-icon-button\n      color=\"warn\"\n      tooltip-position=\"below\"\n      matTooltipShowDelay=\"500\"\n      [matTooltip]=\"'igo.geo.draw.delete' | translate\"\n      [disabled]=\"(selectedFeatures$ | async).length === 0\"\n      (click)=\"deleteDrawings()\">\n      <mat-icon svgIcon=\"delete\"></mat-icon>\n    </button>\n\n    <div>\n      <igo-entity-table\n        #table\n        class=\"table-compact\"\n        [store]=\"activeStore\"\n        [template]=\"tableTemplate\"\n        (dblclick)=\"editLabelDrawing()\">\n      </igo-entity-table>\n    </div>\n  </div>\n\n  <div class=\"icon-options\">\n    <mat-form-field *ngIf=\"icons.length >= 1\">\n      <mat-label>{{ 'igo.geo.draw.icon' | translate }}</mat-label>\n      <mat-select>\n        <mat-select-trigger>\n          <div *ngIf=\"icon\" class=\"box\">\n            <img src=\"{{ icon }}\">\n          </div>\n        </mat-select-trigger>\n        <mat-option value=\"\" (click)=\"onIconChange()\">{{ 'igo.geo.draw.noIcon' | translate }}</mat-option>\n        <mat-option\n          *ngFor=\"let icon_html of icons\"\n          [value]=\"icon_html\"\n          (click)=\"onIconChange(icon_html)\">\n          <div class=\"box\">\n            <img src=\"{{ icon_html }}\">\n          </div>\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n  </div>\n\n  <button\n    mat-icon-button\n    color=\"accent\"\n    disableRipple=\"true\"\n    (click)=\"openShorcutsDialog()\"\n  >\n    <mat-icon\n      class=\"shortcuts-icon\"\n      svgIcon=\"keyboard-outline\"\n      tooltip-position=\"below\"\n      matTooltipShowDelay=\"500\"\n      [matTooltip]=\"'igo.geo.draw.shortcuts' | translate\"\n    >\n    </mat-icon>\n  </button>\n\n  <button\n    *ngIf=\"selectedFeatures$.value.length\"\n    mat-raised-button\n    color=\"primary\"\n    (click)=\"openStyleModalDialog()\"\n    [matTooltip]=\"'igo.geo.layer.style.styleModalTooltip' | translate\">\n    {{'igo.geo.layer.style.styleModal' | translate}}\n    <mat-icon\n      class=\"style-icon\"\n      svgIcon=\"palette\"\n      [matBadge]=\"selectedFeatures$.value.length\"\n      matBadgeColor=\"warn\"\n      matBadgeSize=\"medium\">\n    </mat-icon>\n  </button>\n</div>\n", styles: [".geometry-type-toggle{padding:10px;text-align:center}.geometry-type-toggle mat-button-toggle-group{width:100%}.geometry-type-toggle mat-button-toggle-group mat-button-toggle{width:25%}.draw-options{overflow-x:hidden}.draw-options mat-slide-toggle{width:100%;margin:10px}.draw-options mat-slide-toggle ::ng-deep .mat-slide-toggle-content{width:calc(100% - 60px)}.icon-options{margin:5px 5px 0}.edition-drawing{padding:10px 0}img{width:100%;height:100%}.deleteBtn{margin-left:12px}.storeTable{height:auto!important}.layer-select{width:85%;padding:10px 10px 0%}.input-button-container{padding:10px}.input-button-container mat-form-field{width:25%}.input-button-container button{left:8px;bottom:10px}\n"] }]
+                    ], changeDetection: ChangeDetectionStrategy.OnPush, template: "<div>\n  <div class=\"geometry-type-toggle mat-typography\">\n    <mat-button-toggle-group\n      (change)=\"onGeometryTypeChange($event.value)\" [value]=\"geometryType.Point\">\n      <mat-button-toggle [value]=\"geometryType.Point\">\n        {{'igo.geo.draw.' + geometryType.Point | translate}}\n      </mat-button-toggle>\n\n      <mat-button-toggle [value]=\"geometryType.LineString\">\n        {{'igo.geo.draw.' + geometryType.LineString | translate}}\n      </mat-button-toggle>\n\n      <mat-button-toggle [value]=\"geometryType.Polygon\">\n        {{'igo.geo.draw.' + geometryType.Polygon | translate}}\n      </mat-button-toggle>\n\n      <mat-button-toggle [value]=\"geometryType.Circle\">\n        {{'igo.geo.draw.' + geometryType.Circle | translate}}\n      </mat-button-toggle>\n    </mat-button-toggle-group>\n  </div>\n\n  <div class=\"draw-options mat-typography\">\n    <mat-slide-toggle\n      [disabled]=\"drawControlIsDisabled\"\n      [checked]=\"drawControlIsActive\"\n      [labelPosition]=\"'before'\"\n      (change)=\"onToggleDrawControl($event.checked)\">\n      {{'igo.geo.spatialFilter.drawControl' | translate}}\n    </mat-slide-toggle>\n\n    <mat-slide-toggle\n      [checked]=\"labelsAreShown\"\n      [labelPosition]=\"'before'\"\n      (change)=\"onToggleLabels()\">\n      {{ 'igo.geo.draw.toggleMapTooltips' | translate }}\n    </mat-slide-toggle>\n\n    <mat-slide-toggle\n      *ngIf=\"!isPoint()\"\n      [checked]=\"freehandMode\"\n      [labelPosition]=\"'before'\"\n      (change)=\"onToggleFreehandMode($event)\">\n      {{ 'igo.geo.draw.freehandMode' | translate }}\n    </mat-slide-toggle>\n\n    <div class=\"radius-unit\" *ngIf=\"isCircle()\">\n      <form class=\"radius-form\">\n        <mat-form-field class=\"radius\">\n          <input\n            matInput type=\"number\"\n            min=\"0\"\n            placeholder=\"{{ 'igo.geo.spatialFilter.radius' | translate }}\"\n            [formControl]=\"radiusFormControl\"\n            [readonly]=\"this.freehandMode\">\n        </mat-form-field>\n      </form>\n\n      <mat-form-field class=\"unit-field\">\n        <mat-select\n          [value]=\"measureUnit\"\n          (selectionChange)=\"onMeasureUnitChange($event.value)\">\n          <mat-option\n            *ngFor=\"let measureUnit of measureUnits\"\n            [value]=\"measureUnit\">\n            {{('igo.geo.measure.' + measureUnit) | translate}}\n          </mat-option>\n        </mat-select>\n      </mat-form-field>\n    </div>\n  </div>\n\n  <mat-divider></mat-divider>\n\n  <div>\n    <mat-form-field appearance=\"outline\" class=\"layer-select\">\n      <mat-label>{{'igo.geo.draw.layer.title' | translate}}</mat-label>\n      <mat-select #selectedLayer (selectionChange)=\"onLayerChange(selectedLayer.value)\" [value]=\"updateActiveLayer()\">\n        <mat-option *ngFor=\"let layer of allLayers\" [value]=\"layer\">\n          {{ layer.title }}\n        </mat-option>\n        <mat-option id=\"createNewLayer\" >\n          {{'igo.geo.draw.layer.createNewLayer' | translate}}\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n    <button\n      *ngIf=\"activeDrawingLayer\"\n      mat-icon-button\n      [color]=\"activeDrawingLayer.visible ? 'primary' : 'default'\"\n      collapsibleButton\n      tooltip-position=\"below\"\n      matTooltipShowDelay=\"500\"\n      [matTooltip]=\"activeDrawingLayer.visible ?\n                    ('igo.geo.layer.hideLayer' | translate) :\n                    ('igo.geo.layer.showLayer' | translate)\"\n      (click)=\"activeDrawingLayer.visible = !activeDrawingLayer.visible\">\n      <mat-icon\n        [svgIcon]=\"activeDrawingLayer.visible ? 'eye' : 'eye-off'\">\n      </mat-icon>\n    </button>\n  </div>\n  <mat-divider></mat-divider>\n  <div>\n    <button\n      *ngIf=\"activeStore.count$.getValue() > 0\"\n      class=\"deleteBtn\"\n      mat-icon-button\n      color=\"warn\"\n      tooltip-position=\"below\"\n      matTooltipShowDelay=\"500\"\n      [matTooltip]=\"'igo.geo.draw.delete' | translate\"\n      [disabled]=\"(selectedFeatures$ | async).length === 0\"\n      (click)=\"deleteDrawings()\"\n    >\n      <mat-icon svgIcon=\"delete\"></mat-icon>\n    </button>\n\n    <div>\n      <igo-entity-table\n        #table\n        class=\"table-compact\"\n        [store]=\"activeStore\"\n        [template]=\"tableTemplate\">\n      </igo-entity-table>\n    </div>\n  </div>\n\n  <div class=\"icon-options\">\n    <mat-form-field *ngIf=\"icons.length >= 1\">\n      <mat-label>{{ 'igo.geo.draw.icon' | translate }}</mat-label>\n      <mat-select>\n        <mat-select-trigger>\n          <div *ngIf=\"icon\" class=\"box\">\n            <img src=\"{{ icon }}\">\n          </div>\n        </mat-select-trigger>\n        <mat-option value=\"\" (click)=\"onIconChange()\">{{ 'igo.geo.draw.noIcon' | translate }}</mat-option>\n        <mat-option\n          *ngFor=\"let icon_html of icons\"\n          [value]=\"icon_html\"\n          (click)=\"onIconChange(icon_html)\">\n          <div class=\"box\">\n            <img src=\"{{ icon_html }}\">\n          </div>\n        </mat-option>\n      </mat-select>\n    </mat-form-field>\n  </div>\n\n  <button\n    mat-icon-button\n    color=\"accent\"\n    disableRipple=\"true\"\n    (click)=\"openShorcutsDialog()\"\n  >\n    <mat-icon\n      class=\"shortcuts-icon\"\n      svgIcon=\"keyboard-outline\"\n      tooltip-position=\"below\"\n      matTooltipShowDelay=\"500\"\n      [matTooltip]=\"'igo.geo.draw.shortcuts' | translate\"\n    >\n    </mat-icon>\n  </button>\n\n  <button\n    *ngIf=\"selectedFeatures$.value.length\"\n    mat-raised-button\n    color=\"primary\"\n    (click)=\"openStyleModalDialog()\"\n    [matTooltip]=\"'igo.geo.layer.style.styleModalTooltip' | translate\">\n    {{'igo.geo.layer.style.styleModal' | translate}}\n    <mat-icon\n      class=\"style-icon\"\n      svgIcon=\"palette\"\n      [matBadge]=\"selectedFeatures$.value.length\"\n      matBadgeColor=\"warn\"\n      matBadgeSize=\"medium\">\n    </mat-icon>\n  </button>\n</div>\n", styles: [".geometry-type-toggle{padding:10px;text-align:center}.geometry-type-toggle mat-button-toggle-group{width:100%}.geometry-type-toggle mat-button-toggle-group mat-button-toggle{width:25%}.draw-options{overflow-x:hidden}.draw-options mat-slide-toggle{width:100%;margin:10px}.draw-options mat-slide-toggle ::ng-deep .mat-slide-toggle-content{width:calc(100% - 60px)}.icon-options{margin:5px 5px 0}.edition-drawing{padding:10px 0}img{width:100%;height:100%}.deleteBtn{margin-left:12px}.storeTable{height:auto!important}.layer-select{width:85%;padding:10px 10px 0%}.input-button-container{padding:10px}.input-button-container mat-form-field{width:25%}.input-button-container button{left:8px;bottom:10px}.radius{display:flex;flex-flow:column nowrap;width:110%}.unit-field{width:110px;margin-left:30px}.radius-unit{display:flex;width:100%;margin-left:2px;padding:5px}::ng-deep igo-entity-table td:last-child{text-align:right!important}::ng-deep igo-entity-table td:last-child button{margin:0%!important}\n"] }]
         }], function () { return [{ type: i2$1.LanguageService }, { type: i2$2.UntypedFormBuilder }, { type: DrawStyleService }, { type: i1.MatDialog }, { type: DrawIconService }]; }, { map: [{
                 type: Input
             }], stores: [{
@@ -19117,7 +19982,7 @@ StyleModalComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: StyleMo
             i0.ɵɵadvance(4);
             i0.ɵɵtextInterpolate1("", i0.ɵɵpipeBind1(51, 44, "igo.geo.draw.cancel"), " ");
         }
-    }, dependencies: [i13.MatFormField, i13.MatLabel, i13.MatSuffix, i14.MatInput, i2$2.ɵNgNoValidate, i2$2.DefaultValueAccessor, i2$2.NgControlStatus, i2$2.NgControlStatusGroup, i2$2.FormGroupDirective, i2$2.FormControlName, i1$1.NgForOf, i1$1.NgIf, i2.MatIcon, i3.MatButton, i15.MatSelect, i9.MatOption, i4.MatTooltip, i12.ColorPickerDirective, i7.TranslatePipe], styles: ["h2[_ngcontent-%COMP%]{font-weight:700;font-size:large}.igo-form[_ngcontent-%COMP%]{padding:10px}.fill-field[_ngcontent-%COMP%], .stroke-field[_ngcontent-%COMP%]{width:130px}.fill-color-picker[_ngcontent-%COMP%]   mat-icon[_ngcontent-%COMP%]{position:relative;top:7px}.fill-color-picker[_ngcontent-%COMP%]   mat-form-field[_ngcontent-%COMP%]{left:8px}.stroke-color-picker[_ngcontent-%COMP%]   mat-icon[_ngcontent-%COMP%]{position:relative;top:7px}.stroke-color-picker[_ngcontent-%COMP%]   mat-form-field[_ngcontent-%COMP%]{left:35px}.box[_ngcontent-%COMP%]{width:25px;height:25px}.edition-drawing[_ngcontent-%COMP%]{padding:10px 0}.igo-input-container[_ngcontent-%COMP%]   .mat-form-field[_ngcontent-%COMP%] + .mat-form-field[_ngcontent-%COMP%]{margin-left:8px}.igo-form-input-box[_ngcontent-%COMP%]{width:150px}button[_ngcontent-%COMP%]{margin-right:5px}"] });
+    }, dependencies: [i13.MatFormField, i13.MatLabel, i13.MatSuffix, i14.MatInput, i2$2.ɵNgNoValidate, i2$2.DefaultValueAccessor, i2$2.NgControlStatus, i2$2.NgControlStatusGroup, i2$2.FormGroupDirective, i2$2.FormControlName, i1$1.NgForOf, i1$1.NgIf, i2.MatIcon, i3.MatButton, i15.MatSelect, i9.MatOption, i4.MatTooltip, i12$1.ColorPickerDirective, i7.TranslatePipe], styles: ["h2[_ngcontent-%COMP%]{font-weight:700;font-size:large}.igo-form[_ngcontent-%COMP%]{padding:10px}.fill-field[_ngcontent-%COMP%], .stroke-field[_ngcontent-%COMP%]{width:130px}.fill-color-picker[_ngcontent-%COMP%]   mat-icon[_ngcontent-%COMP%]{position:relative;top:7px}.fill-color-picker[_ngcontent-%COMP%]   mat-form-field[_ngcontent-%COMP%]{left:8px}.stroke-color-picker[_ngcontent-%COMP%]   mat-icon[_ngcontent-%COMP%]{position:relative;top:7px}.stroke-color-picker[_ngcontent-%COMP%]   mat-form-field[_ngcontent-%COMP%]{left:35px}.box[_ngcontent-%COMP%]{width:25px;height:25px}.edition-drawing[_ngcontent-%COMP%]{padding:10px 0}.igo-input-container[_ngcontent-%COMP%]   .mat-form-field[_ngcontent-%COMP%] + .mat-form-field[_ngcontent-%COMP%]{margin-left:8px}.igo-form-input-box[_ngcontent-%COMP%]{width:150px}button[_ngcontent-%COMP%]{margin-right:5px}"] });
 (function () {
     (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(StyleModalComponent, [{
             type: Component,
@@ -19267,9 +20132,9 @@ IgoLayerModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [MatInputM
             TrackFeatureButtonComponent,
             StyleModalComponent] });
 })();
-i0.ɵɵsetComponentScope(LayerItemComponent, [i1$1.NgClass, i1$1.NgIf, i2.MatIcon, i3.MatButton, i4.MatTooltip, i5.MatListItem, i9.MatLine, i5.MatListIconCssMatStyler, i7$1.MatBadge, i12$1.MatCheckbox, LayerLegendComponent], [i1$1.AsyncPipe, i7.TranslatePipe]);
+i0.ɵɵsetComponentScope(LayerItemComponent, [i1$1.NgClass, i1$1.NgIf, i2.MatIcon, i3.MatButton, i4.MatTooltip, i5.MatListItem, i9.MatLine, i5.MatListIconCssMatStyler, i7$1.MatBadge, i12.MatCheckbox, LayerLegendComponent], [i1$1.AsyncPipe, i7.TranslatePipe]);
 i0.ɵɵsetComponentScope(LayerLegendItemComponent, [i4.MatTooltip, i5.MatListItem, i9.MatLine, LayerLegendComponent], []);
-i0.ɵɵsetComponentScope(LayerListComponent, [i2$2.NgControlStatus, i1$1.NgClass, i1$1.NgForOf, i1$1.NgIf, i1$1.NgTemplateOutlet, i2$2.NgModel, i11.MatDivider, i7$2.MatMenu, i7$2.MatMenuTrigger, i2.MatIcon, i3.MatButton, i4.MatTooltip, i5.MatList, i5.MatListItem, i13$1.MatSlider, i7$1.MatBadge, i12$1.MatCheckbox, i5$1.ListItemDirective, i5$1.ListComponent, i5$1.PanelComponent, LayerItemComponent,
+i0.ɵɵsetComponentScope(LayerListComponent, [i2$2.NgControlStatus, i1$1.NgClass, i1$1.NgForOf, i1$1.NgIf, i1$1.NgTemplateOutlet, i2$2.NgModel, i11.MatDivider, i7$2.MatMenu, i7$2.MatMenuTrigger, i2.MatIcon, i3.MatButton, i4.MatTooltip, i5.MatList, i5.MatListItem, i13$1.MatSlider, i7$1.MatBadge, i12.MatCheckbox, i5$1.ListItemDirective, i5$1.ListComponent, i5$1.PanelComponent, LayerItemComponent,
     LayerListToolComponent], [i1$1.AsyncPipe, i7.TranslatePipe]);
 i0.ɵɵsetComponentScope(LayerLegendListComponent, [i1$1.NgForOf, i1$1.NgIf, i11.MatDivider, i23.MatSlideToggle, i4.MatTooltip, i5$1.ListItemDirective, i5$1.ListComponent, LayerLegendItemComponent], [i1$1.AsyncPipe, i7.TranslatePipe]);
 
@@ -20675,7 +21540,9 @@ IgoDrawModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [FormsModul
         IgoEntityTableModule,
         ColorPickerModule,
         BrowserModule,
-        BrowserAnimationsModule] });
+        BrowserAnimationsModule,
+        MatRadioModule,
+        MatCheckboxModule] });
 (function () {
     (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(IgoDrawModule, [{
             type: NgModule,
@@ -20701,7 +21568,9 @@ IgoDrawModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [FormsModul
                         IgoEntityTableModule,
                         ColorPickerModule,
                         BrowserModule,
-                        BrowserAnimationsModule
+                        BrowserAnimationsModule,
+                        MatRadioModule,
+                        MatCheckboxModule
                     ],
                     declarations: [DrawComponent, DrawPopupComponent, DrawLayerPopupComponent, DrawShorcutsComponent],
                     exports: [DrawComponent]
@@ -20729,7 +21598,9 @@ IgoDrawModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [FormsModul
             IgoEntityTableModule,
             ColorPickerModule,
             BrowserModule,
-            BrowserAnimationsModule], exports: [DrawComponent] });
+            BrowserAnimationsModule,
+            MatRadioModule,
+            MatCheckboxModule], exports: [DrawComponent] });
 })();
 
 class IgoDrawingToolModule {
@@ -22969,6 +23840,14 @@ class GeometryFormFieldInputComponent {
         }
         this.toggleControl();
     }
+    /**
+     * Whether freehand draw control should be active or not
+     */
+    get predefinedRadius() { return this._predefinedRadius; }
+    set predefinedRadius(value) {
+        this._predefinedRadius = value;
+        this.drawControl.ispredefinedRadius$.next(value);
+    }
     /**
      * Style for the draw control (applies while the geometry is being drawn)
      */
@@ -23349,7 +24228,7 @@ class GeometryFormFieldInputComponent {
     }
 }
 GeometryFormFieldInputComponent.ɵfac = function GeometryFormFieldInputComponent_Factory(t) { return new (t || GeometryFormFieldInputComponent)(i0.ɵɵdirectiveInject(i0.ChangeDetectorRef), i0.ɵɵdirectiveInject(i2$2.NgControl, 10)); };
-GeometryFormFieldInputComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: GeometryFormFieldInputComponent, selectors: [["igo-geometry-form-field-input"]], inputs: { map: "map", geometryType: "geometryType", drawGuide: "drawGuide", measure: "measure", drawControlIsActive: "drawControlIsActive", freehandDrawIsActive: "freehandDrawIsActive", controlOptions: "controlOptions", drawStyle: "drawStyle", overlayStyle: "overlayStyle", value: "value", radius: "radius" }, decls: 1, vars: 0, template: function GeometryFormFieldInputComponent_Template(rf, ctx) {
+GeometryFormFieldInputComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: GeometryFormFieldInputComponent, selectors: [["igo-geometry-form-field-input"]], inputs: { map: "map", geometryType: "geometryType", drawGuide: "drawGuide", measure: "measure", drawControlIsActive: "drawControlIsActive", freehandDrawIsActive: "freehandDrawIsActive", predefinedRadius: "predefinedRadius", controlOptions: "controlOptions", drawStyle: "drawStyle", overlayStyle: "overlayStyle", value: "value", radius: "radius" }, decls: 1, vars: 0, template: function GeometryFormFieldInputComponent_Template(rf, ctx) {
         if (rf & 1) {
             i0.ɵɵtemplate(0, GeometryFormFieldInputComponent_ng_template_0_Template, 0, 0, "ng-template");
         }
@@ -23376,6 +24255,8 @@ GeometryFormFieldInputComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ t
                 type: Input
             }], freehandDrawIsActive: [{
                 type: Input
+            }], predefinedRadius: [{
+                type: Input
             }], controlOptions: [{
                 type: Input
             }], drawStyle: [{
@@ -24716,7 +25597,7 @@ TimeFilterListBindingDirective.ɵdir = /*@__PURE__*/ i0.ɵɵdefineDirective({ ty
 class WktService {
     constructor() { }
     wktToFeature(wkt, wktProj, featureProj) {
-        return new olWKT().readFeature(wkt, {
+        return new olFormatWKT().readFeature(wkt, {
             dataProjection: wktProj,
             featureProjection: featureProj
         });
@@ -28487,6 +29368,7 @@ class SpatialFilterItemComponent {
         this.measureUnitChange = new EventEmitter();
         this.radiusEvent = new EventEmitter();
         this.freehandControl = new EventEmitter();
+        this.predefinedRadius = new EventEmitter();
         this.clearButtonEvent = new EventEmitter();
         this.clearSearchEvent = new EventEmitter();
         this.export = new EventEmitter();
@@ -28954,6 +29836,16 @@ class SpatialFilterItemComponent {
     onfreehandControlChange() {
         this.freehandDrawIsActive = !this.freehandDrawIsActive;
         this.freehandControl.emit(this.freehandDrawIsActive);
+        if (this.isPoint()) {
+            this.predefinedRadius.emit(!this.freehandDrawIsActive);
+            if (this.freehandDrawIsActive) {
+                this.overlayStyle$.next(undefined);
+                this.drawStyle$.next(undefined);
+            }
+        }
+        else {
+            this.predefinedRadius.emit(false);
+        }
     }
     /**
      * Launch search button
@@ -29142,7 +30034,7 @@ class SpatialFilterItemComponent {
     }
 }
 SpatialFilterItemComponent.ɵfac = function SpatialFilterItemComponent_Factory(t) { return new (t || SpatialFilterItemComponent)(i0.ɵɵdirectiveInject(i0.ChangeDetectorRef), i0.ɵɵdirectiveInject(SpatialFilterService), i0.ɵɵdirectiveInject(i2$1.MessageService), i0.ɵɵdirectiveInject(i2$1.LanguageService)); };
-SpatialFilterItemComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: SpatialFilterItemComponent, selectors: [["igo-spatial-filter-item"]], inputs: { map: "map", type: "type", queryType: "queryType", zone: "zone", loading: "loading", store: "store", layers: "layers", allLayers: "allLayers", thematicLength: "thematicLength" }, outputs: { toggleSearch: "toggleSearch", itemTypeChange: "itemTypeChange", thematicChange: "thematicChange", drawZoneEvent: "drawZoneEvent", bufferEvent: "bufferEvent", zoneWithBufferChange: "zoneWithBufferChange", measureUnitChange: "measureUnitChange", radiusEvent: "radiusEvent", freehandControl: "freehandControl", clearButtonEvent: "clearButtonEvent", clearSearchEvent: "clearSearchEvent", export: "export", openWorkspace: "openWorkspace", entityChange: "entityChange" }, decls: 29, vars: 42, consts: [[3, "formControl", "map", "geometryType", "drawGuide", "measure", "drawControlIsActive", "freehandDrawIsActive", "drawStyle", "overlayStyle", "radius"], [1, "header"], [3, "checked", "labelPosition", "change", 4, "ngIf"], ["class", "buffer-unit", 4, "ngIf"], ["class", "radius-unit", 4, "ngIf"], [1, "title", "mat-typography"], [3, "value"], [3, "value", "change", 4, "ngFor", "ngForOf"], ["class", "thematics", 4, "ngIf"], [1, "buttons"], ["mat-raised-button", "", "class", "clear-search-button", 3, "disabled", "click", 4, "ngIf"], ["mat-raised-button", "", "class", "clear-form-button", 3, "disabled", "click", 4, "ngIf"], ["mat-raised-button", "", "color", "primary", 1, "search-button", 3, "disabled", "click"], ["mat-raised-button", "", 1, "remove-button", 3, "disabled", "click"], ["mat-raised-button", "", 1, "export-button", 3, "disabled", "click"], ["class", "chevron-down", "mat-icon-button", "", "matTooltipShowDelay", "500", 3, "matTooltip", "click", 4, "ngIf"], ["class", "results", 4, "ngIf"], [3, "checked", "labelPosition", "change"], [1, "buffer-unit"], [1, "buffer-form"], [1, "buffer"], ["type", "number", "matInput", "", 3, "placeholder", "formControl", "value", "readonly"], [1, "unit-field"], [3, "value", "selectionChange"], [3, "value", 4, "ngFor", "ngForOf"], [1, "radius-unit"], [1, "radius-form"], [1, "radius"], ["type", "number", "matInput", "", 3, "placeholder", "formControl", "value", "readonly", "input"], [3, "value", "change"], [1, "thematics"], ["matColumnDef", "name"], ["class", "thematics-header", 4, "matHeaderCellDef"], ["matColumnDef", "select"], ["class", "checks-header", 4, "matHeaderCellDef"], [4, "matHeaderRowDef"], [4, "matRowDef", "matRowDefColumns"], [3, "dataSource", "treeControl"], ["matTreeNodeToggle", "", 4, "matTreeNodeDef"], [4, "matTreeNodeDef", "matTreeNodeDefWhen"], [1, "thematics-header"], [1, "checks-header"], [3, "checked", "indeterminate", "change"], ["matTreeNodeToggle", ""], [1, "mat-tree-node"], ["mat-icon-button", "", "disabled", ""], [1, "tree-check", 3, "checked", "click", "change"], ["mat-icon-button", "", 3, "click"], [3, "svgIcon"], [1, "tree-check-2", 3, "checked", "indeterminate", "change"], [1, "tree-ul"], ["matTreeNodeOutlet", ""], ["mat-raised-button", "", 1, "clear-search-button", 3, "disabled", "click"], ["mat-raised-button", "", 1, "clear-form-button", 3, "disabled", "click"], ["mat-icon-button", "", "matTooltipShowDelay", "500", 1, "chevron-down", 3, "matTooltip", "click"], ["svgIcon", "chevron-down"], [1, "results"], ["mat-icon-button", "", "matTooltipShowDelay", "500", 3, "matTooltip", "click", 4, "ngIf"], [1, "results-list", 3, "template", "store", "entitySelectChange"], ["mat-icon-button", "", "matTooltipShowDelay", "500", 3, "matTooltip", "click"], ["svgIcon", "chevron-up"]], template: function SpatialFilterItemComponent_Template(rf, ctx) {
+SpatialFilterItemComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: SpatialFilterItemComponent, selectors: [["igo-spatial-filter-item"]], inputs: { map: "map", type: "type", queryType: "queryType", zone: "zone", loading: "loading", store: "store", layers: "layers", allLayers: "allLayers", thematicLength: "thematicLength" }, outputs: { toggleSearch: "toggleSearch", itemTypeChange: "itemTypeChange", thematicChange: "thematicChange", drawZoneEvent: "drawZoneEvent", bufferEvent: "bufferEvent", zoneWithBufferChange: "zoneWithBufferChange", measureUnitChange: "measureUnitChange", radiusEvent: "radiusEvent", freehandControl: "freehandControl", predefinedRadius: "predefinedRadius", clearButtonEvent: "clearButtonEvent", clearSearchEvent: "clearSearchEvent", export: "export", openWorkspace: "openWorkspace", entityChange: "entityChange" }, decls: 29, vars: 43, consts: [[3, "formControl", "map", "geometryType", "drawGuide", "measure", "drawControlIsActive", "freehandDrawIsActive", "drawStyle", "overlayStyle", "radius", "predefinedRadius"], [1, "header"], [3, "checked", "labelPosition", "change", 4, "ngIf"], ["class", "buffer-unit", 4, "ngIf"], ["class", "radius-unit", 4, "ngIf"], [1, "title", "mat-typography"], [3, "value"], [3, "value", "change", 4, "ngFor", "ngForOf"], ["class", "thematics", 4, "ngIf"], [1, "buttons"], ["mat-raised-button", "", "class", "clear-search-button", 3, "disabled", "click", 4, "ngIf"], ["mat-raised-button", "", "class", "clear-form-button", 3, "disabled", "click", 4, "ngIf"], ["mat-raised-button", "", "color", "primary", 1, "search-button", 3, "disabled", "click"], ["mat-raised-button", "", 1, "remove-button", 3, "disabled", "click"], ["mat-raised-button", "", 1, "export-button", 3, "disabled", "click"], ["class", "chevron-down", "mat-icon-button", "", "matTooltipShowDelay", "500", 3, "matTooltip", "click", 4, "ngIf"], ["class", "results", 4, "ngIf"], [3, "checked", "labelPosition", "change"], [1, "buffer-unit"], [1, "buffer-form"], [1, "buffer"], ["type", "number", "matInput", "", 3, "placeholder", "formControl", "value", "readonly"], [1, "unit-field"], [3, "value", "selectionChange"], [3, "value", 4, "ngFor", "ngForOf"], [1, "radius-unit"], [1, "radius-form"], [1, "radius"], ["type", "number", "matInput", "", 3, "placeholder", "formControl", "value", "readonly", "input"], [3, "value", "change"], [1, "thematics"], ["matColumnDef", "name"], ["class", "thematics-header", 4, "matHeaderCellDef"], ["matColumnDef", "select"], ["class", "checks-header", 4, "matHeaderCellDef"], [4, "matHeaderRowDef"], [4, "matRowDef", "matRowDefColumns"], [3, "dataSource", "treeControl"], ["matTreeNodeToggle", "", 4, "matTreeNodeDef"], [4, "matTreeNodeDef", "matTreeNodeDefWhen"], [1, "thematics-header"], [1, "checks-header"], [3, "checked", "indeterminate", "change"], ["matTreeNodeToggle", ""], [1, "mat-tree-node"], ["mat-icon-button", "", "disabled", ""], [1, "tree-check", 3, "checked", "click", "change"], ["mat-icon-button", "", 3, "click"], [3, "svgIcon"], [1, "tree-check-2", 3, "checked", "indeterminate", "change"], [1, "tree-ul"], ["matTreeNodeOutlet", ""], ["mat-raised-button", "", 1, "clear-search-button", 3, "disabled", "click"], ["mat-raised-button", "", 1, "clear-form-button", 3, "disabled", "click"], ["mat-icon-button", "", "matTooltipShowDelay", "500", 1, "chevron-down", 3, "matTooltip", "click"], ["svgIcon", "chevron-down"], [1, "results"], ["mat-icon-button", "", "matTooltipShowDelay", "500", 3, "matTooltip", "click", 4, "ngIf"], [1, "results-list", 3, "template", "store", "entitySelectChange"], ["mat-icon-button", "", "matTooltipShowDelay", "500", 3, "matTooltip", "click"], ["svgIcon", "chevron-up"]], template: function SpatialFilterItemComponent_Template(rf, ctx) {
         if (rf & 1) {
             i0.ɵɵelement(0, "igo-geometry-form-field-input", 0);
             i0.ɵɵpipe(1, "async");
@@ -29184,7 +30076,7 @@ SpatialFilterItemComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type:
             i0.ɵɵtemplate(28, SpatialFilterItemComponent_div_28_Template, 3, 3, "div", 16);
         }
         if (rf & 2) {
-            i0.ɵɵproperty("formControl", ctx.formControl)("map", ctx.map)("geometryType", ctx.geometryType)("drawGuide", i0.ɵɵpipeBind1(1, 28, ctx.drawGuide$))("measure", ctx.measure)("drawControlIsActive", ctx.drawControlIsActive)("freehandDrawIsActive", ctx.freehandDrawIsActive)("drawStyle", i0.ɵɵpipeBind1(2, 30, ctx.drawStyle$))("overlayStyle", i0.ɵɵpipeBind1(3, 32, ctx.overlayStyle$))("radius", ctx.radius);
+            i0.ɵɵproperty("formControl", ctx.formControl)("map", ctx.map)("geometryType", ctx.geometryType)("drawGuide", i0.ɵɵpipeBind1(1, 29, ctx.drawGuide$))("measure", ctx.measure)("drawControlIsActive", ctx.drawControlIsActive)("freehandDrawIsActive", ctx.freehandDrawIsActive)("drawStyle", i0.ɵɵpipeBind1(2, 31, ctx.drawStyle$))("overlayStyle", i0.ɵɵpipeBind1(3, 33, ctx.overlayStyle$))("radius", ctx.radius)("predefinedRadius", ctx.predefinedRadius);
             i0.ɵɵadvance(5);
             i0.ɵɵproperty("ngIf", !ctx.isPredefined());
             i0.ɵɵadvance(1);
@@ -29194,7 +30086,7 @@ SpatialFilterItemComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type:
             i0.ɵɵadvance(1);
             i0.ɵɵproperty("ngIf", ctx.isPoint());
             i0.ɵɵadvance(2);
-            i0.ɵɵtextInterpolate1("", i0.ɵɵpipeBind1(11, 34, "igo.geo.spatialFilter.search"), " : ");
+            i0.ɵɵtextInterpolate1("", i0.ɵɵpipeBind1(11, 35, "igo.geo.spatialFilter.search"), " : ");
             i0.ɵɵadvance(2);
             i0.ɵɵproperty("value", ctx.selectedItemType);
             i0.ɵɵadvance(1);
@@ -29208,15 +30100,15 @@ SpatialFilterItemComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type:
             i0.ɵɵadvance(1);
             i0.ɵɵproperty("disabled", ctx.disableSearchButton());
             i0.ɵɵadvance(1);
-            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(20, 36, "igo.geo.spatialFilter.goSearch"), " ");
+            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(20, 37, "igo.geo.spatialFilter.goSearch"), " ");
             i0.ɵɵadvance(2);
             i0.ɵɵproperty("disabled", ctx.allLayers.length === 0);
             i0.ɵɵadvance(1);
-            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(23, 38, "igo.geo.spatialFilter.removeLayer"), " ");
+            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(23, 39, "igo.geo.spatialFilter.removeLayer"), " ");
             i0.ɵɵadvance(2);
             i0.ɵɵproperty("disabled", !ctx.store.entities$.getValue().length);
             i0.ɵɵadvance(1);
-            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(26, 40, "igo.geo.spatialFilter.exportLayer"), " ");
+            i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(26, 41, "igo.geo.spatialFilter.exportLayer"), " ");
             i0.ɵɵadvance(2);
             i0.ɵɵproperty("ngIf", ctx.store.all().length && ctx.tableTemplate && !ctx.listIsVisible);
             i0.ɵɵadvance(1);
@@ -29226,7 +30118,7 @@ SpatialFilterItemComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type:
 (function () {
     (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(SpatialFilterItemComponent, [{
             type: Component,
-            args: [{ selector: 'igo-spatial-filter-item', changeDetection: ChangeDetectionStrategy.OnPush, template: "<igo-geometry-form-field-input\n  [formControl]=\"formControl\"\n  [map]=\"map\"\n  [geometryType]=\"geometryType\"\n  [drawGuide]=\"drawGuide$ | async\"\n  [measure]=\"measure\"\n  [drawControlIsActive]=\"drawControlIsActive\"\n  [freehandDrawIsActive]=\"freehandDrawIsActive\"\n  [drawStyle]=\"drawStyle$ | async\"\n  [overlayStyle]=\"overlayStyle$ | async\"\n  [radius]=\"radius\">\n</igo-geometry-form-field-input>\n\n<div class=\"header\">\n    <mat-slide-toggle *ngIf=\"!isPredefined()\"\n      [checked]=\"drawControlIsActive\"\n      [labelPosition]=\"'before'\"\n      (change)=\"onDrawControlChange()\">\n      {{'igo.geo.spatialFilter.drawControl' | translate}}\n    </mat-slide-toggle>\n    <mat-slide-toggle *ngIf=\"!isPredefined()\"\n      [checked]=\"freehandDrawIsActive\"\n      [labelPosition]=\"'before'\"\n      (change)=\"onfreehandControlChange()\">\n      {{'igo.geo.spatialFilter.freehandControl' | translate}}\n    </mat-slide-toggle>\n</div>\n\n<div class=\"buffer-unit\" *ngIf=\"isPolygon()\">\n  <form class=\"buffer-form\">\n    <mat-form-field class=\"buffer\">\n      <input type=\"number\" matInput placeholder=\"{{'igo.geo.spatialFilter.buffer' | translate}}\" [formControl]=\"bufferFormControl\"\n      [value]=\"0\" [readonly]=\"this.formControl.value === null\">\n    </mat-form-field>\n  </form>\n\n  <mat-form-field class=\"unit-field\">\n    <mat-select\n    [value]=\"measureUnit\"\n    (selectionChange)=\"onMeasureUnitChange($event.value)\">\n    <mat-option *ngFor=\"let measureUnit of measureUnits\" [value]=\"measureUnit\">\n        {{('igo.geo.measure.' + measureUnit) | translate}}\n    </mat-option>\n    </mat-select>\n  </mat-form-field>\n</div>\n\n<div class=\"radius-unit\" *ngIf=\"isPoint()\">\n  <form class=\"radius-form\">\n    <mat-form-field class=\"radius\">\n      <input type=\"number\" matInput placeholder=\"{{'igo.geo.spatialFilter.radius' | translate}}\" [formControl]=\"radiusFormControl\"\n      [value]=\"1000\" (input)=\"getRadius()\" [readonly]=\"this.freehandDrawIsActive && this.formControl.value === null\">\n    </mat-form-field>\n  </form>\n\n  <mat-form-field class=\"unit-field\">\n    <mat-select\n    [value]=\"measureUnit\"\n    (selectionChange)=\"onMeasureUnitChange($event.value)\">\n    <mat-option *ngFor=\"let measureUnit of measureUnits\" [value]=\"measureUnit\">\n        {{('igo.geo.measure.' + measureUnit) | translate}}\n    </mat-option>\n    </mat-select>\n  </mat-form-field>\n</div>\n\n<mat-label class=\"title mat-typography\">{{'igo.geo.spatialFilter.search' | translate}} : </mat-label>\n<mat-radio-group [value]=\"selectedItemType\">\n    <mat-radio-button *ngFor=\"let item of itemType\"\n      [value]=\"item\"\n      (change)=\"onItemTypeChange($event)\">\n      {{'igo.geo.spatialFilter.' + item | translate}}\n    </mat-radio-button>\n</mat-radio-group>\n\n<div class=\"thematics\" *ngIf=\"(selectedItemType==='Thematics' && !tableTemplate) || (selectedItemType==='Thematics' && tableTemplate && !listIsVisible)\">\n  <mat-table>\n      <!-- Name Column -->\n      <ng-container matColumnDef=\"name\">\n        <mat-header-cell *matHeaderCellDef class=\"thematics-header\">{{'igo.geo.spatialFilter.Thematics' | translate}}</mat-header-cell>\n      </ng-container>\n\n      <!-- Select Column -->\n      <ng-container matColumnDef=\"select\">\n        <mat-header-cell *matHeaderCellDef class=\"checks-header\">\n          <mat-checkbox (change)=\"$event ? masterToggle() : null\"\n                        [checked]=\"isAllSelected()\"\n                        [indeterminate]=\"selectedThematics.hasValue() && !isAllSelected()\">\n          </mat-checkbox>\n        </mat-header-cell>\n    </ng-container>\n\n    <mat-header-row *matHeaderRowDef=\"displayedColumns\"></mat-header-row>\n    <mat-row *matRowDef=\"let row; columns: displayedColumns;\"></mat-row>\n\n  </mat-table>\n\n  <mat-tree [dataSource]=\"dataSource\" [treeControl]=\"treeControl\">\n    <!-- This is the tree node template for leaf nodes -->\n    <mat-tree-node *matTreeNodeDef=\"let node\" matTreeNodeToggle>\n      <li class=\"mat-tree-node\">\n        <!-- use a disabled button to provide padding for tree leaf -->\n        <button mat-icon-button disabled></button>\n        {{node.name}}\n        <mat-checkbox class=\"tree-check\" (click)=\"$event.stopPropagation()\"\n                      (change)=\"$event ? onToggleChange(node) : null\"\n                      [checked]=\"selectedThematics.isSelected(node)\">\n        </mat-checkbox>\n      </li>\n    </mat-tree-node>\n\n    <!-- This is the tree node template for expandable nodes -->\n    <mat-nested-tree-node *matTreeNodeDef=\"let node; when: hasChild\">\n        <div class=\"mat-tree-node\">\n          <button mat-icon-button\n            (click)=\"onToggleClick(node)\">\n            <mat-icon [svgIcon]=\"treeControl.isExpanded(node) ? 'chevron-down' : 'chevron-right'\"></mat-icon>\n          </button>\n          {{node.name}}\n          <mat-checkbox class=\"tree-check-2\" (change)=\"$event ? childrensToggle(node) : null\"\n                        [checked]=\"isAllSelected(node)\"\n                        [indeterminate]=\"hasChildrenSelected(node) && !isAllSelected(node)\">\n          </mat-checkbox>\n        </div>\n        <ul class=\"tree-ul\" [class.example-tree-invisible]=\"!treeControl.isExpanded(node)\">\n          <ng-container matTreeNodeOutlet></ng-container>\n        </ul>\n    </mat-nested-tree-node>\n\n  </mat-tree>\n</div>\n\n<div class=\"buttons\">\n\n  <button *ngIf=\"isPredefined()\" mat-raised-button class=\"clear-search-button\" [disabled]=\"disabledClearSearch()\"\n    (click)=\"clearSearch()\">\n      {{'igo.geo.spatialFilter.clearSearch' | translate}}\n  </button>\n\n  <button *ngIf=\"isPolygon() || isPoint()\" mat-raised-button class=\"clear-form-button\" [disabled]=\"this.formControl.value === null\"\n    (click)=\"clearDrawZone()\">\n    {{'igo.geo.spatialFilter.clearForm' | translate}}\n  </button>\n\n  <button mat-raised-button class=\"search-button\" [disabled]=\"disableSearchButton()\" color=\"primary\"\n    (click)=\"toggleSearchButton()\">\n    {{'igo.geo.spatialFilter.goSearch' | translate}}\n  </button>\n\n  <button mat-raised-button class=\"remove-button\" [disabled]=\"allLayers.length === 0\" (click)=\"clearButton()\">\n    {{'igo.geo.spatialFilter.removeLayer' | translate}}\n  </button>\n\n  <button mat-raised-button class=\"export-button\" [disabled]=\"!store.entities$.getValue().length\" (click)=\"export.emit()\">\n    {{'igo.geo.spatialFilter.exportLayer' | translate}}\n  </button>\n\n</div>\n\n<button\n  class=\"chevron-down\"\n  *ngIf=\"store.all().length && tableTemplate && !listIsVisible\"\n  mat-icon-button\n  matTooltipShowDelay=\"500\"\n  [matTooltip]=\"'igo.geo.spatialFilter.showSearchResults' | translate\"\n  (click)=\"toggleVisibleList()\">\n  <mat-icon svgIcon=\"chevron-down\"></mat-icon>\n</button>\n\n<div class=\"results\" *ngIf=\"store.all().length && tableTemplate && listIsVisible\">\n  <button\n    *ngIf=\"listIsVisible\"\n    mat-icon-button\n    matTooltipShowDelay=\"500\"\n    [matTooltip]=\"'igo.geo.spatialFilter.hideSearchResults' | translate\"\n    (click)=\"toggleVisibleList()\">\n  <mat-icon svgIcon=\"chevron-up\"></mat-icon>\n  </button>\n  <igo-entity-table\n    class=\"results-list\"\n    [template]=\"tableTemplate\"\n    [store]=\"store\"\n    (entitySelectChange)=\"entityChange.emit($event)\">\n  </igo-entity-table>\n</div>\n", styles: [".header{margin-top:5px;width:100%}.mat-slide-toggle{padding:5px;margin-bottom:15px;width:98%}.mat-slide-toggle ::ng-deep .mat-slide-toggle-content{width:calc(100% - 20px)}.title{margin-left:5px;font-size:medium;font-size:initial}.mat-radio-group{display:flex;flex-direction:column;padding-top:10px}.mat-radio-button{display:inline-flex;position:relative;margin-left:16px;margin-top:10px}.mat-form-field{margin-top:5px}.mat-column-select{overflow:auto}.buttons{margin-top:15px}.search-button{left:15px;width:46%}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.search-button{left:10px;width:45%;min-height:35px;white-space:normal;line-height:normal}}.export-button{left:15px;width:46%;margin-bottom:5px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.export-button{left:10px;margin-top:10px;width:45%;min-height:35px;white-space:normal;line-height:normal}}.remove-button{margin-top:12px;left:5px;width:46%}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.remove-button{margin:0;width:45%;min-height:35px;white-space:normal;line-height:normal}}.clear-form-button{left:5px;width:46%}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.clear-form-button{width:45%;min-height:35px;white-space:normal;line-height:normal}}.clear-search-button{left:5px;width:46%}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.clear-search-button{width:45%;min-height:35px;white-space:normal;line-height:normal}}.thematics{max-height:35%;overflow:auto;margin-top:5px;width:98%}.results{overflow:auto;max-height:250px;width:98%}.mat-column-typeResults{max-width:100px;margin-right:5px}.buffer-unit,.radius-unit{display:flex;width:100%;margin-left:2px;padding:5px}.radius,.buffer{display:flex;flex-flow:column nowrap;width:110%}.unit-field{width:110px;margin-left:30px}.example-tree-invisible{display:none}.tree-ul{margin:0;padding:0 0 0 20px;list-style-type:none}.tree-check,.tree-check-2{position:relative;margin-left:auto;margin-right:5px}.thematics-header{max-width:250px}.checks-header{padding:none;max-width:calc(100% - 316px);overflow:hidden}.mat-checkbox{padding:5px}.mat-tree-node{position:relative;min-height:42px;width:280px}.mat-header-cell{height:56px}.results{max-height:45%;width:98%}.results igo-entity-table ::ng-deep div.table-container{overflow:visible;overflow:initial}\n"] }]
+            args: [{ selector: 'igo-spatial-filter-item', changeDetection: ChangeDetectionStrategy.OnPush, template: "<igo-geometry-form-field-input\n  [formControl]=\"formControl\"\n  [map]=\"map\"\n  [geometryType]=\"geometryType\"\n  [drawGuide]=\"drawGuide$ | async\"\n  [measure]=\"measure\"\n  [drawControlIsActive]=\"drawControlIsActive\"\n  [freehandDrawIsActive]=\"freehandDrawIsActive\"\n  [drawStyle]=\"drawStyle$ | async\"\n  [overlayStyle]=\"overlayStyle$ | async\"\n  [radius]=\"radius\"\n  [predefinedRadius]=\"predefinedRadius\">\n</igo-geometry-form-field-input>\n\n<div class=\"header\">\n    <mat-slide-toggle *ngIf=\"!isPredefined()\"\n      [checked]=\"drawControlIsActive\"\n      [labelPosition]=\"'before'\"\n      (change)=\"onDrawControlChange()\">\n      {{'igo.geo.spatialFilter.drawControl' | translate}}\n    </mat-slide-toggle>\n    <mat-slide-toggle *ngIf=\"!isPredefined()\"\n      [checked]=\"freehandDrawIsActive\"\n      [labelPosition]=\"'before'\"\n      (change)=\"onfreehandControlChange()\">\n      {{'igo.geo.spatialFilter.freehandControl' | translate}}\n    </mat-slide-toggle>\n</div>\n\n<div class=\"buffer-unit\" *ngIf=\"isPolygon()\">\n  <form class=\"buffer-form\">\n    <mat-form-field class=\"buffer\">\n      <input type=\"number\" matInput placeholder=\"{{'igo.geo.spatialFilter.buffer' | translate}}\" [formControl]=\"bufferFormControl\"\n      [value]=\"0\" [readonly]=\"this.formControl.value === null\">\n    </mat-form-field>\n  </form>\n\n  <mat-form-field class=\"unit-field\">\n    <mat-select\n    [value]=\"measureUnit\"\n    (selectionChange)=\"onMeasureUnitChange($event.value)\">\n    <mat-option *ngFor=\"let measureUnit of measureUnits\" [value]=\"measureUnit\">\n        {{('igo.geo.measure.' + measureUnit) | translate}}\n    </mat-option>\n    </mat-select>\n  </mat-form-field>\n</div>\n\n<div class=\"radius-unit\" *ngIf=\"isPoint()\">\n  <form class=\"radius-form\">\n    <mat-form-field class=\"radius\">\n      <input type=\"number\" matInput placeholder=\"{{'igo.geo.spatialFilter.radius' | translate}}\" [formControl]=\"radiusFormControl\"\n      [value]=\"1000\" (input)=\"getRadius()\" [readonly]=\"this.freehandDrawIsActive && this.formControl.value === null\">\n    </mat-form-field>\n  </form>\n\n  <mat-form-field class=\"unit-field\">\n    <mat-select\n    [value]=\"measureUnit\"\n    (selectionChange)=\"onMeasureUnitChange($event.value)\">\n    <mat-option *ngFor=\"let measureUnit of measureUnits\" [value]=\"measureUnit\">\n        {{('igo.geo.measure.' + measureUnit) | translate}}\n    </mat-option>\n    </mat-select>\n  </mat-form-field>\n</div>\n\n<mat-label class=\"title mat-typography\">{{'igo.geo.spatialFilter.search' | translate}} : </mat-label>\n<mat-radio-group [value]=\"selectedItemType\">\n    <mat-radio-button *ngFor=\"let item of itemType\"\n      [value]=\"item\"\n      (change)=\"onItemTypeChange($event)\">\n      {{'igo.geo.spatialFilter.' + item | translate}}\n    </mat-radio-button>\n</mat-radio-group>\n\n<div class=\"thematics\" *ngIf=\"(selectedItemType==='Thematics' && !tableTemplate) || (selectedItemType==='Thematics' && tableTemplate && !listIsVisible)\">\n  <mat-table>\n      <!-- Name Column -->\n      <ng-container matColumnDef=\"name\">\n        <mat-header-cell *matHeaderCellDef class=\"thematics-header\">{{'igo.geo.spatialFilter.Thematics' | translate}}</mat-header-cell>\n      </ng-container>\n\n      <!-- Select Column -->\n      <ng-container matColumnDef=\"select\">\n        <mat-header-cell *matHeaderCellDef class=\"checks-header\">\n          <mat-checkbox (change)=\"$event ? masterToggle() : null\"\n                        [checked]=\"isAllSelected()\"\n                        [indeterminate]=\"selectedThematics.hasValue() && !isAllSelected()\">\n          </mat-checkbox>\n        </mat-header-cell>\n    </ng-container>\n\n    <mat-header-row *matHeaderRowDef=\"displayedColumns\"></mat-header-row>\n    <mat-row *matRowDef=\"let row; columns: displayedColumns;\"></mat-row>\n\n  </mat-table>\n\n  <mat-tree [dataSource]=\"dataSource\" [treeControl]=\"treeControl\">\n    <!-- This is the tree node template for leaf nodes -->\n    <mat-tree-node *matTreeNodeDef=\"let node\" matTreeNodeToggle>\n      <li class=\"mat-tree-node\">\n        <!-- use a disabled button to provide padding for tree leaf -->\n        <button mat-icon-button disabled></button>\n        {{node.name}}\n        <mat-checkbox class=\"tree-check\" (click)=\"$event.stopPropagation()\"\n                      (change)=\"$event ? onToggleChange(node) : null\"\n                      [checked]=\"selectedThematics.isSelected(node)\">\n        </mat-checkbox>\n      </li>\n    </mat-tree-node>\n\n    <!-- This is the tree node template for expandable nodes -->\n    <mat-nested-tree-node *matTreeNodeDef=\"let node; when: hasChild\">\n        <div class=\"mat-tree-node\">\n          <button mat-icon-button\n            (click)=\"onToggleClick(node)\">\n            <mat-icon [svgIcon]=\"treeControl.isExpanded(node) ? 'chevron-down' : 'chevron-right'\"></mat-icon>\n          </button>\n          {{node.name}}\n          <mat-checkbox class=\"tree-check-2\" (change)=\"$event ? childrensToggle(node) : null\"\n                        [checked]=\"isAllSelected(node)\"\n                        [indeterminate]=\"hasChildrenSelected(node) && !isAllSelected(node)\">\n          </mat-checkbox>\n        </div>\n        <ul class=\"tree-ul\" [class.example-tree-invisible]=\"!treeControl.isExpanded(node)\">\n          <ng-container matTreeNodeOutlet></ng-container>\n        </ul>\n    </mat-nested-tree-node>\n\n  </mat-tree>\n</div>\n\n<div class=\"buttons\">\n\n  <button *ngIf=\"isPredefined()\" mat-raised-button class=\"clear-search-button\" [disabled]=\"disabledClearSearch()\"\n    (click)=\"clearSearch()\">\n      {{'igo.geo.spatialFilter.clearSearch' | translate}}\n  </button>\n\n  <button *ngIf=\"isPolygon() || isPoint()\" mat-raised-button class=\"clear-form-button\" [disabled]=\"this.formControl.value === null\"\n    (click)=\"clearDrawZone()\">\n    {{'igo.geo.spatialFilter.clearForm' | translate}}\n  </button>\n\n  <button mat-raised-button class=\"search-button\" [disabled]=\"disableSearchButton()\" color=\"primary\"\n    (click)=\"toggleSearchButton()\">\n    {{'igo.geo.spatialFilter.goSearch' | translate}}\n  </button>\n\n  <button mat-raised-button class=\"remove-button\" [disabled]=\"allLayers.length === 0\" (click)=\"clearButton()\">\n    {{'igo.geo.spatialFilter.removeLayer' | translate}}\n  </button>\n\n  <button mat-raised-button class=\"export-button\" [disabled]=\"!store.entities$.getValue().length\" (click)=\"export.emit()\">\n    {{'igo.geo.spatialFilter.exportLayer' | translate}}\n  </button>\n\n</div>\n\n<button\n  class=\"chevron-down\"\n  *ngIf=\"store.all().length && tableTemplate && !listIsVisible\"\n  mat-icon-button\n  matTooltipShowDelay=\"500\"\n  [matTooltip]=\"'igo.geo.spatialFilter.showSearchResults' | translate\"\n  (click)=\"toggleVisibleList()\">\n  <mat-icon svgIcon=\"chevron-down\"></mat-icon>\n</button>\n\n<div class=\"results\" *ngIf=\"store.all().length && tableTemplate && listIsVisible\">\n  <button\n    *ngIf=\"listIsVisible\"\n    mat-icon-button\n    matTooltipShowDelay=\"500\"\n    [matTooltip]=\"'igo.geo.spatialFilter.hideSearchResults' | translate\"\n    (click)=\"toggleVisibleList()\">\n  <mat-icon svgIcon=\"chevron-up\"></mat-icon>\n  </button>\n  <igo-entity-table\n    class=\"results-list\"\n    [template]=\"tableTemplate\"\n    [store]=\"store\"\n    (entitySelectChange)=\"entityChange.emit($event)\">\n  </igo-entity-table>\n</div>\n", styles: [".header{margin-top:5px;width:100%}.mat-slide-toggle{padding:5px;margin-bottom:15px;width:98%}.mat-slide-toggle ::ng-deep .mat-slide-toggle-content{width:calc(100% - 20px)}.title{margin-left:5px;font-size:medium;font-size:initial}.mat-radio-group{display:flex;flex-direction:column;padding-top:10px}.mat-radio-button{display:inline-flex;position:relative;margin-left:16px;margin-top:10px}.mat-form-field{margin-top:5px}.mat-column-select{overflow:auto}.buttons{margin-top:15px}.search-button{left:15px;width:46%}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.search-button{left:10px;width:45%;min-height:35px;white-space:normal;line-height:normal}}.export-button{left:15px;width:46%;margin-bottom:5px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.export-button{left:10px;margin-top:10px;width:45%;min-height:35px;white-space:normal;line-height:normal}}.remove-button{margin-top:12px;left:5px;width:46%}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.remove-button{margin:0;width:45%;min-height:35px;white-space:normal;line-height:normal}}.clear-form-button{left:5px;width:46%}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.clear-form-button{width:45%;min-height:35px;white-space:normal;line-height:normal}}.clear-search-button{left:5px;width:46%}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.clear-search-button{width:45%;min-height:35px;white-space:normal;line-height:normal}}.thematics{max-height:35%;overflow:auto;margin-top:5px;width:98%}.results{overflow:auto;max-height:250px;width:98%}.mat-column-typeResults{max-width:100px;margin-right:5px}.buffer-unit,.radius-unit{display:flex;width:100%;margin-left:2px;padding:5px}.radius,.buffer{display:flex;flex-flow:column nowrap;width:110%}.unit-field{width:110px;margin-left:30px}.example-tree-invisible{display:none}.tree-ul{margin:0;padding:0 0 0 20px;list-style-type:none}.tree-check,.tree-check-2{position:relative;margin-left:auto;margin-right:5px}.thematics-header{max-width:250px}.checks-header{padding:none;max-width:calc(100% - 316px);overflow:hidden}.mat-checkbox{padding:5px}.mat-tree-node{position:relative;min-height:42px;width:280px}.mat-header-cell{height:56px}.results{max-height:45%;width:98%}.results igo-entity-table ::ng-deep div.table-container{overflow:visible;overflow:initial}\n"] }]
         }], function () { return [{ type: i0.ChangeDetectorRef }, { type: SpatialFilterService }, { type: i2$1.MessageService }, { type: i2$1.LanguageService }]; }, { map: [{
                 type: Input
             }], type: [{
@@ -29263,6 +30155,8 @@ SpatialFilterItemComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type:
                 type: Output
             }], freehandControl: [{
                 type: Output
+            }], predefinedRadius: [{
+                type: Output
             }], clearButtonEvent: [{
                 type: Output
             }], clearSearchEvent: [{
@@ -29550,7 +30444,7 @@ function OgcFilterTimeComponent_div_3_div_2_div_13_Template(rf, ctx) {
         i0.ɵɵadvance(2);
         i0.ɵɵproperty("for", _r35)("disabled", ctx_r25.filterStateDisable);
         i0.ɵɵadvance(1);
-        i0.ɵɵproperty("matDatepicker", _r35)("placeholder", i0.ɵɵpipeBind1(5, 14, "igo.geo.timeFilter.endDate"))("matDatepickerFilter", ctx_r25.dateFilter.bind(ctx_r25, "end"))("value", ctx_r25.endValue ? ctx_r25.endValue : ctx_r25.handleDate(ctx_r25.datasource.options.maxDate))("min", ctx_r25.beginValue ? ctx_r25.beginValue : ctx_r25.handleDate(ctx_r25.datasource.options.minDate))("max", ctx_r25.handleDate(ctx_r25.datasource.options.maxDate))("disabled", ctx_r25.filterStateDisable);
+        i0.ɵɵproperty("matDatepicker", _r35)("placeholder", i0.ɵɵpipeBind1(5, 14, "igo.geo.timeFilter.endDate"))("matDatepickerFilter", ctx_r25.filterEndFunction)("value", ctx_r25.endValue ? ctx_r25.endValue : ctx_r25.handleDate(ctx_r25.datasource.options.maxDate))("min", ctx_r25.beginValue ? ctx_r25.beginValue : ctx_r25.handleDate(ctx_r25.datasource.options.minDate))("max", ctx_r25.handleDate(ctx_r25.datasource.options.maxDate))("disabled", ctx_r25.filterStateDisable);
         i0.ɵɵattribute("disabled", !ctx_r25.currentFilter.active);
         i0.ɵɵadvance(4);
         i0.ɵɵproperty("startView", ctx_r25.calendarView())("startAt", ctx_r25.endValue);
@@ -29594,7 +30488,7 @@ function OgcFilterTimeComponent_div_3_div_2_Template(rf, ctx) {
         i0.ɵɵadvance(3);
         i0.ɵɵproperty("for", _r22)("disabled", ctx_r9.filterStateDisable);
         i0.ɵɵadvance(1);
-        i0.ɵɵproperty("matDatepicker", _r22)("placeholder", i0.ɵɵpipeBind1(6, 20, "igo.geo.timeFilter.startDate"))("matDatepickerFilter", ctx_r9.dateFilter.bind(ctx_r9, "begin"))("value", ctx_r9.beginValue ? ctx_r9.beginValue : ctx_r9.handleDate(ctx_r9.datasource.options.minDate))("min", ctx_r9.handleDate(ctx_r9.datasource.options.minDate))("max", ctx_r9.endValue && !ctx_r9.restrictedToStep() ? ctx_r9.endValue : ctx_r9.handleDate(ctx_r9.datasource.options.maxDate))("disabled", ctx_r9.filterStateDisable);
+        i0.ɵɵproperty("matDatepicker", _r22)("placeholder", i0.ɵɵpipeBind1(6, 20, "igo.geo.timeFilter.startDate"))("matDatepickerFilter", ctx_r9.filterBeginFunction)("value", ctx_r9.beginValue ? ctx_r9.beginValue : ctx_r9.handleDate(ctx_r9.datasource.options.minDate))("min", ctx_r9.handleDate(ctx_r9.datasource.options.minDate))("max", ctx_r9.endValue && !ctx_r9.restrictedToStep() ? ctx_r9.endValue : ctx_r9.handleDate(ctx_r9.datasource.options.maxDate))("disabled", ctx_r9.filterStateDisable);
         i0.ɵɵattribute("disabled", !ctx_r9.currentFilter.active);
         i0.ɵɵadvance(4);
         i0.ɵɵproperty("startView", ctx_r9.calendarView())("startAt", ctx_r9.beginValue);
@@ -29691,6 +30585,8 @@ class OgcFilterTimeComponent {
         this.updateHoursMinutesArray();
         // update value for now value
         this.updateValues();
+        this.dateFilter(this.filterBeginFunction, 'begin');
+        this.dateFilter(this.filterEndFunction, 'end');
     }
     parseFilter(filter) {
         if (!filter) {
@@ -29851,10 +30747,12 @@ class OgcFilterTimeComponent {
             if (type === 'end') {
                 const dateValuePlus1 = moment(dateValue).add(1, 'd');
                 const monthDiffPlus1 = moment(dateValuePlus1).diff(moment(this.handleMin()), 'years', true);
-                return (monthDiffPlus1 % moment.duration(this.step).asYears()) === 0;
+                this.filterEndFunction = (monthDiffPlus1 % moment.duration(this.step).asYears()) === 0;
+                return;
             }
             else if (type === 'begin') {
-                return (monthDiff % moment.duration(this.step).asYears()) === 0;
+                this.filterBeginFunction = (monthDiff % moment.duration(this.step).asYears()) === 0;
+                return;
             }
         }
         else if (this.ogcFilterTimeService.stepIsMonthDuration(this.step)) {
@@ -29862,10 +30760,12 @@ class OgcFilterTimeComponent {
             if (type === 'end') {
                 const dateValuePlus1 = moment(dateValue).add(1, 'd');
                 const monthDiffPlus1 = moment(dateValuePlus1).diff(moment(this.handleMin()), 'months', true);
-                return (monthDiffPlus1 % moment.duration(this.step).asMonths()) === 0;
+                this.filterEndFunction = (monthDiffPlus1 % moment.duration(this.step).asMonths()) === 0;
+                return;
             }
             else if (type === 'begin') {
-                return (monthDiff % moment.duration(this.step).asMonths()) === 0;
+                this.filterBeginFunction = (monthDiff % moment.duration(this.step).asMonths()) === 0;
+                return;
             }
         }
         else if (this.ogcFilterTimeService.stepIsWeekDuration(this.step)) {
@@ -29873,10 +30773,12 @@ class OgcFilterTimeComponent {
             if (type === 'end') {
                 const dateValuePlus1 = moment(dateValue).add(1, 'd');
                 const weekDiffPlus1 = moment(dateValuePlus1).diff(moment(this.handleMin()), 'weeks', true);
-                return (weekDiffPlus1 % moment.duration(this.step).asWeeks()) === 0;
+                this.filterEndFunction = (weekDiffPlus1 % moment.duration(this.step).asWeeks()) === 0;
+                return;
             }
             else if (type === 'begin') {
-                return (weekDiff % moment.duration(this.step).asWeeks()) === 0;
+                this.filterBeginFunction = (weekDiff % moment.duration(this.step).asWeeks()) === 0;
+                return;
             }
         }
         else if (this.ogcFilterTimeService.stepIsDayDuration(this.step)) {
@@ -29885,21 +30787,40 @@ class OgcFilterTimeComponent {
                 const dateValuePlus1 = moment(dateValue).add(1, 'd');
                 const dayDiffPlus1 = moment(dateValuePlus1).diff(moment(this.handleMin()), 'days', true);
                 const _mod = (dayDiffPlus1 % moment.duration(this.step).asDays());
-                return (_mod < 0.0000001 && _mod > -0.0000001) || _mod === 0; // 1 millisecond = 1.1574074074074076e-8
+                this.filterEndFunction = (_mod < 0.0000001 && _mod > -0.0000001) || _mod === 0; // 1 millisecond = 1.1574074074074076e-8
+                return;
             }
             else if (type === 'begin') {
                 const _mod = ((dayDiff % moment.duration(this.step).asDays()) + 1);
-                return (_mod < 0.0000001 && _mod > -0.0000001 && _mod !== 0) || _mod === 1; // 1 millisecond = 1.1574074074074076e-8
+                this.filterBeginFunction = (_mod < 0.0000001 && _mod > -0.0000001 && _mod !== 0) || _mod === 1; // 1 millisecond = 1.1574074074074076e-8
+                return;
             }
         }
         else if (this.ogcFilterTimeService.stepIsHourDuration(this.step)) {
-            const hourDiff = moment(dateValue).diff(moment(this.handleMin()), 'hours', true);
-            return (hourDiff % moment.duration(this.step).asHours()) === 0;
+            if (type === 'end') {
+                const hourDiff = moment(dateValue).diff(moment(this.handleMin()), 'hours', true);
+                this.filterEndFunction = (hourDiff % moment.duration(this.step).asHours()) === 0;
+                return;
+            }
+            else if (type === 'begin') {
+                const hourDiff = moment(dateValue).diff(moment(this.handleMin()), 'hours', true);
+                this.filterBeginFunction = (hourDiff % moment.duration(this.step).asHours()) === 0;
+                return;
+            }
         }
         else if (this.ogcFilterTimeService.stepIsMinuteDuration(this.step)) {
-            return true;
+            if (type === 'end') {
+                this.filterEndFunction = true;
+                return;
+            }
+            else if (type === 'begin') {
+                this.filterBeginFunction = true;
+                return;
+            }
         }
-        return diff % this.stepMilliseconds === 0;
+        this.filterEndFunction = diff % this.stepMilliseconds === 0;
+        this.filterBeginFunction = diff % this.stepMilliseconds === 0;
+        return;
     }
     getDateTime(date, pos) {
         const valuetmp = new Date(date);
@@ -30169,7 +31090,7 @@ OgcFilterTimeComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: OgcF
 (function () {
     (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(OgcFilterTimeComponent, [{
             type: Component,
-            args: [{ selector: 'igo-ogc-filter-time', template: "<div class=\"datetime-container\">\n  <mat-slide-toggle \n    *ngIf=\"this.currentFilter.sliderOptions?.enabled\"\n    [(ngModel)]=\"sliderMode\"\n    (change)=\"modeChange($event)\">\n    {{'igo.geo.filter.sliderModeTitle' | translate}}\n  </mat-slide-toggle>\n\n  <div class=\"slider-container\" *ngIf=\"sliderMode\">\n    <igo-ogc-filter-time-slider\n      [begin]=\"beginValue\"\n      [max]=\"this.restrictedToStep() ? this.maxDate : this.endValue\"\n      [currentFilter]=\"currentFilter\" \n      [datasource]=\"datasource\"\n      (changeProperty)=\"changePropertyByPass($event)\"\n    >\n    </igo-ogc-filter-time-slider>\n    \n  </div>\n\n  <div *ngIf=\"!sliderMode\">\n\n    <div class=\"year-input-container\" *ngIf=\"calendarTypeYear\">\n      <!-- to emulate a year-picker, 2 input: first input to show user just year and second input hiden and bind \n        with the datepicker  -->\n      <mat-form-field  class=\"year-input\">\n        <mat-label>{{'igo.geo.timeFilter.startYear'| translate}}</mat-label>\n        <input\n          matInput\n          class=\"year-input-only-year\"\n          value=\"{{onlyYearBegin}}\"\n          (change)= \"yearOnlyInputChange($event, beginDatepicker, 'begin')\"\n          [disabled]= \"filterStateDisable\"\n          >\n        <mat-datepicker-toggle matSuffix [for]=\"beginDatepicker\" [disabled]=\"filterStateDisable\"></mat-datepicker-toggle>\n  \n        <mat-datepicker\n          panelClass=\"datepicker-year\"\n          #beginDatepicker\n          [startView]=\"calendarView()\"\n          [startAt]=\"beginValue\"\n          (yearSelected)=\"yearSelected($event, beginDatepicker, 'begin')\"\n          >\n        </mat-datepicker>\n\n        <input #beginYear\n          class= \"year-input-hide\"\n          matInput\n          [matDatepicker]=\"beginDatepicker\"\n          enabled= false\n          readonly= true\n          [value]=\"beginValue?beginValue:handleDate(datasource.options.minDate)\"\n          [min]=\"handleDate(datasource.options.minDate)\"\n          [max]=\"(endValue && (!restrictedToStep()))?endValue:handleDate(datasource.options.maxDate)\"\n          >\n      </mat-form-field>\n\n      <mat-form-field  class=\"year-input\">\n        <mat-label>{{'igo.geo.timeFilter.endYear'| translate}}</mat-label>\n        <input\n          matInput\n          class=\"year-input-only-year\"\n          value=\"{{onlyYearEnd}}\"\n          (change)= \"yearOnlyInputChange($event, endDatepicker, 'end')\"\n          [disabled] = \"filterStateDisable\">\n        <mat-datepicker-toggle matSuffix [for]=\"endDatepicker\" [disabled]=\"filterStateDisable\"></mat-datepicker-toggle>\n        <mat-datepicker\n          panelClass=\"datepicker-year\"\n          #endDatepicker\n          [startView]=\"calendarView()\"\n          [startAt]=\"endValue\"\n          (yearSelected)=\"yearSelected($event, endDatepicker, 'end')\"\n          >\n        </mat-datepicker>\n\n        <input #endYear\n          class= \"year-input-hide\"\n          matInput\n          [matDatepicker]=\"endDatepicker\"\n          enabled= false\n          readonly= true\n          [value]=\"endValue?endValue:handleDate(datasource.options.maxDate)\"\n          [min]=\"beginValue?beginValue:handleDate(datasource.options.minDate)\"\n          [max]=\"handleDate(datasource.options.maxDate)\"\n          >\n      </mat-form-field>\n      <button class=\"reset-button\" \n        mat-icon-button\n        color=\"primary\" \n        (click)=\"resetFilter()\" \n        [matTooltip]=\"'igo.geo.filter.resetFilters' | translate\" \n        [disabled]= \"filterStateDisable\">\n        <mat-icon svgIcon=\"{{resetIcon}}\"></mat-icon>\n      </button>\n      <mat-slide-toggle \n        class='toggle-filter-state' \n        (change)=\"toggleFilterState()\" \n        [matTooltip]=\"'igo.geo.filter.toggleFilterState' | translate\" \n        tooltip-position=\"below\" \n        matTooltipShowDelay=\"500\"\n        [checked]=\"!filterStateDisable\">\n      </mat-slide-toggle>\n\n    </div>\n\n    <div class=\"datetime-input-container\" *ngIf=\"calendarType()!=='year'\">\n      <div class=\"datetime-input\">\n        <mat-form-field class=\"date-input\">\n          <mat-datepicker-toggle matSuffix [for]=\"beginDatepicker\" [disabled]= \"filterStateDisable\"></mat-datepicker-toggle>\n          <input #begin\n            matInput\n            [matDatepicker]=\"beginDatepicker\"\n            [placeholder]=\"'igo.geo.timeFilter.startDate' | translate\"\n            [attr.disabled]=\"!currentFilter.active\"\n            (dateChange)=\"changeTemporalProperty(begin.value, 1)\"\n            [matDatepickerFilter]=\"dateFilter.bind(this, 'begin')\"\n            [value]=\"beginValue?beginValue:handleDate(datasource.options.minDate)\"\n            [min]=\"handleDate(datasource.options.minDate)\"\n            [max]=\"(endValue && (!restrictedToStep()))?endValue:handleDate(datasource.options.maxDate)\" \n            [disabled]= \"filterStateDisable\">\n          <span class=\"filler\"></span>\n          <mat-datepicker\n            #beginDatepicker\n            [startView]=\"calendarView()\"\n            [startAt]=\"beginValue\"\n            (yearSelected)=\"yearSelected($event, beginDatepicker, 'begin')\"\n            (monthSelected)=\"monthSelected($event, beginDatepicker, 'begin')\">\n          </mat-datepicker>\n        </mat-form-field>\n\n        <div class=\"time-input\">\n          <mat-form-field class=\"hour-input\" *ngIf=\"calendarType()==='datetime'\">\n            <mat-label>{{'igo.geo.timeFilter.hour' | translate}}</mat-label>\n            <mat-select\n              [formControl]=\"beginHourFormControl\"\n              [attr.disabled]=\"!currentFilter.active\"\n              (selectionChange)=\"changeTemporalProperty(begin.value, 1)\">\n              <mat-option *ngFor=\"let hour of beginHours\" [value]=\"hour\">{{hour}}</mat-option>\n            </mat-select>\n          </mat-form-field>\n          <mat-form-field class=\"minute-input\" *ngIf=\"calendarType()==='datetime'\">\n            <mat-label>{{'igo.geo.timeFilter.minute' | translate}}</mat-label>\n            <mat-select\n              [formControl]=\"beginMinuteFormControl\"\n              [attr.disabled]=\"!currentFilter.active\"\n              (selectionChange)=\"changeTemporalProperty(begin.value, 1)\">\n              <mat-option *ngFor=\"let minute of beginMinutes\" [value]=\"minute\">{{minute}}</mat-option>\n            </mat-select>\n          </mat-form-field>\n        </div>\n      </div>\n\n      <div class=\"datetime-input\" *ngIf=\"!restrictedToStep()\">\n        <mat-form-field class=\"date-input\">\n          <mat-datepicker-toggle matSuffix [for]=\"endDatepicker\" [disabled]= \"filterStateDisable\"></mat-datepicker-toggle>\n            <input #end\n              matInput\n              [matDatepicker]=\"endDatepicker\"\n              [placeholder]=\"'igo.geo.timeFilter.endDate' | translate\"\n              [attr.disabled]=\"!currentFilter.active\"\n              (dateChange)=\"changeTemporalProperty(end.value, 2)\"\n              [matDatepickerFilter]=\"dateFilter.bind(this, 'end')\"\n              [value]=\"endValue?endValue:handleDate(datasource.options.maxDate)\"\n              [min]=\"beginValue?beginValue:handleDate(datasource.options.minDate)\"\n              [max]=\"handleDate(datasource.options.maxDate)\" \n              [disabled]= \"filterStateDisable\">\n            <span class=\"filler\"></span>\n            <mat-datepicker #endDatepicker\n              [startView]=\"calendarView()\"\n              [startAt]=\"endValue\"\n              (yearSelected)=\"yearSelected($event, endDatepicker, 'end')\"\n              (monthSelected)=\"monthSelected($event, endDatepicker, 'end')\">\n          </mat-datepicker>\n        </mat-form-field>\n\n        <div class=\"time-input\">\n          <mat-form-field class=\"hour-input\" *ngIf=\"calendarType()==='datetime'\" >\n            <mat-label>{{'igo.geo.timeFilter.hour' | translate}}</mat-label>\n            <mat-select\n              [formControl]=\"endHourFormControl\"\n              [attr.disabled]=\"!currentFilter.active\"\n              (selectionChange)=\"changeTemporalProperty(end.value, 2)\">\n              <mat-option *ngFor=\"let hour of endHours\" [value]=\"hour\">{{hour}}</mat-option>\n            </mat-select>\n          </mat-form-field>\n          <mat-form-field class=\"minute-input\" *ngIf=\"calendarType()==='datetime'\">\n            <mat-label>{{'igo.geo.timeFilter.minute' | translate}}</mat-label>\n            <mat-select\n              [formControl]=\"endMinuteFormControl\"\n              [attr.disabled]=\"!currentFilter.active\"\n              (selectionChange)=\"changeTemporalProperty(end.value, 2)\">\n              <mat-option *ngFor=\"let minute of endMinutes\" [value]=\"minute\">{{minute}}</mat-option>\n            </mat-select>\n          </mat-form-field>\n        </div>\n      </div>\n\n      <button class=\"reset-button\" \n        mat-icon-button color=\"primary\"\n        (click)=\"resetFilter()\" \n        [matTooltip]=\"'igo.geo.filter.resetFilters' | translate\" \n        [disabled]= \"filterStateDisable\">\n        <mat-icon svgIcon=\"{{resetIcon}}\"></mat-icon>\n      </button>\n      <mat-slide-toggle \n        class=\"toggle-filter-state\" \n        (change)=\"toggleFilterState()\" \n        tooltip-position=\"below\" \n        matTooltipShowDelay=\"500\"\n        [matTooltip]=\"'igo.geo.filter.toggleFilterState' | translate\" \n        [checked]= \"!filterStateDisable\">\n      </mat-slide-toggle>\n    </div>\n  </div>\n</div>\n", styles: ["::ng-deep input{text-align:center!important;margin:auto 5px!important}.slider-container{text-align:center}.datetime-input{display:inline-block;width:100px;margin:10px 0 5px 10px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.datetime-input{width:36%;margin:0}}.date-input{width:100px;margin-right:25px}.time-input{margin-right:25px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.time-input{margin-right:5px}}.hour-input,.minute-input{width:35px;margin-left:7px}.year-input{width:98px;margin:10px 14px 5px 4px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.year-input{width:32%;margin:0 0 0 10px}}.year-input-hide{width:120px;margin-right:25px;display:none}.year-input-only-year{width:120px;margin-right:25px}.reset-button{width:25px;padding-left:8px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.reset-button{padding-left:8px}}.toggle-filter-state{padding-left:20px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.toggle-filter-state{padding-left:12px}}::ng-deep .datepicker-year ::ng-deep .mat-calendar-arrow{display:none}::ng-deep .datepicker-year ::ng-deep .mat-calendar-period-button{pointer-events:none}::ng-deep .datepicker-year ::ng-deep .mat-calendar-body-cell:not(.mat-calendar-body-disabled):hover{background-color:#0000001f;border-radius:999px}\n"] }]
+            args: [{ selector: 'igo-ogc-filter-time', template: "<div class=\"datetime-container\">\n  <mat-slide-toggle \n    *ngIf=\"this.currentFilter.sliderOptions?.enabled\"\n    [(ngModel)]=\"sliderMode\"\n    (change)=\"modeChange($event)\">\n    {{'igo.geo.filter.sliderModeTitle' | translate}}\n  </mat-slide-toggle>\n\n  <div class=\"slider-container\" *ngIf=\"sliderMode\">\n    <igo-ogc-filter-time-slider\n      [begin]=\"beginValue\"\n      [max]=\"this.restrictedToStep() ? this.maxDate : this.endValue\"\n      [currentFilter]=\"currentFilter\" \n      [datasource]=\"datasource\"\n      (changeProperty)=\"changePropertyByPass($event)\"\n    >\n    </igo-ogc-filter-time-slider>\n    \n  </div>\n\n  <div *ngIf=\"!sliderMode\">\n\n    <div class=\"year-input-container\" *ngIf=\"calendarTypeYear\">\n      <!-- to emulate a year-picker, 2 input: first input to show user just year and second input hiden and bind \n        with the datepicker  -->\n      <mat-form-field  class=\"year-input\">\n        <mat-label>{{'igo.geo.timeFilter.startYear'| translate}}</mat-label>\n        <input\n          matInput\n          class=\"year-input-only-year\"\n          value=\"{{onlyYearBegin}}\"\n          (change)= \"yearOnlyInputChange($event, beginDatepicker, 'begin')\"\n          [disabled]= \"filterStateDisable\"\n          >\n        <mat-datepicker-toggle matSuffix [for]=\"beginDatepicker\" [disabled]=\"filterStateDisable\"></mat-datepicker-toggle>\n  \n        <mat-datepicker\n          panelClass=\"datepicker-year\"\n          #beginDatepicker\n          [startView]=\"calendarView()\"\n          [startAt]=\"beginValue\"\n          (yearSelected)=\"yearSelected($event, beginDatepicker, 'begin')\"\n          >\n        </mat-datepicker>\n\n        <input #beginYear\n          class= \"year-input-hide\"\n          matInput\n          [matDatepicker]=\"beginDatepicker\"\n          enabled= false\n          readonly= true\n          [value]=\"beginValue?beginValue:handleDate(datasource.options.minDate)\"\n          [min]=\"handleDate(datasource.options.minDate)\"\n          [max]=\"(endValue && (!restrictedToStep()))?endValue:handleDate(datasource.options.maxDate)\"\n          >\n      </mat-form-field>\n\n      <mat-form-field  class=\"year-input\">\n        <mat-label>{{'igo.geo.timeFilter.endYear'| translate}}</mat-label>\n        <input\n          matInput\n          class=\"year-input-only-year\"\n          value=\"{{onlyYearEnd}}\"\n          (change)= \"yearOnlyInputChange($event, endDatepicker, 'end')\"\n          [disabled] = \"filterStateDisable\">\n        <mat-datepicker-toggle matSuffix [for]=\"endDatepicker\" [disabled]=\"filterStateDisable\"></mat-datepicker-toggle>\n        <mat-datepicker\n          panelClass=\"datepicker-year\"\n          #endDatepicker\n          [startView]=\"calendarView()\"\n          [startAt]=\"endValue\"\n          (yearSelected)=\"yearSelected($event, endDatepicker, 'end')\"\n          >\n        </mat-datepicker>\n\n        <input #endYear\n          class= \"year-input-hide\"\n          matInput\n          [matDatepicker]=\"endDatepicker\"\n          enabled= false\n          readonly= true\n          [value]=\"endValue?endValue:handleDate(datasource.options.maxDate)\"\n          [min]=\"beginValue?beginValue:handleDate(datasource.options.minDate)\"\n          [max]=\"handleDate(datasource.options.maxDate)\"\n          >\n      </mat-form-field>\n      <button class=\"reset-button\" \n        mat-icon-button\n        color=\"primary\" \n        (click)=\"resetFilter()\" \n        [matTooltip]=\"'igo.geo.filter.resetFilters' | translate\" \n        [disabled]= \"filterStateDisable\">\n        <mat-icon svgIcon=\"{{resetIcon}}\"></mat-icon>\n      </button>\n      <mat-slide-toggle \n        class='toggle-filter-state' \n        (change)=\"toggleFilterState()\" \n        [matTooltip]=\"'igo.geo.filter.toggleFilterState' | translate\" \n        tooltip-position=\"below\" \n        matTooltipShowDelay=\"500\"\n        [checked]=\"!filterStateDisable\">\n      </mat-slide-toggle>\n\n    </div>\n\n    <div class=\"datetime-input-container\" *ngIf=\"calendarType()!=='year'\">\n      <div class=\"datetime-input\">\n        <mat-form-field class=\"date-input\">\n          <mat-datepicker-toggle matSuffix [for]=\"beginDatepicker\" [disabled]= \"filterStateDisable\"></mat-datepicker-toggle>\n          <input #begin\n            matInput\n            [matDatepicker]=\"beginDatepicker\"\n            [placeholder]=\"'igo.geo.timeFilter.startDate' | translate\"\n            [attr.disabled]=\"!currentFilter.active\"\n            (dateChange)=\"changeTemporalProperty(begin.value, 1)\"\n            [matDatepickerFilter]=\"filterBeginFunction\"\n            [value]=\"beginValue?beginValue:handleDate(datasource.options.minDate)\"\n            [min]=\"handleDate(datasource.options.minDate)\"\n            [max]=\"(endValue && (!restrictedToStep()))?endValue:handleDate(datasource.options.maxDate)\" \n            [disabled]= \"filterStateDisable\">\n          <span class=\"filler\"></span>\n          <mat-datepicker\n            #beginDatepicker\n            [startView]=\"calendarView()\"\n            [startAt]=\"beginValue\"\n            (yearSelected)=\"yearSelected($event, beginDatepicker, 'begin')\"\n            (monthSelected)=\"monthSelected($event, beginDatepicker, 'begin')\">\n          </mat-datepicker>\n        </mat-form-field>\n\n        <div class=\"time-input\">\n          <mat-form-field class=\"hour-input\" *ngIf=\"calendarType()==='datetime'\">\n            <mat-label>{{'igo.geo.timeFilter.hour' | translate}}</mat-label>\n            <mat-select\n              [formControl]=\"beginHourFormControl\"\n              [attr.disabled]=\"!currentFilter.active\"\n              (selectionChange)=\"changeTemporalProperty(begin.value, 1)\">\n              <mat-option *ngFor=\"let hour of beginHours\" [value]=\"hour\">{{hour}}</mat-option>\n            </mat-select>\n          </mat-form-field>\n          <mat-form-field class=\"minute-input\" *ngIf=\"calendarType()==='datetime'\">\n            <mat-label>{{'igo.geo.timeFilter.minute' | translate}}</mat-label>\n            <mat-select\n              [formControl]=\"beginMinuteFormControl\"\n              [attr.disabled]=\"!currentFilter.active\"\n              (selectionChange)=\"changeTemporalProperty(begin.value, 1)\">\n              <mat-option *ngFor=\"let minute of beginMinutes\" [value]=\"minute\">{{minute}}</mat-option>\n            </mat-select>\n          </mat-form-field>\n        </div>\n      </div>\n\n      <div class=\"datetime-input\" *ngIf=\"!restrictedToStep()\">\n        <mat-form-field class=\"date-input\">\n          <mat-datepicker-toggle matSuffix [for]=\"endDatepicker\" [disabled]= \"filterStateDisable\"></mat-datepicker-toggle>\n            <input #end\n              matInput\n              [matDatepicker]=\"endDatepicker\"\n              [placeholder]=\"'igo.geo.timeFilter.endDate' | translate\"\n              [attr.disabled]=\"!currentFilter.active\"\n              (dateChange)=\"changeTemporalProperty(end.value, 2)\"\n              [matDatepickerFilter]=\"filterEndFunction\"\n              [value]=\"endValue?endValue:handleDate(datasource.options.maxDate)\"\n              [min]=\"beginValue?beginValue:handleDate(datasource.options.minDate)\"\n              [max]=\"handleDate(datasource.options.maxDate)\" \n              [disabled]= \"filterStateDisable\">\n            <span class=\"filler\"></span>\n            <mat-datepicker #endDatepicker\n              [startView]=\"calendarView()\"\n              [startAt]=\"endValue\"\n              (yearSelected)=\"yearSelected($event, endDatepicker, 'end')\"\n              (monthSelected)=\"monthSelected($event, endDatepicker, 'end')\">\n          </mat-datepicker>\n        </mat-form-field>\n\n        <div class=\"time-input\">\n          <mat-form-field class=\"hour-input\" *ngIf=\"calendarType()==='datetime'\" >\n            <mat-label>{{'igo.geo.timeFilter.hour' | translate}}</mat-label>\n            <mat-select\n              [formControl]=\"endHourFormControl\"\n              [attr.disabled]=\"!currentFilter.active\"\n              (selectionChange)=\"changeTemporalProperty(end.value, 2)\">\n              <mat-option *ngFor=\"let hour of endHours\" [value]=\"hour\">{{hour}}</mat-option>\n            </mat-select>\n          </mat-form-field>\n          <mat-form-field class=\"minute-input\" *ngIf=\"calendarType()==='datetime'\">\n            <mat-label>{{'igo.geo.timeFilter.minute' | translate}}</mat-label>\n            <mat-select\n              [formControl]=\"endMinuteFormControl\"\n              [attr.disabled]=\"!currentFilter.active\"\n              (selectionChange)=\"changeTemporalProperty(end.value, 2)\">\n              <mat-option *ngFor=\"let minute of endMinutes\" [value]=\"minute\">{{minute}}</mat-option>\n            </mat-select>\n          </mat-form-field>\n        </div>\n      </div>\n\n      <button class=\"reset-button\" \n        mat-icon-button color=\"primary\"\n        (click)=\"resetFilter()\" \n        [matTooltip]=\"'igo.geo.filter.resetFilters' | translate\" \n        [disabled]= \"filterStateDisable\">\n        <mat-icon svgIcon=\"{{resetIcon}}\"></mat-icon>\n      </button>\n      <mat-slide-toggle \n        class=\"toggle-filter-state\" \n        (change)=\"toggleFilterState()\" \n        tooltip-position=\"below\" \n        matTooltipShowDelay=\"500\"\n        [matTooltip]=\"'igo.geo.filter.toggleFilterState' | translate\" \n        [checked]= \"!filterStateDisable\">\n      </mat-slide-toggle>\n    </div>\n  </div>\n</div>\n", styles: ["::ng-deep input{text-align:center!important;margin:auto 5px!important}.slider-container{text-align:center}.datetime-input{display:inline-block;width:100px;margin:10px 0 5px 10px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.datetime-input{width:36%;margin:0}}.date-input{width:100px;margin-right:25px}.time-input{margin-right:25px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.time-input{margin-right:5px}}.hour-input,.minute-input{width:35px;margin-left:7px}.year-input{width:98px;margin:10px 14px 5px 4px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.year-input{width:32%;margin:0 0 0 10px}}.year-input-hide{width:120px;margin-right:25px;display:none}.year-input-only-year{width:120px;margin-right:25px}.reset-button{width:25px;padding-left:8px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.reset-button{padding-left:8px}}.toggle-filter-state{padding-left:20px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.toggle-filter-state{padding-left:12px}}::ng-deep .datepicker-year ::ng-deep .mat-calendar-arrow{display:none}::ng-deep .datepicker-year ::ng-deep .mat-calendar-period-button{pointer-events:none}::ng-deep .datepicker-year ::ng-deep .mat-calendar-body-cell:not(.mat-calendar-body-disabled):hover{background-color:#0000001f;border-radius:999px}\n"] }]
         }], function () { return [{ type: OGCFilterTimeService }]; }, { datasource: [{
                 type: Input
             }], currentFilter: [{
@@ -30574,15 +31495,15 @@ IgoFilterModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [TimeFi
 i0.ɵɵsetComponentScope(TimeFilterButtonComponent, [i1$1.NgIf, i2.MatIcon, i3.MatButton, i4.MatTooltip, i5$1.ListItemDirective, i7$1.MatBadge, TimeFilterItemComponent], [i7.TranslatePipe]);
 i0.ɵɵsetComponentScope(TimeFilterItemComponent, [i1$1.NgClass, i1$1.NgIf, i1$1.NgStyle, i2.MatIcon, i3.MatButton, i5.MatListItem, i5.MatListAvatarCssMatStyler, i9.MatLine, i4.MatTooltip, LayerLegendComponent, i5$1.CollapseDirective, TimeFilterFormComponent], [i1$1.AsyncPipe, i7.TranslatePipe]);
 i0.ɵɵsetComponentScope(TimeFilterListComponent, [i1$1.NgForOf, i5$1.ListItemDirective, i5$1.ListComponent, TimeFilterItemComponent], [FilterableDataSourcePipe]);
-i0.ɵɵsetComponentScope(OgcFilterFormComponent, [i1$1.NgClass, i1$1.NgForOf, i1$1.NgIf, i11$1.MatAutocomplete, i11$1.MatAutocompleteTrigger, i9.MatOption, i2.MatIcon, i3.MatButton, i12$1.MatCheckbox, i13.MatFormField, i13.MatSuffix, i14.MatInput, i15.MatSelect, i4.MatTooltip, OgcFilterTimeComponent], [i1$1.AsyncPipe, i7.TranslatePipe, i5$1.KeyValuePipe]);
+i0.ɵɵsetComponentScope(OgcFilterFormComponent, [i1$1.NgClass, i1$1.NgForOf, i1$1.NgIf, i11$1.MatAutocomplete, i11$1.MatAutocompleteTrigger, i9.MatOption, i2.MatIcon, i3.MatButton, i12.MatCheckbox, i13.MatFormField, i13.MatSuffix, i14.MatInput, i15.MatSelect, i4.MatTooltip, OgcFilterTimeComponent], [i1$1.AsyncPipe, i7.TranslatePipe, i5$1.KeyValuePipe]);
 i0.ɵɵsetComponentScope(OgcFilterButtonComponent, [i1$1.NgIf, i2.MatIcon, i3.MatButton, i4.MatTooltip, i5$1.ListItemDirective, i7$1.MatBadge, OgcFilterableItemComponent], [i7.TranslatePipe]);
-i0.ɵɵsetComponentScope(OgcFilterSelectionComponent, [i1$1.NgForOf, i1$1.NgIf, i1$1.NgStyle, i2$2.ɵNgNoValidate, i2$2.DefaultValueAccessor, i2$2.NgControlStatus, i2$2.NgControlStatusGroup, i2$2.NgModel, i2$2.FormGroupDirective, i2$2.FormControlName, i11$1.MatAutocomplete, i11$1.MatAutocompleteTrigger, i9.MatOption, i2.MatIcon, i17.MatRadioGroup, i17.MatRadioButton, i18.MatButtonToggleGroup, i18.MatButtonToggle, i12$1.MatCheckbox, i13.MatFormField, i14.MatInput, i15.MatSelect, i11.MatDivider, i4.MatTooltip, OgcFilterTimeComponent], [i1$1.AsyncPipe, i7.TranslatePipe]);
+i0.ɵɵsetComponentScope(OgcFilterSelectionComponent, [i1$1.NgForOf, i1$1.NgIf, i1$1.NgStyle, i2$2.ɵNgNoValidate, i2$2.DefaultValueAccessor, i2$2.NgControlStatus, i2$2.NgControlStatusGroup, i2$2.NgModel, i2$2.FormGroupDirective, i2$2.FormControlName, i11$1.MatAutocomplete, i11$1.MatAutocompleteTrigger, i9.MatOption, i2.MatIcon, i17.MatRadioGroup, i17.MatRadioButton, i18.MatButtonToggleGroup, i18.MatButtonToggle, i12.MatCheckbox, i13.MatFormField, i14.MatInput, i15.MatSelect, i11.MatDivider, i4.MatTooltip, OgcFilterTimeComponent], [i1$1.AsyncPipe, i7.TranslatePipe]);
 i0.ɵɵsetComponentScope(OgcFilterableFormComponent, [i1$1.NgForOf, i1$1.NgIf, i5$1.ListItemDirective, OgcFilterFormComponent,
     OgcFilterSelectionComponent], []);
-i0.ɵɵsetComponentScope(OgcFilterableItemComponent, [i1$1.NgClass, i1$1.NgIf, i1$1.NgStyle, i2$2.NgControlStatus, i2$2.NgModel, i2.MatIcon, i3.MatButton, i12$1.MatCheckbox, i5.MatListItem, i5.MatListAvatarCssMatStyler, i9.MatLine, i11.MatDivider, i4.MatTooltip, LayerLegendComponent, i5$1.CollapseDirective, OgcFilterableFormComponent], [i1$1.AsyncPipe, i7.TranslatePipe]);
+i0.ɵɵsetComponentScope(OgcFilterableItemComponent, [i1$1.NgClass, i1$1.NgIf, i1$1.NgStyle, i2$2.NgControlStatus, i2$2.NgModel, i2.MatIcon, i3.MatButton, i12.MatCheckbox, i5.MatListItem, i5.MatListAvatarCssMatStyler, i9.MatLine, i11.MatDivider, i4.MatTooltip, LayerLegendComponent, i5$1.CollapseDirective, OgcFilterableFormComponent], [i1$1.AsyncPipe, i7.TranslatePipe]);
 i0.ɵɵsetComponentScope(OgcFilterableListComponent, [i1$1.NgForOf, i1$1.NgIf, i5$1.ListItemDirective, i5$1.ListComponent, OgcFilterableItemComponent], [i7.TranslatePipe, FilterableDataSourcePipe]);
 i0.ɵɵsetComponentScope(SpatialFilterTypeComponent, [i1$1.NgForOf, i9.MatOption, i2.MatIcon, i20.MatTabGroup, i20.MatTab, i18.MatButtonToggleGroup, i18.MatButtonToggle, i13.MatFormField, i13.MatLabel, i15.MatSelect, i4.MatTooltip, SpatialFilterListComponent], [i7.TranslatePipe]);
-i0.ɵɵsetComponentScope(SpatialFilterItemComponent, [i1$1.NgForOf, i1$1.NgIf, i2$2.ɵNgNoValidate, i2$2.DefaultValueAccessor, i2$2.NumberValueAccessor, i2$2.NgControlStatus, i2$2.NgControlStatusGroup, i2$2.NgForm, i2$2.FormControlDirective, i9.MatOption, i2.MatIcon, i3.MatButton, i17.MatRadioGroup, i17.MatRadioButton, i21.MatTable, i21.MatHeaderCellDef, i21.MatHeaderRowDef, i21.MatColumnDef, i21.MatRowDef, i21.MatHeaderCell, i21.MatHeaderRow, i21.MatRow, i22.MatNestedTreeNode, i22.MatTreeNodeDef, i22.MatTreeNodeToggle, i22.MatTree, i22.MatTreeNode, i22.MatTreeNodeOutlet, i12$1.MatCheckbox, i23.MatSlideToggle, i13.MatFormField, i13.MatLabel, i14.MatInput, i15.MatSelect, i4.MatTooltip, i5$1.EntityTableComponent, GeometryFormFieldInputComponent], [i1$1.AsyncPipe, i7.TranslatePipe]);
+i0.ɵɵsetComponentScope(SpatialFilterItemComponent, [i1$1.NgForOf, i1$1.NgIf, i2$2.ɵNgNoValidate, i2$2.DefaultValueAccessor, i2$2.NumberValueAccessor, i2$2.NgControlStatus, i2$2.NgControlStatusGroup, i2$2.NgForm, i2$2.FormControlDirective, i9.MatOption, i2.MatIcon, i3.MatButton, i17.MatRadioGroup, i17.MatRadioButton, i21.MatTable, i21.MatHeaderCellDef, i21.MatHeaderRowDef, i21.MatColumnDef, i21.MatRowDef, i21.MatHeaderCell, i21.MatHeaderRow, i21.MatRow, i22.MatNestedTreeNode, i22.MatTreeNodeDef, i22.MatTreeNodeToggle, i22.MatTree, i22.MatTreeNode, i22.MatTreeNodeOutlet, i12.MatCheckbox, i23.MatSlideToggle, i13.MatFormField, i13.MatLabel, i14.MatInput, i15.MatSelect, i4.MatTooltip, i5$1.EntityTableComponent, GeometryFormFieldInputComponent], [i1$1.AsyncPipe, i7.TranslatePipe]);
 i0.ɵɵsetComponentScope(OgcFilterTimeComponent, [i1$1.NgForOf, i1$1.NgIf, i2$2.NgControlStatus, i2$2.NgModel, i2$2.FormControlDirective, i9.MatOption, i2.MatIcon, i3.MatButton, i23.MatSlideToggle, i13.MatFormField, i13.MatLabel, i13.MatSuffix, i14.MatInput, i15.MatSelect, i4.MatTooltip, i25.MatDatepicker, i25.MatDatepickerInput, i25.MatDatepickerToggle, OgcFilterTimeSliderComponent], [i7.TranslatePipe]);
 
 function ExportButtonComponent_button_0_Template(rf, ctx) {
@@ -30856,7 +31777,7 @@ class ExportService {
             outputName = `${title}.csv`;
         }
         outputName = outputName.replace(' ', '_');
-        outputName = outputName.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
+        outputName = outputName.normalize('NFD').replace(/[\u0300-\u036f]/g, '').replace(/’/g, "'");
         outputNameField.setAttribute('type', 'hidden');
         outputNameField.setAttribute('name', 'outputName');
         outputNameField.setAttribute('value', outputName);
@@ -31178,21 +32099,34 @@ class ImportService {
     constructor(http, config) {
         this.http = http;
         this.config = config;
-        this.ogreUrl = this.config.getConfig('importExport.url');
-        const configFileSizeMb = this.config.getConfig('importExport.clientSideFileSizeMaxMb');
+        const importConfig = this.config.getConfig('importExport');
+        this.ogreUrl = importConfig.url;
+        const configFileSizeMb = importConfig.clientSideFileSizeMaxMb;
         this.clientSideFileSizeMax = (configFileSizeMb ? configFileSizeMb : 30) * Math.pow(1024, 2);
+        if (importConfig.formats) {
+            ImportService.allowedExtensions = importConfig.formats
+                .map(format => ImportService.formatExtensionAssociation[format])
+                .filter(e => e);
+            if (ImportService.allowedExtensions.includes('geojson')) {
+                ImportService.allowedExtensions.push('json');
+            }
+        }
     }
     import(file, projectionIn = 'EPSG:4326', projectionOut = 'EPSG:4326') {
         return this.importAsync(file, projectionIn, projectionOut);
     }
     getFileImporter(file) {
         const extension = getFileExtension(file);
+        const allowedExtensions = ImportService.allowedExtensions;
+        let zipMimeTypes = [];
+        if (allowedExtensions.includes('zip')) {
+            zipMimeTypes = ImportService.allowedZipMimeTypes;
+        }
         const mimeType = file.type;
         const allowedMimeTypes = [
             ...ImportService.allowedMimeTypes,
-            ...ImportService.allowedZipMimeTypes
+            ...zipMimeTypes
         ];
-        const allowedExtensions = ImportService.allowedExtensions;
         if (allowedMimeTypes.indexOf(mimeType) < 0 &&
             allowedExtensions.indexOf(extension) < 0) {
             return undefined;
@@ -31338,6 +32272,13 @@ class ImportService {
         return features;
     }
 }
+ImportService.formatExtensionAssociation = {
+    GeoJSON: 'geojson',
+    GML: 'gml',
+    GPX: 'gpx',
+    KML: 'kml',
+    Shapefile: 'zip'
+};
 ImportService.allowedMimeTypes = [
     'application/gml+xml',
     'application/vnd.google-earth.kml+xml',
@@ -31349,7 +32290,7 @@ ImportService.allowedZipMimeTypes = [
     'application/x-zip-compressed',
     'application/x-zip'
 ];
-ImportService.allowedExtensions = ['geojson', 'kml', 'gpx', 'json', 'gml'];
+ImportService.allowedExtensions = ['geojson', 'kml', 'gpx', 'json', 'gml', 'zip'];
 ImportService.ɵfac = function ImportService_Factory(t) { return new (t || ImportService)(i0.ɵɵinject(i1$2.HttpClient), i0.ɵɵinject(i2$1.ConfigService)); };
 ImportService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: ImportService, factory: ImportService.ɵfac, providedIn: 'root' });
 (function () {
@@ -33336,6 +34277,64 @@ IgoOverlayModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({});
 })();
 (function () { (typeof ngJitMode === "undefined" || ngJitMode) && i0.ɵɵsetNgModuleScope(IgoOverlayModule, { declarations: [OverlayDirective], exports: [OverlayDirective] }); })();
 
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016-2017 Dan "Ducky" Little
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+function jsGeoPdfPlugin(jsPDFAPI) {
+    const setGeoArea = function (pdfExt, geoExt) {
+        const bbox = pdfExt.join(' ');
+        // the ordering may seem odd here but PDF
+        //  flips the Y axis upside down and this accounts for that
+        //  change.
+        const minx = geoExt[0];
+        const maxx = geoExt[2];
+        const maxy = geoExt[1];
+        const miny = geoExt[3];
+        const bounds = [miny, minx, maxy, minx, maxy, maxx, miny, maxx].join(' ');
+        const bbox_obj = this.internal.newAdditionalObject();
+        const bounds_obj = this.internal.newAdditionalObject();
+        const proj_obj = this.internal.newAdditionalObject();
+        proj_obj.content = '<< /EPSG 3857 /Type /PROJCS /WKT (PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere"' +
+            ',GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0]' +
+            ',UNIT["Degree",0.017453292519943295]],PROJECTION["Mercator_Auxiliary_Sphere"],PARAMETER["False_Easting",0.0]' +
+            ',PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",0.0],PARAMETER["Standard_Parallel_1",0.0]' +
+            ',PARAMETER["Auxiliary_Sphere_Type",0.0],UNIT["Meter",1.0]]) >>';
+        bounds_obj.content = '<< /Bounds [ 0 1 0 0 1 0 1 1 ] /GCS ' +
+            proj_obj.objId + ' 0 R /GPTS [ ' + bounds + ' ] /LPTS [ 0 1 0 0 1 0 1 1 ] /Subtype /GEO /Type /Measure >>';
+        bbox_obj.content = '<< /BBox [ ' + bbox + ' ] /Measure ' + bounds_obj.objId + ' 0 R /Name (Layer) /Type /Viewport >>';
+        const title_obj = this.internal.newAdditionalObject();
+        const date = new Date().toLocaleDateString('en-CA');
+        title_obj.content = '<< /Name IGO2 /Type /OCG /Date ' + date + ' >>';
+        return bbox_obj.objId;
+    };
+    jsPDFAPI.setGeoArea = function (pdfExt, geoExt) {
+        this.internal.events.subscribe('putPage', function () {
+            const bbox_id = setGeoArea.call(this, pdfExt, geoExt);
+            this.internal.write('/VP [ ' + bbox_id + ' 0 R ]');
+        });
+    };
+}
+
 class PrintService {
     constructor(http, messageService, activityService, languageService, configService) {
         this.http = http;
@@ -33343,6 +34342,15 @@ class PrintService {
         this.activityService = activityService;
         this.languageService = languageService;
         this.configService = configService;
+        this.TEXTPDFFONT = {
+            titleFont: 'Times',
+            titleFontStyle: 'bold',
+            subtitleFont: 'Times',
+            subtitleFontStyle: 'bold',
+            commentFont: 'courier',
+            commentFontStyle: 'normal',
+            commentFontSize: 16
+        };
     }
     print(map, options) {
         const status$ = new Subject();
@@ -33351,9 +34359,11 @@ class PrintService {
         const orientation = options.orientation;
         const legendPostion = options.legendPosition;
         this.activityId = this.activityService.register();
-        const doc = new jspdf({
+        jsGeoPdfPlugin(jsPDF.API);
+        const doc = new jsPDF({
             orientation,
-            format: paperFormat.toLowerCase()
+            format: paperFormat.toLowerCase(),
+            unit: 'mm' // default
         });
         const dimensions = [
             doc.internal.pageSize.width,
@@ -33363,17 +34373,21 @@ class PrintService {
         const width = dimensions[0] - margins[3] - margins[1];
         const height = dimensions[1] - margins[0] - margins[2];
         const size = [width, height];
-        let titleSizeResults = [0, 0];
+        let titleSizes;
+        let subtitleSizes;
+        // PDF title
         if (options.title !== undefined) {
-            titleSizeResults = this.getTitleSize(options.title, width, height, doc); // return : size(pt) and left margin (mm)
-            this.addTitle(doc, options.title, titleSizeResults[0], margins[3] + titleSizeResults[1], titleSizeResults[0] * (25.4 / 72));
+            const fontSizeInPt = Math.round(2 * (height + 145) * 0.05) / 2; //calculate the fontSize title from the page height.
+            titleSizes = this.getTextPdfObjectSizeAndMarg(options.title, margins, this.TEXTPDFFONT.titleFont, fontSizeInPt, this.TEXTPDFFONT.titleFontStyle, doc);
+            this.addTextInPdfDoc(doc, options.title, this.TEXTPDFFONT.titleFont, this.TEXTPDFFONT.titleFontStyle, titleSizes.fontSize, titleSizes.marginLeft + margins[3], margins[0]);
+            margins[0] = titleSizes.height + margins[0]; // cumulative margin top for next elem to place in pdf doc
         }
+        // PDF subtitle
         if (options.subtitle !== undefined) {
-            let subtitleSizeResult = 0;
-            const titleH = titleSizeResults[0];
-            subtitleSizeResult = this.getSubTitleSize(options.subtitle, width, height, doc); // return : size(pt) and left margin (mm)
-            this.addSubTitle(doc, options.subtitle, titleH * 0.7, margins[3] + subtitleSizeResult, titleH * 1.7 * (25.4 / 72));
-            margins[0] = margins[0] + titleSizeResults[0] * 0.7 * (25.4 / 72);
+            subtitleSizes = this.getTextPdfObjectSizeAndMarg(options.subtitle, margins, this.TEXTPDFFONT.subtitleFont, titleSizes.fontSize * 0.7, // 70% size of title
+            this.TEXTPDFFONT.subtitleFontStyle, doc);
+            this.addTextInPdfDoc(doc, options.subtitle, this.TEXTPDFFONT.subtitleFont, this.TEXTPDFFONT.subtitleFontStyle, subtitleSizes.fontSize, subtitleSizes.marginLeft + margins[3], margins[0]);
+            margins[0] += 5; // cumulative marg top for next elem to place in pdf doc. 5 is a fix it could be adjust
         }
         if (options.showProjection === true || options.showScale === true) {
             this.addProjScale(doc, map, resolution, options.showProjection, options.showScale);
@@ -33385,6 +34399,10 @@ class PrintService {
             if (status === SubjectStatus.Done) {
                 yield this.addScale(doc, map, margins);
                 yield this.handleMeasureLayer(doc, map, margins);
+                const width = this.imgSizeAdded[0];
+                const height = this.imgSizeAdded[1];
+                const res = 1;
+                this.addGeoRef(doc, map, width, height, res, margins);
                 if (options.legendPosition !== 'none') {
                     if (['topleft', 'topright', 'bottomleft', 'bottomright'].indexOf(options.legendPosition) > -1) {
                         yield this.addLegendSamePage(doc, map, margins, resolution, options.legendPosition);
@@ -33404,6 +34422,20 @@ class PrintService {
         }));
         return status$;
     }
+    // ref GeoMoose https://github.com/geomoose/gm3/tree/main/src/gm3/components/print
+    addGeoRef(doc, map, width, height, resolution, margins) {
+        const unit = 'mm';
+        const docHeight = doc.internal.pageSize.getHeight();
+        // x,y = margin left-bottom corner for img in pdf doc
+        const x = margins[3];
+        const y = docHeight - margins[0] - height;
+        let pdf_extents = [x, y, x + width, y + height];
+        for (let i = 0; i < pdf_extents.length; i++) {
+            pdf_extents[i] = this.pdf_units2points(pdf_extents[i], unit);
+        }
+        const mapExtent = map.viewController.getExtent('EPSG:3857');
+        doc.setGeoArea(pdf_extents, mapExtent);
+    }
     /**
      * Add measure overlay on the map on the document when the measure layer is present
      * @param  doc - Pdf document where measure tooltip will be added
@@ -33527,66 +34559,46 @@ class PrintService {
             return status$;
         });
     }
-    getTitleSize(title, pageWidth, pageHeight, doc) {
+    getTextPdfObjectSizeAndMarg(text, margins, font, fontSizeInPt, fontStyle, doc) {
         const pdfResolution = 96;
-        const titleSize = Math.round(2 * (pageHeight + 145) * 0.05) / 2;
-        doc.setFont('Times', 'bold');
-        const width = doc.getTextWidth(title);
-        const titleWidth = doc.getStringUnitWidth(title) * titleSize / doc.internal.scaleFactor;
-        const titleTailleMinimale = Math.round(2 * (pageHeight + 150) * 0.037) / 2;
-        let titleFontSize = 0;
-        let titleMarginLeft;
-        if (titleWidth >= (pageWidth)) {
-            titleMarginLeft = 0;
-            titleFontSize = Math.round(((pageWidth / title.length) * pdfResolution) / 25.4);
-            // If the formula to find the font size gives below the defined minimum size
-            if (titleFontSize < titleTailleMinimale) {
-                titleFontSize = titleTailleMinimale;
-            }
-        }
-        else {
-            titleMarginLeft = (pageWidth - titleWidth) / 2;
-            titleFontSize = titleSize;
-        }
-        return [titleFontSize, titleMarginLeft];
-    }
-    getSubTitleSize(subtitle, pageWidth, pageHeight, doc) {
-        const subtitleSize = 0.7 * Math.round(2 * (pageHeight + 145) * 0.05) / 2; // 70% of the title's font size
-        doc.setFont('Times', 'bold');
-        const subtitleWidth = doc.getStringUnitWidth(subtitle) * subtitleSize / doc.internal.scaleFactor;
-        let subtitleMarginLeft;
-        if (subtitleWidth >= (pageWidth)) {
-            subtitleMarginLeft = 0;
+        const docWidth = doc.internal.pageSize.getWidth();
+        const pageWidth = docWidth - margins[1] - margins[3];
+        // important to set it first, the textDimension change when font change!
+        doc.setFont(font, fontStyle);
+        doc.setFontSize(fontSizeInPt);
+        let textDimensions = doc.getTextDimensions(text);
+        let textMarginLeft;
+        if (textDimensions.w > pageWidth) {
+            // if the text is to long, reduce fontSize 70% and the overflow with be cut in print...
+            textMarginLeft = 0;
+            fontSizeInPt = fontSizeInPt * 0.7;
+            doc.setFontSize(fontSizeInPt);
+            textDimensions = doc.getTextDimensions(text);
         }
         else {
-            subtitleMarginLeft = (pageWidth - subtitleWidth) / 2;
+            textMarginLeft = (pageWidth - textDimensions.w) / 2;
         }
-        return subtitleMarginLeft;
-    }
-    addTitle(doc, title, titleFontSize, titleMarginLeft, titleMarginTop) {
-        doc.setFont('Times', 'bold');
-        doc.setFontSize(titleFontSize);
-        doc.text(title, titleMarginLeft, titleMarginTop);
-    }
-    addSubTitle(doc, subtitle, subtitleFontSize, subtitleMarginLeft, subtitleMarginTop) {
-        doc.setFont('Times', 'bold');
-        doc.setFontSize(subtitleFontSize);
-        doc.text(subtitle, subtitleMarginLeft, subtitleMarginTop);
+        return {
+            'fontSize': fontSizeInPt,
+            'marginLeft': textMarginLeft,
+            'height': textDimensions.h
+        };
     }
     /**
      * Add comment to the document
      * * @param  doc - pdf document
      * * @param  comment - Comment to add in the document
-     * * @param  size - Size of the document
      */
     addComment(doc, comment) {
-        const commentSize = 16;
-        const commentMarginLeft = 20;
-        const marginBottom = 5;
-        const heightPixels = doc.internal.pageSize.height - marginBottom;
-        doc.setFont('courier');
-        doc.setFontSize(commentSize);
-        doc.text(comment, commentMarginLeft, heightPixels);
+        const commentMarginLeft = 20; //margin left and bottom is fix
+        const commentMarginBottom = 5;
+        const marginTop = doc.internal.pageSize.height - commentMarginBottom;
+        this.addTextInPdfDoc(doc, comment, this.TEXTPDFFONT.commentFont, this.TEXTPDFFONT.commentFontStyle, this.TEXTPDFFONT.commentFontSize, commentMarginLeft, marginTop);
+    }
+    addTextInPdfDoc(doc, textToAdd, textFont, textFontStyle, textFontSize, textMarginLeft, textMarginTop) {
+        doc.setFont(textFont, textFontStyle);
+        doc.setFontSize(textFontSize);
+        doc.text(textToAdd, textMarginLeft, textMarginTop);
     }
     /**
      * Add projection and/or scale to the document
@@ -33764,9 +34776,14 @@ class PrintService {
             image = canvas.toDataURL('image/png');
         }
         if (image !== undefined) {
+            if (image.length < 20) { //  img is corrupt    todo: fix addScale in mobile make a corrupt img
+                console.log('Warning: An image cannot be print in pdf file');
+                return;
+            }
             const imageSize = this.getImageSizeToFitPdf(doc, canvas, margins);
             doc.addImage(image, 'PNG', margins[3], margins[0], imageSize[0], imageSize[1]);
             doc.rect(margins[3], margins[0], imageSize[0], imageSize[1]);
+            this.imgSizeAdded = imageSize; // keep img size for georef later
         }
     }
     // TODO fix printing with image resolution
@@ -34001,7 +35018,7 @@ class PrintService {
      */
     saveDoc(doc) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield doc.save('map.pdf', { returnPromise: true });
+            yield doc.save('map_georef.pdf', { returnPromise: true });
         });
     }
     /**
@@ -34014,8 +35031,8 @@ class PrintService {
         // Define variable to calculate best size to fit in one page
         const pageHeight = doc.internal.pageSize.getHeight() - (margins[0] + margins[2]);
         const pageWidth = doc.internal.pageSize.getWidth() - (margins[1] + margins[3]);
-        const canHeight = canvas.height;
-        const canWidth = canvas.width;
+        const canHeight = this.pdf_units2points(canvas.height, 'mm');
+        const canWidth = this.pdf_units2points(canvas.width, 'mm');
         const heightRatio = canHeight / pageHeight;
         const widthRatio = canWidth / pageWidth;
         const maxRatio = heightRatio > widthRatio ? heightRatio : widthRatio;
@@ -34131,6 +35148,41 @@ class PrintService {
             delete that.zipFile;
         });
     }
+    pdf_units2points(n, unit) {
+        let k = 1;
+        // this code is borrowed from jsPDF
+        //  as it does not expose a public API
+        //  for converting units to points.
+        switch (unit) {
+            case 'pt':
+                k = 1;
+                break;
+            case 'mm':
+                k = 72 / 25.4;
+                break;
+            case 'cm':
+                k = 72 / 2.54;
+                break;
+            case 'in':
+                k = 72;
+                break;
+            case 'px':
+                k = 96 / 72;
+                break;
+            case 'pc':
+                k = 12;
+                break;
+            case 'em':
+                k = 12;
+                break;
+            case 'ex':
+                k = 6;
+                break;
+            default:
+                throw new Error('Invalid unit: ' + unit);
+        }
+        return n * k;
+    }
 }
 PrintService.ɵfac = function PrintService_Factory(t) { return new (t || PrintService)(i0.ɵɵinject(i1$2.HttpClient), i0.ɵɵinject(i2$1.MessageService), i0.ɵɵinject(i2$1.ActivityService), i0.ɵɵinject(i2$1.LanguageService), i0.ɵɵinject(i2$1.ConfigService)); };
 PrintService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: PrintService, factory: PrintService.ɵfac, providedIn: 'root' });
@@ -35714,6 +36766,7 @@ function featureToSearchResult(feature, source) {
         delete feature.properties.SHAPE_P;
         delete feature.properties.the_geom;
         delete feature.properties.geom;
+        delete feature.properties.geom32198;
     }
     feature.sourceId = source.getId();
     return {
@@ -36854,6 +37907,30 @@ class IChercheSearchSource extends SearchSource {
                             enabled: types.indexOf('anciennes-adresses') !== -1,
                             hashtags: ['anciennes-adresses']
                         },
+                        {
+                            title: 'igo.geo.search.icherche.type.oldCity',
+                            value: 'anciennes-municipalites',
+                            enabled: types.indexOf('anciennes-municipalites') !== -1,
+                            hashtags: ['anciennes-municipalites']
+                        },
+                        {
+                            title: 'igo.geo.search.icherche.type.cn',
+                            value: 'bornes-cn',
+                            enabled: types.indexOf('bornes-cn') !== -1,
+                            hashtags: ['borne', 'bornes', 'cn']
+                        },
+                        {
+                            title: 'igo.geo.search.icherche.type.sumi',
+                            value: 'bornes-sumi',
+                            enabled: types.indexOf('bornes-sumi') !== -1,
+                            hashtags: ['borne', 'bornes', 'sumi']
+                        },
+                        {
+                            title: 'igo.geo.search.icherche.type.cadastre',
+                            value: 'cadastre',
+                            enabled: types.indexOf('cadastre') !== -1,
+                            hashtags: ['cadastre']
+                        },
                         {
                             title: 'igo.geo.search.icherche.type.postalCode',
                             value: 'codes-postaux',
@@ -36861,10 +37938,29 @@ class IChercheSearchSource extends SearchSource {
                             hashtags: ['code-postal']
                         },
                         {
-                            title: 'igo.geo.search.icherche.type.road',
-                            value: 'routes',
-                            enabled: types.indexOf('routes') !== -1,
-                            hashtags: ['route']
+                            title: 'igo.geo.search.icherche.type.entreprise',
+                            value: 'entreprises',
+                            enabled: types.indexOf('entreprises') !== -1,
+                            available: false,
+                            hashtags: ['entreprise']
+                        },
+                        {
+                            title: 'igo.geo.search.icherche.type.cycleStop',
+                            value: 'haltes_cyclables',
+                            enabled: types.indexOf('haltes_cyclables') !== -1,
+                            hashtags: ['haltevelo', 'haltes_cyclables']
+                        },
+                        {
+                            title: 'igo.geo.search.icherche.type.restArea',
+                            value: 'haltes_routieres',
+                            enabled: types.indexOf('haltes_routieres') !== -1,
+                            hashtags: ['halteroute', 'haltes_routieres']
+                        },
+                        {
+                            title: 'igo.geo.search.icherche.type.hq',
+                            value: 'hq',
+                            enabled: types.indexOf('hq') !== -1,
+                            hashtags: ['hq']
                         },
                         {
                             title: 'igo.geo.search.icherche.type.intersection',
@@ -36873,16 +37969,10 @@ class IChercheSearchSource extends SearchSource {
                             hashtags: ['intersection', '+']
                         },
                         {
-                            title: 'igo.geo.search.icherche.type.city',
-                            value: 'municipalites',
-                            enabled: types.indexOf('municipalites') !== -1,
-                            hashtags: ['municipalité', 'mun']
-                        },
-                        {
-                            title: 'igo.geo.search.icherche.type.oldCity',
-                            value: 'anciennes-municipalites',
-                            enabled: types.indexOf('anciennes-municipalites') !== -1,
-                            hashtags: ['anciennes-municipalites']
+                            title: 'igo.geo.search.icherche.type.place',
+                            value: 'lieux',
+                            enabled: types.indexOf('lieux') !== -1,
+                            hashtags: ['lieu']
                         },
                         {
                             title: 'igo.geo.search.icherche.type.mrc',
@@ -36890,37 +37980,18 @@ class IChercheSearchSource extends SearchSource {
                             enabled: types.indexOf('mrc') !== -1,
                             hashtags: ['mrc']
                         },
+                        {
+                            title: 'igo.geo.search.icherche.type.city',
+                            value: 'municipalites',
+                            enabled: types.indexOf('municipalites') !== -1,
+                            hashtags: ['municipalité', 'mun']
+                        },
                         {
                             title: 'igo.geo.search.icherche.type.regadmin',
                             value: 'regadmin',
                             enabled: types.indexOf('regadmin') !== -1,
                             hashtags: ['région-administrative', 'regadmin']
                         },
-                        {
-                            title: 'igo.geo.search.icherche.type.entreprise',
-                            value: 'entreprises',
-                            enabled: types.indexOf('entreprises') !== -1,
-                            available: false,
-                            hashtags: ['entreprise']
-                        },
-                        {
-                            title: 'igo.geo.search.icherche.type.place',
-                            value: 'lieux',
-                            enabled: types.indexOf('lieux') !== -1,
-                            hashtags: ['lieu']
-                        },
-                        {
-                            title: 'igo.geo.search.icherche.type.exit',
-                            value: 'sorties-autoroute',
-                            enabled: types.indexOf('sorties-autoroute') !== -1,
-                            hashtags: ['sortie', 'sorties', 'exit']
-                        },
-                        {
-                            title: 'igo.geo.search.icherche.type.km',
-                            value: 'bornes-km',
-                            enabled: types.indexOf('bornes-km') !== -1,
-                            hashtags: ['borne', 'bornes', 'repère', 'km']
-                        },
                         {
                             title: 'igo.geo.search.icherche.type.gcc',
                             value: 'bornes-gcc',
@@ -36928,28 +37999,22 @@ class IChercheSearchSource extends SearchSource {
                             hashtags: ['borne', 'bornes', 'repère', 'gcc', 'ccg']
                         },
                         {
-                            title: 'igo.geo.search.icherche.type.cn',
-                            value: 'bornes-cn',
-                            enabled: types.indexOf('bornes-cn') !== -1,
-                            hashtags: ['borne', 'bornes', 'cn']
-                        },
-                        {
-                            title: 'igo.geo.search.icherche.type.sumi',
-                            value: 'bornes-sumi',
-                            enabled: types.indexOf('bornes-sumi') !== -1,
-                            hashtags: ['borne', 'bornes', 'sumi']
+                            title: 'igo.geo.search.icherche.type.km',
+                            value: 'bornes-km',
+                            enabled: types.indexOf('bornes-km') !== -1,
+                            hashtags: ['borne', 'bornes', 'repère', 'km']
                         },
                         {
-                            title: 'igo.geo.search.icherche.type.hq',
-                            value: 'hq',
-                            enabled: types.indexOf('hq') !== -1,
-                            hashtags: ['hq']
+                            title: 'igo.geo.search.icherche.type.road',
+                            value: 'routes',
+                            enabled: types.indexOf('routes') !== -1,
+                            hashtags: ['route']
                         },
                         {
-                            title: 'igo.geo.search.icherche.type.cadastre',
-                            value: 'cadastre',
-                            enabled: types.indexOf('cadastre') !== -1,
-                            hashtags: ['cadastre']
+                            title: 'igo.geo.search.icherche.type.exit',
+                            value: 'sorties-autoroute',
+                            enabled: types.indexOf('sorties-autoroute') !== -1,
+                            hashtags: ['sortie', 'sorties', 'exit']
                         }
                     ]
                 },
@@ -38669,7 +39734,7 @@ SearchSettingsComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: Sea
             i0.ɵɵadvance(1);
             i0.ɵɵproperty("ngIf", ctx.hasPointerReverseSearchSource && !ctx.isTouchScreen);
         }
-    }, dependencies: [i1$1.NgForOf, i1$1.NgIf, i1$1.NgSwitch, i1$1.NgSwitchCase, i4.MatTooltip, i2.MatIcon, i3.MatButton, i7$2.MatMenu, i7$2.MatMenuItem, i7$2.MatMenuTrigger, i17.MatRadioGroup, i17.MatRadioButton, i12$1.MatCheckbox, i11.MatDivider, i23.MatSlideToggle, i7.TranslatePipe], styles: [".checkAllButton[_ngcontent-%COMP%]{text-align:center;padding:0 5px}.igo-search-settings-button[_ngcontent-%COMP%]     div.mat-button-ripple-round{border-radius:0}.igo-search-settings-radio-group[_ngcontent-%COMP%]{display:flex;flex-direction:column}.igo-search-settings-radio-group[_ngcontent-%COMP%]   mat-radio-button[_ngcontent-%COMP%]{margin:5px}.igo-search-settings-checkbox[_ngcontent-%COMP%]   mat-radio-button[_ngcontent-%COMP%]{display:flex}.igo-search-settings-search-source[_ngcontent-%COMP%]{display:flex;width:100%}.igo-search-settings-search-source[_ngcontent-%COMP%]   mat-checkbox[_ngcontent-%COMP%]{display:flex;margin-left:5px;margin-right:5px}.pointer-summary-option[_ngcontent-%COMP%]{display:block;margin-right:10px;margin-bottom:15px}.pointer-summary-slide-toggle-container[_ngcontent-%COMP%]{overflow-x:hidden}.pointer-summary-slide-toggle-container[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%]{margin:10px}"], changeDetection: 0 });
+    }, dependencies: [i1$1.NgForOf, i1$1.NgIf, i1$1.NgSwitch, i1$1.NgSwitchCase, i4.MatTooltip, i2.MatIcon, i3.MatButton, i7$2.MatMenu, i7$2.MatMenuItem, i7$2.MatMenuTrigger, i17.MatRadioGroup, i17.MatRadioButton, i12.MatCheckbox, i11.MatDivider, i23.MatSlideToggle, i7.TranslatePipe], styles: [".checkAllButton[_ngcontent-%COMP%]{text-align:center;padding:0 5px}.igo-search-settings-button[_ngcontent-%COMP%]     div.mat-button-ripple-round{border-radius:0}.igo-search-settings-radio-group[_ngcontent-%COMP%]{display:flex;flex-direction:column}.igo-search-settings-radio-group[_ngcontent-%COMP%]   mat-radio-button[_ngcontent-%COMP%]{margin:5px}.igo-search-settings-checkbox[_ngcontent-%COMP%]   mat-radio-button[_ngcontent-%COMP%]{display:flex}.igo-search-settings-search-source[_ngcontent-%COMP%]{display:flex;width:100%}.igo-search-settings-search-source[_ngcontent-%COMP%]   mat-checkbox[_ngcontent-%COMP%]{display:flex;margin-left:5px;margin-right:5px}.pointer-summary-option[_ngcontent-%COMP%]{display:block;margin-right:10px;margin-bottom:15px}.pointer-summary-slide-toggle-container[_ngcontent-%COMP%]{overflow-x:hidden}.pointer-summary-slide-toggle-container[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%]{margin:10px}"], changeDetection: 0 });
 (function () {
     (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(SearchSettingsComponent, [{
             type: Component,
@@ -38756,29 +39821,27 @@ function SearchBarComponent_mat_label_3_Template(rf, ctx) {
 }
 function SearchBarComponent_button_11_Template(rf, ctx) {
     if (rf & 1) {
+        const _r7 = i0.ɵɵgetCurrentView();
         i0.ɵɵelementStart(0, "button", 10);
-        i0.ɵɵelement(1, "mat-icon", 11);
+        i0.ɵɵlistener("click", function SearchBarComponent_button_11_Template_button_click_0_listener() { i0.ɵɵrestoreView(_r7); const ctx_r6 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r6.onClearButtonClick()); });
+        i0.ɵɵpipe(1, "translate");
+        i0.ɵɵelement(2, "mat-icon", 11);
         i0.ɵɵelementEnd();
     }
     if (rf & 2) {
         const ctx_r2 = i0.ɵɵnextContext();
-        i0.ɵɵproperty("color", ctx_r2.color);
-        i0.ɵɵadvance(1);
-        i0.ɵɵpropertyInterpolate("svgIcon", ctx_r2.searchIcon);
+        i0.ɵɵproperty("color", ctx_r2.color)("matTooltip", i0.ɵɵpipeBind1(1, 2, "igo.geo.search.clearSearch"));
     }
 }
-function SearchBarComponent_button_12_Template(rf, ctx) {
+function SearchBarComponent_button_13_Template(rf, ctx) {
     if (rf & 1) {
-        const _r7 = i0.ɵɵgetCurrentView();
         i0.ɵɵelementStart(0, "button", 12);
-        i0.ɵɵlistener("click", function SearchBarComponent_button_12_Template_button_click_0_listener() { i0.ɵɵrestoreView(_r7); const ctx_r6 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r6.onClearButtonClick()); });
-        i0.ɵɵpipe(1, "translate");
-        i0.ɵɵelement(2, "mat-icon", 13);
+        i0.ɵɵelement(1, "mat-icon", 13);
         i0.ɵɵelementEnd();
     }
     if (rf & 2) {
         const ctx_r3 = i0.ɵɵnextContext();
-        i0.ɵɵproperty("color", ctx_r3.color)("matTooltip", i0.ɵɵpipeBind1(1, 2, "igo.geo.search.clearSearch"));
+        i0.ɵɵproperty("color", ctx_r3.color);
     }
 }
 function SearchBarComponent_igo_search_selector_14_Template(rf, ctx) {
@@ -38814,8 +39877,8 @@ const _c2$1 = function (a0) { return { "hasSearchIcon": a0 }; };
  * into that store. An event is always emitted when a research is completed.
  */
 class SearchBarComponent {
-    constructor(languageService, searchService, searchSourceService) {
-        this.languageService = languageService;
+    constructor(configService, searchService, searchSourceService) {
+        this.configService = configService;
         this.searchService = searchService;
         this.searchSourceService = searchSourceService;
         this.placeholder$ = new BehaviorSubject('igo.geo.search.placeholder');
@@ -38824,6 +39887,10 @@ class SearchBarComponent {
          * Search term stream
          */
         this.stream$ = new BehaviorSubject('');
+        /**
+         * whether to show search button or not
+         */
+        this.showSearchButton = false;
         /**
          * List of available search types
          */
@@ -38935,12 +40002,14 @@ class SearchBarComponent {
             this.empty$.next(term === undefined || term.length === 0);
         });
         this.stream$$ = this.stream$
-            .pipe(debounce((term) => (term === '' ? EMPTY : timer(this.debounce))))
+            .pipe(debounce(() => timer(this.debounce)))
             .subscribe((term) => this.onSetTerm(term));
         this.handlePlaceholder();
         this.searchType$$ = this.searchType$
             .pipe(distinctUntilChanged())
             .subscribe((searchType) => this.onSetSearchType(searchType));
+        const configValue = this.configService.getConfig("searchBar.showSearchButton");
+        this.showSearchButton = configValue !== undefined ? configValue : false;
     }
     /**
      * Unsubscribe to the search term stream
@@ -39128,7 +40197,7 @@ SearchBarComponent.invalidKeys = [
     'ArrowRight',
     'ArrowLeft'
 ];
-SearchBarComponent.ɵfac = function SearchBarComponent_Factory(t) { return new (t || SearchBarComponent)(i0.ɵɵdirectiveInject(i2$1.LanguageService), i0.ɵɵdirectiveInject(SearchService), i0.ɵɵdirectiveInject(SearchSourceService)); };
+SearchBarComponent.ɵfac = function SearchBarComponent_Factory(t) { return new (t || SearchBarComponent)(i0.ɵɵdirectiveInject(i2$1.ConfigService), i0.ɵɵdirectiveInject(SearchService), i0.ɵɵdirectiveInject(SearchSourceService)); };
 SearchBarComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: SearchBarComponent, selectors: [["igo-search-bar"]], viewQuery: function SearchBarComponent_Query(rf, ctx) {
         if (rf & 1) {
             i0.ɵɵviewQuery(_c0$3, 7);
@@ -39137,7 +40206,7 @@ SearchBarComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: SearchBa
             let _t;
             i0.ɵɵqueryRefresh(_t = i0.ɵɵloadQuery()) && (ctx.input = _t.first);
         }
-    }, inputs: { searchTypes: "searchTypes", searchType: "searchType", term: "term", disabled: "disabled", pointerSummaryEnabled: "pointerSummaryEnabled", searchResultsGeometryEnabled: "searchResultsGeometryEnabled", floatLabel: "floatLabel", appearance: "appearance", placeholder: "placeholder", label: "label", color: "color", termSplitter: "termSplitter", debounce: "debounce", minLength: "minLength", searchIcon: "searchIcon", searchSelector: "searchSelector", searchSettings: "searchSettings", forceNA: "forceNA", store: "store" }, outputs: { pointerSummaryStatus: "pointerSummaryStatus", searchResultsGeometryStatus: "searchResultsGeometryStatus", searchTermChange: "searchTermChange", search: "search", searchTypeChange: "searchTypeChange", clearFeature: "clearFeature", searchSettingsChange: "searchSettingsChange" }, decls: 16, vars: 28, consts: [[1, "igo-search-bar-container", 3, "ngClass"], [3, "floatLabel", "appearance"], [4, "ngIf"], ["matInput", "", "autocomplete", "off", 3, "ngClass", "disabled", "placeholder", "value", "keyup", "touchend"], ["input", ""], [1, "search-bar-buttons"], ["mat-icon-button", "", 3, "color", 4, "ngIf"], ["mat-icon-button", "", 3, "color", "matTooltip", "click", 4, "ngIf"], [3, "searchTypes", "searchType", "searchTypeChange", 4, "ngIf"], [3, "pointerSummaryEnabled", "searchResultsGeometryEnabled", "pointerSummaryStatus", "searchResultsGeometryStatus", "searchSourceChange", 4, "ngIf"], ["mat-icon-button", "", 3, "color"], [3, "svgIcon"], ["mat-icon-button", "", 3, "color", "matTooltip", "click"], ["svgIcon", "close"], [3, "searchTypes", "searchType", "searchTypeChange"], [3, "pointerSummaryEnabled", "searchResultsGeometryEnabled", "pointerSummaryStatus", "searchResultsGeometryStatus", "searchSourceChange"]], template: function SearchBarComponent_Template(rf, ctx) {
+    }, inputs: { searchTypes: "searchTypes", searchType: "searchType", term: "term", disabled: "disabled", pointerSummaryEnabled: "pointerSummaryEnabled", searchResultsGeometryEnabled: "searchResultsGeometryEnabled", floatLabel: "floatLabel", appearance: "appearance", placeholder: "placeholder", label: "label", color: "color", termSplitter: "termSplitter", debounce: "debounce", minLength: "minLength", searchSelector: "searchSelector", searchSettings: "searchSettings", forceNA: "forceNA", store: "store" }, outputs: { pointerSummaryStatus: "pointerSummaryStatus", searchResultsGeometryStatus: "searchResultsGeometryStatus", searchTermChange: "searchTermChange", search: "search", searchTypeChange: "searchTypeChange", clearFeature: "clearFeature", searchSettingsChange: "searchSettingsChange" }, decls: 16, vars: 28, consts: [[1, "igo-search-bar-container", 3, "ngClass"], [3, "floatLabel", "appearance"], [4, "ngIf"], ["matInput", "", "autocomplete", "off", 3, "ngClass", "disabled", "placeholder", "value", "keyup", "touchend"], ["input", ""], [1, "search-bar-buttons"], ["mat-icon-button", "", 3, "color", "matTooltip", "click", 4, "ngIf"], ["mat-icon-button", "", 3, "color", 4, "ngIf"], [3, "searchTypes", "searchType", "searchTypeChange", 4, "ngIf"], [3, "pointerSummaryEnabled", "searchResultsGeometryEnabled", "pointerSummaryStatus", "searchResultsGeometryStatus", "searchSourceChange", 4, "ngIf"], ["mat-icon-button", "", 3, "color", "matTooltip", "click"], ["svgIcon", "close"], ["mat-icon-button", "", 3, "color"], ["svgIcon", "magnify"], [3, "searchTypes", "searchType", "searchTypeChange"], [3, "pointerSummaryEnabled", "searchResultsGeometryEnabled", "pointerSummaryStatus", "searchResultsGeometryStatus", "searchSourceChange"]], template: function SearchBarComponent_Template(rf, ctx) {
         if (rf & 1) {
             i0.ɵɵelementStart(0, "div", 0);
             i0.ɵɵpipe(1, "async");
@@ -39151,9 +40220,9 @@ SearchBarComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: SearchBa
             i0.ɵɵpipe(9, "async");
             i0.ɵɵelementEnd()();
             i0.ɵɵelementStart(10, "div", 5);
-            i0.ɵɵtemplate(11, SearchBarComponent_button_11_Template, 2, 2, "button", 6);
-            i0.ɵɵtemplate(12, SearchBarComponent_button_12_Template, 3, 4, "button", 7);
-            i0.ɵɵpipe(13, "async");
+            i0.ɵɵtemplate(11, SearchBarComponent_button_11_Template, 3, 4, "button", 6);
+            i0.ɵɵpipe(12, "async");
+            i0.ɵɵtemplate(13, SearchBarComponent_button_13_Template, 2, 1, "button", 7);
             i0.ɵɵtemplate(14, SearchBarComponent_igo_search_selector_14_Template, 2, 4, "igo-search-selector", 8);
             i0.ɵɵtemplate(15, SearchBarComponent_igo_search_settings_15_Template, 1, 2, "igo-search-settings", 9);
             i0.ɵɵelementEnd()();
@@ -39165,12 +40234,12 @@ SearchBarComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: SearchBa
             i0.ɵɵadvance(1);
             i0.ɵɵproperty("ngIf", ctx.label);
             i0.ɵɵadvance(1);
-            i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(26, _c2$1, ctx.searchIcon))("disabled", i0.ɵɵpipeBind1(6, 14, ctx.disabled$))("placeholder", ctx.placeholder ? ctx.placeholder : i0.ɵɵpipeBind1(7, 16, ctx.placeholder$) ? i0.ɵɵpipeBind1(8, 18, ctx.placeholder$.value) : undefined)("value", i0.ɵɵpipeBind1(9, 20, ctx.term$));
+            i0.ɵɵproperty("ngClass", i0.ɵɵpureFunction1(26, _c2$1, ctx.showSearchButton))("disabled", i0.ɵɵpipeBind1(6, 14, ctx.disabled$))("placeholder", ctx.placeholder ? ctx.placeholder : i0.ɵɵpipeBind1(7, 16, ctx.placeholder$) ? i0.ɵɵpipeBind1(8, 18, ctx.placeholder$.value) : undefined)("value", i0.ɵɵpipeBind1(9, 20, ctx.term$));
             i0.ɵɵadvance(7);
-            i0.ɵɵproperty("ngIf", ctx.searchIcon !== undefined);
-            i0.ɵɵadvance(1);
-            i0.ɵɵproperty("ngIf", i0.ɵɵpipeBind1(13, 22, ctx.empty$) === false);
+            i0.ɵɵproperty("ngIf", i0.ɵɵpipeBind1(12, 22, ctx.empty$) === false);
             i0.ɵɵadvance(2);
+            i0.ɵɵproperty("ngIf", ctx.showSearchButton);
+            i0.ɵɵadvance(1);
             i0.ɵɵproperty("ngIf", ctx.searchSelector);
             i0.ɵɵadvance(1);
             i0.ɵɵproperty("ngIf", ctx.searchSettings);
@@ -39179,8 +40248,8 @@ SearchBarComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: SearchBa
 (function () {
     (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(SearchBarComponent, [{
             type: Component,
-            args: [{ selector: 'igo-search-bar', changeDetection: ChangeDetectionStrategy.OnPush, template: "<div class=\"igo-search-bar-container\" [ngClass]=\"{empty: empty$ | async}\">\n  <mat-form-field [floatLabel]=\"floatLabel\" [appearance]=\"appearance\">\n    <mat-label *ngIf=\"label\">{{label}}</mat-label>\n    <input\n      #input\n      matInput\n      autocomplete=\"off\"\n      [ngClass]=\"{'hasSearchIcon': searchIcon}\"\n      [disabled]=\"disabled$ | async\"\n      [placeholder]=\"placeholder ? placeholder : (placeholder$ | async) ? (placeholder$.value | translate) : undefined\"\n      [value]=\"term$ | async\"\n      (keyup)=\"onKeyup($event)\"\n      (touchend)=\"onKeyup($event)\">\n  </mat-form-field>\n\n  <div class=\"search-bar-buttons\">\n    <button\n      mat-icon-button\n      [color]=\"color\"\n      *ngIf=\"searchIcon !== undefined\">\n      <mat-icon svgIcon=\"{{searchIcon}}\"></mat-icon>\n    </button>\n\n    <button\n      *ngIf=\"(empty$ | async)===false\"\n      mat-icon-button\n      [color]=\"color\"\n      (click)=\"onClearButtonClick()\"\n      [matTooltip]=\"'igo.geo.search.clearSearch' | translate\">\n      <mat-icon svgIcon=\"close\"></mat-icon>\n    </button>\n\n    <igo-search-selector\n      *ngIf=\"searchSelector\"\n      [searchTypes]=\"searchTypes\"\n      [searchType]=\"searchType$ | async\"\n      (searchTypeChange)=\"onSearchTypeChange($event)\">\n    </igo-search-selector>\n\n    <igo-search-settings\n      *ngIf=\"searchSettings\"\n      [pointerSummaryEnabled]=\"pointerSummaryEnabled\"\n      (pointerSummaryStatus)=\"pointerSummaryStatus.emit($event)\"\n      [searchResultsGeometryEnabled]=\"searchResultsGeometryEnabled\"\n      (searchResultsGeometryStatus)=\"searchResultsGeometryStatus.emit($event)\"\n      (searchSourceChange)=\"onSearchSettingsChange()\">\n    </igo-search-settings>\n  </div>\n</div>\n", styles: [":host ::ng-deep .mat-form-field{padding:0 5px}:host ::ng-deep .mat-form-field-wrapper{margin-bottom:-1.5em}:host ::ng-deep span.mat-form-field-label-wrapper{top:-20px}:host ::ng-deep div.mat-form-field-infix{left:5px;right:5px;padding:0 0 12px!important}:host ::ng-deep div.mat-form-field-underline{display:none}.igo-search-bar-container{position:relative;width:100%;display:inline-flex;overflow:hidden}.igo-search-bar-container>mat-form-field{width:calc(100% - 80px)}.igo-search-bar-container.empty>mat-form-field{width:calc(100% - 40px)}.search-bar-buttons{position:relative;right:0px;display:inline-flex;top:0}.search-bar-buttons>button:nth-child(2):before{content:\"\";left:0px;top:5px;border-right:1px solid #ddd;height:28px}igo-search-selector{background-color:#fff;top:0;border-radius:0}igo-search-settings{background-color:#fff;top:0;border-radius:0}\n"] }]
-        }], function () { return [{ type: i2$1.LanguageService }, { type: SearchService }, { type: SearchSourceService }]; }, { searchTypes: [{
+            args: [{ selector: 'igo-search-bar', changeDetection: ChangeDetectionStrategy.OnPush, template: "<div class=\"igo-search-bar-container\" [ngClass]=\"{empty: empty$ | async}\">\n  <mat-form-field [floatLabel]=\"floatLabel\" [appearance]=\"appearance\">\n    <mat-label *ngIf=\"label\">{{label}}</mat-label>\n    <input\n      #input\n      matInput\n      autocomplete=\"off\"\n      [ngClass]=\"{'hasSearchIcon': showSearchButton}\"\n      [disabled]=\"disabled$ | async\"\n      [placeholder]=\"placeholder ? placeholder : (placeholder$ | async) ? (placeholder$.value | translate) : undefined\"\n      [value]=\"term$ | async\"\n      (keyup)=\"onKeyup($event)\"\n      (touchend)=\"onKeyup($event)\">\n  </mat-form-field>\n\n  <div class=\"search-bar-buttons\">\n    <button *ngIf=\"(empty$ | async)===false\"\n      mat-icon-button\n      [color]=\"color\"\n      (click)=\"onClearButtonClick()\"\n      [matTooltip]=\"'igo.geo.search.clearSearch' | translate\">\n      <mat-icon svgIcon=\"close\"></mat-icon>\n    </button>\n    \n    <button *ngIf=\"showSearchButton\"\n      mat-icon-button\n      [color]=\"color\">\n      <mat-icon svgIcon=\"magnify\"></mat-icon>\n    </button>\n\n    <igo-search-selector\n      *ngIf=\"searchSelector\"\n      [searchTypes]=\"searchTypes\"\n      [searchType]=\"searchType$ | async\"\n      (searchTypeChange)=\"onSearchTypeChange($event)\">\n    </igo-search-selector>\n\n    <igo-search-settings\n      *ngIf=\"searchSettings\"\n      [pointerSummaryEnabled]=\"pointerSummaryEnabled\"\n      (pointerSummaryStatus)=\"pointerSummaryStatus.emit($event)\"\n      [searchResultsGeometryEnabled]=\"searchResultsGeometryEnabled\"\n      (searchResultsGeometryStatus)=\"searchResultsGeometryStatus.emit($event)\"\n      (searchSourceChange)=\"onSearchSettingsChange()\">\n    </igo-search-settings>\n  </div>\n</div>\n", styles: [":host ::ng-deep .mat-form-field{padding:0 5px}:host ::ng-deep .mat-form-field-wrapper{margin-bottom:-1.5em}:host ::ng-deep span.mat-form-field-label-wrapper{top:-20px}:host ::ng-deep div.mat-form-field-infix{left:5px;right:5px;padding:0 0 12px!important}:host ::ng-deep div.mat-form-field-underline{display:none}.igo-search-bar-container{position:relative;width:100%;display:inline-flex;overflow:hidden}.igo-search-bar-container>mat-form-field{width:calc(100% - 80px)}.igo-search-bar-container.empty>mat-form-field{width:calc(100% - 40px)}.search-bar-buttons{position:relative;right:0px;display:inline-flex;top:0}.search-bar-buttons>button:nth-child(2):before{content:\"\";left:0px;top:5px;border-right:1px solid #ddd;height:28px}igo-search-selector{background-color:#fff;top:0;border-radius:0}igo-search-settings{background-color:#fff;top:0;border-radius:0}\n"] }]
+        }], function () { return [{ type: i2$1.ConfigService }, { type: SearchService }, { type: SearchSourceService }]; }, { searchTypes: [{
                 type: Input
             }], searchType: [{
                 type: Input
@@ -39212,8 +40281,6 @@ SearchBarComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: SearchBa
                 type: Input
             }], minLength: [{
                 type: Input
-            }], searchIcon: [{
-                type: Input
             }], searchSelector: [{
                 type: Input
             }], searchSettings: [{
@@ -39572,9 +40639,11 @@ var SearchResultMode;
  * This component is dumb and only emits events.
  */
 class SearchResultsComponent {
-    constructor(cdRef, searchService) {
+    constructor(cdRef, searchService, configService) {
         this.cdRef = cdRef;
         this.searchService = searchService;
+        this.configService = configService;
+        this.showResultsCount = true;
         /**
          * Reference to the SearchResultMode enum
          * @internal
@@ -39639,6 +40708,9 @@ class SearchResultsComponent {
         this.settingsChange$$ = this.settingsChange$.subscribe(() => {
             this.pageIterator = [];
         });
+        if (this.configService.getConfig('searchSources.showResultsCount') === false) {
+            this.showResultsCount = false;
+        }
     }
     /**
      * Unbind the search results store from the watcher
@@ -39657,7 +40729,7 @@ class SearchResultsComponent {
     computeGroupTitle(group) {
         const parts = [group.source.title];
         const count = group.results.length;
-        if (count > 1) {
+        if (count > 1 && this.showResultsCount) {
             parts.push(`(${count})`);
         }
         return parts.join(' ');
@@ -39721,11 +40793,15 @@ class SearchResultsComponent {
         });
     }
     isMoreResults(group) {
-        // getStrategyOfType is to avoid display more result based on a filtered state
+        var _a;
         const stategy = this.store.getStrategyOfType(EntityStoreFilterCustomFuncStrategy);
         const active = (stategy === null || stategy === void 0 ? void 0 : stategy.active) || false;
-        return !active && group.results &&
-            group.results[group.results.length - 1].meta.nextPage === true;
+        if (!active) {
+            return group.results && group.results[group.results.length - 1].meta.nextPage === true;
+        }
+        else {
+            return ((_a = group.results) === null || _a === void 0 ? void 0 : _a.length) % +group.source.params.limit === 0 && +group.source.params.page < 30;
+        }
     }
     displayMoreResults(group) {
         const options = {
@@ -39755,7 +40831,7 @@ class SearchResultsComponent {
         return;
     }
 }
-SearchResultsComponent.ɵfac = function SearchResultsComponent_Factory(t) { return new (t || SearchResultsComponent)(i0.ɵɵdirectiveInject(i0.ChangeDetectorRef), i0.ɵɵdirectiveInject(SearchService)); };
+SearchResultsComponent.ɵfac = function SearchResultsComponent_Factory(t) { return new (t || SearchResultsComponent)(i0.ɵɵdirectiveInject(i0.ChangeDetectorRef), i0.ɵɵdirectiveInject(SearchService), i0.ɵɵdirectiveInject(i2$1.ConfigService)); };
 SearchResultsComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: SearchResultsComponent, selectors: [["igo-search-results"]], contentQueries: function SearchResultsComponent_ContentQueries(rf, ctx, dirIndex) {
         if (rf & 1) {
             i0.ɵɵcontentQuery(dirIndex, _c0$1, 5);
@@ -39781,7 +40857,7 @@ SearchResultsComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: Sear
     (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(SearchResultsComponent, [{
             type: Component,
             args: [{ selector: 'igo-search-results', changeDetection: ChangeDetectionStrategy.OnPush, template: "<igo-list [navigation]=\"true\">\n  <ng-template\n    #groupTemplate\n    ngFor let-group\n    [ngForOf]=\"results$ | async\">\n\n    <igo-collapsible [class]=\"group.source.getId()\"\n      *ngIf=\"mode === searchResultMode.Grouped; else flatTemplate\"\n      [title]=\"computeGroupTitle(group)\"\n      [collapsed]=\"collapsed[group.source.title]\"\n      (toggle)=\"collapsed[group.source.title] = $event\">\n      <ng-container *ngTemplateOutlet=\"storeItemTemplate; context: {results: group.results}\"></ng-container>\n    </igo-collapsible>\n\n    <ng-template #flatTemplate>\n      <ng-container *ngTemplateOutlet=\"storeItemTemplate; context: {results: group.results}\"></ng-container>\n    </ng-template>\n\n    <ng-template #storeItemTemplate let-results=\"results\">\n      <ng-template ngFor let-result [ngForOf]=\"results\">\n        <igo-search-results-item\n          igoListItem\n          color=\"accent\"\n          [map]=\"map\"\n          [result]=\"result\"\n          [showIcons]=\"showIcons\"\n          [withZoomButton]=\"withZoomButton\"\n          [focused]=\"store.state.get(result).focused\"\n          [selected]=\"store.state.get(result).selected\"\n          (focus)=\"resultFocus.emit(result)\"\n          (unfocus)=\"resultUnfocus.emit(result)\"\n          (select)=\"onResultSelect(result)\"\n          (mouseenter)=\"resultFocus.emit(result)\"\n          (mouseleave)=\"resultUnfocus.emit(result)\">\n\n          <ng-container igoSearchItemToolbar\n            [ngTemplateOutlet]=\"templateSearchToolbar\"\n            [ngTemplateOutletContext]=\"{result: result}\">\n          </ng-container>\n\n        </igo-search-results-item>\n      </ng-template>\n      <span class=\"moreResults mat-typography\" *ngIf=\"isMoreResults(group)\" (click)=\"displayMoreResults(group)\">\n        <u>{{ 'igo.geo.search.displayMoreResults' | translate }}</u>\n      </span>\n    </ng-template>\n\n  </ng-template>\n\n</igo-list>\n", styles: [".moreResults{cursor:pointer;color:#00f;float:right;margin-right:10px;margin-top:5px}igo-list ::ng-deep mat-list{height:100%}\n"] }]
-        }], function () { return [{ type: i0.ChangeDetectorRef }, { type: SearchService }]; }, { map: [{
+        }], function () { return [{ type: i0.ChangeDetectorRef }, { type: SearchService }, { type: i2$1.ConfigService }]; }, { map: [{
                 type: Input
             }], store: [{
                 type: Input
@@ -41440,6 +42516,8 @@ class EditionWorkspaceService {
         this.relationLayers$ = new BehaviorSubject(undefined);
         this.rowsInMapExtentCheckCondition$ = new BehaviorSubject(true);
         this.loading = false;
+        this.wktFormat = new olFormatWKT();
+        this.geoJsonFormat = new OlGeoJSON();
     }
     get zoomAuto() {
         return this.storageService.get('zoomAuto');
@@ -41766,11 +42844,10 @@ class EditionWorkspaceService {
     }
     addFeature(feature, workspace, url, headers) {
         var _a, _b;
-        // TODO: adapt to any kind of geometry
         if (workspace.layer.dataSource.options.edition.hasGeometry) {
-            //feature.properties[geom] = feature.geometry;
-            feature.properties["longitude"] = feature.geometry.coordinates[0];
-            feature.properties["latitude"] = feature.geometry.coordinates[1];
+            const projDest = workspace.layer.options.sourceOptions.edition.geomDatabaseProj;
+            feature.properties[workspace.layer.dataSource.options.params.fieldNameGeometry] =
+                'SRID=' + projDest.replace("EPSG:", "") + ';' + this.wktFormat.writeGeometry(this.geoJsonFormat.readFeature(feature.geometry).getGeometry().transform('EPSG:4326', projDest), { dataProjection: projDest });
         }
         for (const property in feature.properties) {
             for (const sf of workspace.layer.dataSource.options.sourceFields) {
@@ -41852,11 +42929,12 @@ class EditionWorkspaceService {
     }
     modifyFeature(feature, workspace, url, headers, protocole = 'patch') {
         var _a, _b;
-        //TODO: adapt to any kind of geometry
         if (workspace.layer.dataSource.options.edition.hasGeometry) {
-            //feature.properties[geom] = feature.geometry;
-            feature.properties["longitude"] = feature.geometry.coordinates[0];
-            feature.properties["latitude"] = feature.geometry.coordinates[1];
+            const projDest = workspace.layer.options.sourceOptions.edition.geomDatabaseProj;
+            // Remove 3e dimension
+            feature.geometry.coordinates = removeZ(feature.geometry.coordinates);
+            feature.properties[workspace.layer.dataSource.options.params.fieldNameGeometry] =
+                'SRID=' + projDest.replace("EPSG:", "") + ';' + this.wktFormat.writeGeometry(this.geoJsonFormat.readFeature(feature.geometry).getGeometry().transform('EPSG:4326', projDest), { dataProjection: projDest });
         }
         for (const property in feature.properties) {
             for (const sf of workspace.layer.dataSource.options.sourceFields) {
@@ -42058,6 +43136,13 @@ function getColumnKeyWithoutPropertiesTag(column) {
         return column.split('.')[1];
     }
     return column;
+}
+function removeZ(coords) {
+    if (coords.length === 0)
+        return coords;
+    if (typeof coords[0] === 'number')
+        return coords.slice(0, 2);
+    return coords.map(removeZ);
 }
 
 class FeatureWorkspace extends Workspace {
@@ -42842,142 +43927,6 @@ function provideOsrmDirectionsSource() {
     };
 }
 
-/**
- * Cadastre search source
- */
-class CadastreSearchSource extends SearchSource {
-    constructor(http, languageService, storageService, options) {
-        super(options, storageService);
-        this.http = http;
-        this.languageService = languageService;
-    }
-    getId() {
-        return CadastreSearchSource.id;
-    }
-    getType() {
-        return CadastreSearchSource.type;
-    }
-    /*
-     * Source : https://wiki.openstreetmap.org/wiki/Key:amenity
-     */
-    getDefaultOptions() {
-        return {
-            title: 'Cadastre (Québec)',
-            searchUrl: 'https://carto.cptaq.gouv.qc.ca/php/find_lot_v1.php?'
-        };
-    }
-    /**
-     * Search a place by name
-     * @param term Place name
-     * @returns Observable of <SearchResult<Feature>[]
-     */
-    search(term, options) {
-        term = term.endsWith(',') ? term.slice(0, -1) : term;
-        term = term.startsWith(',') ? term.substr(1) : term;
-        term = term.replace(/ /g, '');
-        const params = this.computeSearchRequestParams(term, options || {});
-        if (!params.get('numero') || !params.get('numero').match(/^[0-9,]+$/g)) {
-            return of([]);
-        }
-        return this.http
-            .get(this.searchUrl, { params, responseType: 'text' })
-            .pipe(map((response) => this.extractResults(response, term)));
-    }
-    computeSearchRequestParams(term, options) {
-        return new HttpParams({
-            fromObject: Object.assign({
-                numero: term,
-                epsg: '4326'
-            }, this.params, options.params || {})
-        });
-    }
-    extractResults(response, term) {
-        return response
-            .split('<br />')
-            .filter((lot) => lot.length > 0)
-            .map((lot) => this.dataToResult(lot, term));
-    }
-    dataToResult(data, term) {
-        const lot = data.split(';');
-        const numero = lot[0];
-        const wkt = lot[7];
-        const geometry = this.computeGeometry(wkt);
-        const properties = {
-            NoLot: numero,
-            Route: '<span class="routing"> <u>' + this.languageService.translate.instant('igo.geo.seeRouting') + '</u> </span>'
-        };
-        const id = [this.getId(), 'cadastre', numero].join('.');
-        return {
-            source: this,
-            meta: {
-                dataType: FEATURE,
-                id,
-                title: numero,
-                score: computeTermSimilarity(term.trim(), numero),
-                icon: 'map-marker'
-            },
-            data: {
-                type: FEATURE,
-                projection: 'EPSG:4326',
-                geometry,
-                properties,
-                meta: {
-                    id,
-                    title: numero
-                }
-            }
-        };
-    }
-    computeGeometry(wkt) {
-        const feature = new olWKT().readFeature(wkt, {
-            dataProjection: 'EPSG:4326',
-            featureProjection: 'EPSG:4326'
-        });
-        return {
-            type: feature.getGeometry().getType(),
-            coordinates: feature.getGeometry().getCoordinates()
-        };
-    }
-}
-CadastreSearchSource.id = 'cadastre';
-CadastreSearchSource.type = FEATURE;
-CadastreSearchSource.ɵfac = function CadastreSearchSource_Factory(t) { return new (t || CadastreSearchSource)(i0.ɵɵinject(i1$2.HttpClient), i0.ɵɵinject(i2$1.LanguageService), i0.ɵɵinject(i2$1.StorageService), i0.ɵɵinject('options')); };
-CadastreSearchSource.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: CadastreSearchSource, factory: CadastreSearchSource.ɵfac });
-__decorate([
-    Cacheable({
-        maxCacheCount: 20
-    })
-], CadastreSearchSource.prototype, "search", null);
-(function () {
-    (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CadastreSearchSource, [{
-            type: Injectable
-        }], function () {
-        return [{ type: i1$2.HttpClient }, { type: i2$1.LanguageService }, { type: i2$1.StorageService }, { type: undefined, decorators: [{
-                        type: Inject,
-                        args: ['options']
-                    }] }];
-    }, { search: [] });
-})();
-
-/**
- * Cadastre search source factory
- * @ignore
- */
-function cadastreSearchSourceFactory(http, languageService, storageService, config) {
-    return new CadastreSearchSource(http, languageService, storageService, config.getConfig(`searchSources.${CadastreSearchSource.id}`));
-}
-/**
- * Function that returns a provider for the Cadastre search source
- */
-function provideCadastreSearchSource() {
-    return {
-        provide: SearchSource,
-        useFactory: cadastreSearchSourceFactory,
-        multi: true,
-        deps: [HttpClient, LanguageService, StorageService, ConfigService]
-    };
-}
-
 /**
  * Nominatim search source
  */
@@ -43749,7 +44698,7 @@ class ConfigFileToGeoDBService {
                     }
                     if (currentDate >= geoData.triggerDate) {
                         if (geoData.action === 'update') {
-                            const insertEvent = `${geoData.source || 'automatedDataUpdate'} (${geoData.triggerDate})`;
+                            const insertEvent = `${geoData.source || InsertSourceInsertDBEnum.System} (${geoData.triggerDate})`;
                             geoData.urls.map((url) => {
                                 datas$.push(this.geoDBService.getByID(url).pipe(concatMap((res) => {
                                     if ((res === null || res === void 0 ? void 0 : res.insertEvent) !== insertEvent) {
@@ -43758,8 +44707,31 @@ class ConfigFileToGeoDBService {
                                                 .info('igo.geo.indexedDb.data-download-start', undefined, { disableTimeOut: true, progressBar: false, closeButton: true, tapToDismiss: false });
                                             firstDownload = false;
                                         }
-                                        return this.http.get(url)
-                                            .pipe(concatMap(r => this.geoDBService.update(url, url, r, 'system', insertEvent)));
+                                        let responseType = 'json';
+                                        const isZip = this.isZip(url);
+                                        if (isZip) {
+                                            responseType = 'arraybuffer';
+                                        }
+                                        return this.http.get(url, { responseType }).pipe(concatMap(r => {
+                                            if (isZip) {
+                                                const observables$ = [this.geoDBService.update(url, url, {}, InsertSourceInsertDBEnum.System, insertEvent)];
+                                                JSZip.loadAsync(r)
+                                                    .then((zipped) => {
+                                                    zipped.forEach((relativePath) => {
+                                                        if (relativePath.toLocaleLowerCase().endsWith('.geojson')) {
+                                                            zipped.file(relativePath).async("base64").then((r) => {
+                                                                const geojson = JSON.parse(atob(r));
+                                                                const subUrl = geoData.zippedBaseUrl || '';
+                                                                const zippedUrl = subUrl + (subUrl.endsWith('/') ? '' : '/') + relativePath;
+                                                                observables$.push(this.geoDBService.update(zippedUrl, url, geojson, InsertSourceInsertDBEnum.System, insertEvent));
+                                                            });
+                                                        }
+                                                    });
+                                                });
+                                                return zip(observables$);
+                                            }
+                                            return this.geoDBService.update(url, url, r, InsertSourceInsertDBEnum.System, insertEvent);
+                                        }));
                                     }
                                     else {
                                         return of(false);
@@ -43785,6 +44757,10 @@ class ConfigFileToGeoDBService {
             }
         });
     }
+    isZip(value) {
+        const regex = /(zip)$/;
+        return typeof value === 'string' && regex.test(value.toLowerCase());
+    }
 }
 ConfigFileToGeoDBService.ɵfac = function ConfigFileToGeoDBService_Factory(t) { return new (t || ConfigFileToGeoDBService)(i0.ɵɵinject(i1$2.HttpClient), i0.ɵɵinject(GeoDBService), i0.ɵɵinject(i2$1.MessageService)); };
 ConfigFileToGeoDBService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: ConfigFileToGeoDBService, factory: ConfigFileToGeoDBService.ɵfac, providedIn: 'root' });
@@ -43805,5 +44781,5 @@ ConfigFileToGeoDBService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token:
  * Generated bundle index. Do not edit.
  */
 
-export { AddCatalogDialogComponent, ArcGISRestDataSource, BaseLayersSwitcherComponent, CadastreSearchSource, CapabilitiesService, CartoDataSource, Catalog, CatalogBrowserComponent, CatalogFactory, CatalogItemType, CatalogLibaryComponent, CatalogService, ClusterDataSource, CompositeCatalog, ConfigFileToGeoDBService, ConfirmationPopupComponent, CoordinatesReverseSearchSource, CoordinatesReverseSearchSourceFactory, CoordinatesSearchResultFormatter, DataService, DataSource, DataSourceService, DirectionRelativePositionType, DirectionType, DirectionsButtonsComponent, DirectionsComponent, DirectionsFormat, DirectionsInputsComponent, DirectionsResultsComponent, DirectionsService, DirectionsSource, DownloadButtonComponent, DownloadService, DrawComponent, DrawControl, DrawIconService, DrawStyleService, DropGeoFileDirective, EditionWorkspace, EditionWorkspaceService, EncodingFormat, EsriStyleGenerator, ExportButtonComponent, ExportError, ExportFormat, ExportInvalidFileError, ExportNothingToExportError, ExportService, FEATURE, FeatureDataSource, FeatureDetailsComponent, FeatureDetailsDirective, FeatureFormComponent, FeatureMotion, FeatureStore, FeatureStoreInMapExtentStrategy, FeatureStoreInMapResolutionStrategy, FeatureStoreLoadingLayerStrategy, FeatureStoreLoadingStrategy, FeatureStoreSelectionStrategy, FeatureWorkspace, FeatureWorkspaceService, FilterableDataSourcePipe, FontType, GeoDBService, GeoNetworkService, GeolocateButtonComponent, GeometryFormFieldComponent, GeometryFormFieldInputComponent, GeometrySliceError, GeometrySliceLineStringError, GeometrySliceMultiPolygonError, GeometrySliceTooManyIntersectionError, GeometryType, GoogleLinks, HomeExtentButtonComponent, HoverFeatureDirective, IChercheReverseSearchSource, IChercheSearchResultFormatter, IChercheSearchSource, ILayerSearchResultFormatter, ILayerSearchSource, IgoCatalogBrowserModule, IgoCatalogLibraryModule, IgoCatalogModule, IgoConfirmationPopupModule, IgoDataSourceModule, IgoDirectionsModule, IgoDownloadModule, IgoDrawModule, IgoDrawingToolModule, IgoFeatureDetailsModule, IgoFeatureFormModule, IgoFeatureModule, IgoFilterModule, IgoGeoModule, IgoGeoWorkspaceModule, IgoGeometryFormFieldModule, IgoGeometryModule, IgoHttpParameterCodec, IgoImportExportModule, IgoLayerModule, IgoMap, IgoMapModule, IgoMeasureModule, IgoMeasurerModule, IgoMetadataModule, IgoOgcFilterModule, IgoOverlayModule, IgoPrintModule, IgoQueryModule, IgoSearchBarModule, IgoSearchModule, IgoSearchResultsModule, IgoSearchSelectorModule, IgoSearchSettingsModule, IgoStyleListModule, IgoToastModule, IgoWktModule, IgoWorkspaceSelectorModule, IgoWorkspaceUpdatorModule, ImageArcGISRestDataSource, ImageLayer, ImageWatcher, ImportError, ImportExportComponent, ImportInvalidFileError, ImportNothingToImportError, ImportOgreServerError, ImportSRSError, ImportService, ImportSizeError, ImportUnreadableFileError, InfoSectionComponent, InsertSourceInsertDBEnum, LAYER, Layer, LayerItemComponent, LayerLegendComponent, LayerLegendItemComponent, LayerLegendListBindingDirective, LayerLegendListComponent, LayerListBindingDirective, LayerListComponent, LayerListControlsEnum, LayerListDisplacement, LayerListSelectVisibleEnum, LayerListToolComponent, LayerListToolControlsEnum, LayerListToolService, LayerService, LinkedProperties, MEASURE_UNIT_AUTO, MVTDataSource, MapBrowserComponent, MapCenterComponent, MapController, MapGeolocationController, MapOfflineDirective, MapService, MapViewAction, MapViewController, MeasureAreaUnit, MeasureAreaUnitAbbreviation, MeasureFormatPipe, MeasureLengthUnit, MeasureLengthUnitAbbreviation, MeasureType, MeasurerComponent, MenuButtonComponent, MetadataAbstractComponent, MetadataButtonComponent, MetadataService, MiniBaseMapComponent, ModifyControl, NominatimSearchSource, OGCFilterService, OSMDataSource, OfflineButtonComponent, OgcFilterButtonComponent, OgcFilterComponent, OgcFilterFormComponent, OgcFilterOperator, OgcFilterOperatorType, OgcFilterSelectionComponent, OgcFilterTimeComponent, OgcFilterTimeSliderComponent, OgcFilterWidget, OgcFilterWriter, OgcFilterableFormComponent, OgcFilterableItemComponent, OgcFilterableListBindingDirective, OgcFilterableListComponent, OlDragSelectInteraction, OptionsApiService, OptionsService, OsmLinks, OsrmDirectionsSource, Overlay, OverlayAction, OverlayDirective, OverlayService, PointerPositionDirective, PrintComponent, PrintFormComponent, PrintLegendPosition, PrintOrientation, PrintOutputFormat, PrintPaperFormat, PrintResolution, PrintSaveImageFormat, PrintService, ProjectionService, ProposalType, QueryDirective, QueryFormat, QueryFormatMimeType, QueryHtmlTarget, QuerySearchSource, QueryService, ResponseType, RotationButtonComponent, RoutesFeatureStore, SEARCH_TYPES, STYLELIST_OPTIONS, SearchBarComponent, SearchPointerSummaryDirective, SearchResultAddButtonComponent, SearchResultMode, SearchResultsComponent, SearchResultsItemComponent, SearchSelectorComponent, SearchService, SearchSettingsComponent, SearchSource, SearchSourceService, SliceControl, SourceDirectionsType, SpatialFilterItemComponent, SpatialFilterItemType, SpatialFilterListComponent, SpatialFilterQueryType, SpatialFilterService, SpatialFilterType, SpatialFilterTypeComponent, StepFeatureStore, StopsFeatureStore, StopsStore, StoredQueriesReverseSearchSource, StoredQueriesSearchSource, StyleListService, StyleModalComponent, StyleService, SwipeControlComponent, TileArcGISRestDataSource, TileDebugDataSource, TileLayer, TileWatcher, TimeFilterButtonComponent, TimeFilterFormComponent, TimeFilterItemComponent, TimeFilterListBindingDirective, TimeFilterListComponent, TimeFilterService, TimeFilterStyle, TimeFilterType, ToastComponent, TooltipType, TrackFeatureButtonComponent, TypeCapabilities, TypeCatalog, VectorLayer, VectorTileLayer, VectorWatcher, WFSDataSource, WFSService, WMSDataSource, WMTSDataSource, WakeLockButtonComponent, WebSocketDataSource, WfsWorkspace, WfsWorkspaceService, WktService, WorkspaceSelectorDirective, WorkspaceUpdatorDirective, XYZDataSource, ZoomButtonComponent, addDirectionToRoutesFeatureStore, addLayerAndFeaturesStyledToMap, addLayerAndFeaturesToMap, addLinearRingToOlPolygon, addStopToStopsFeatureStore, addStopToStore, buildUrl, cadastreSearchSourceFactory, checkWfsParams, clearOlGeometryMidpoints, computeBestAreaUnit, computeBestLengthUnit, computeLayerTitleFromFile, computeMVTOptionsOnHover, computeOlFeatureExtent, computeOlFeaturesDiff, computeOlFeaturesExtent, computeProjectionsConstraints, computeRelativePosition, computeStopsPosition, computeTermSimilarity, convertDDToDMS, createDefaultTileGrid, createDrawHoleInteractionStyle, createDrawInteractionStyle, createInteractionStyle, createMeasureInteractionStyle, createMeasureLayerStyle, createOlTooltipAtPoint, createOlTooltipDrawAtPoint, createOverlayDefaultStyle, createOverlayLayer, createOverlayMarkerStyle, ctrlKeyDown, defaultCoordinatesSearchResultFormatterFactory, defaultEpsg, defaultFieldNameGeometry, defaultIChercheSearchResultFormatterFactory, defaultMaxFeatures, defaultWfsVersion, directionsStyle, entitiesToRowData, exportToCSV, featureFromOl, featureToOl, featureToSearchResult, featuresAreOutOfView, featuresAreTooDeepInView, findDiff, formatDistance, formatDuration, formatInstruction, formatMeasure, formatScale, formatWFSQueryString, generateArcgisRestIdFromSourceOptions, generateFeatureIdFromSourceOptions, generateId, generateIdFromSourceOptions, generateWMSIdFromSourceOptions, generateWMTSIdFromSourceOptions, generateWfsIdFromSourceOptions, generateXYZIdFromSourceOptions, getAllChildLayersByDeletion, getAllChildLayersByProperty, getCommonVectorSelectedStyle, getCommonVectorStyle, getDirectChildLayersByDeletion, getDirectChildLayersByProperty, getDirectParentLayerByDeletion, getDirectParentLayerByProperty, getFileExtension, getFormatFromOptions, getIgoLayerByLinkId, getLayersLegends, getLinkedLayersOptions, getMousePositionFromOlGeometryEvent, getOlTooltipAtCenter, getOlTooltipsAtMidpoints, getResolutionFromScale, getRootParentByDeletion, getRootParentByProperty, getRowsInMapExtent, getScaleFromResolution, getSelectedOnly, getTooltipsOfOlGeometry, gmlRegex, handleFileExportError, handleFileExportSuccess, handleFileImportError, handleFileImportSuccess, handleInvalidFileImportError, handleLayerPropertyChange, handleNothingToExportError, handleNothingToImportError, handleOgreServerImportError, handleSRSImportError, handleSizeFileImportError, handleUnreadbleFileImportError, hideOlFeature, hoverFeatureMarker, ichercheReverseSearchSourceFactory, ichercheSearchSourceFactory, ilayerSearchResultFormatterFactory, ilayerSearchSourceFactory, initLayerSyncFromRootParentLayers, initRoutesFeatureStore, initStepFeatureStore, initStopsFeatureStore, jsonRegex, layerFeatureIsQueryable, layerHasLinkDeletion, layerHasLinkWithProperty, layerIsQueryable, lonLatConversion, mapExtentStrategyActiveToolTip, measureOlGeometry, measureOlGeometryArea, measureOlGeometryLength, metersToFeet, metersToKilometers, metersToMiles, metersToUnit, moveToOlFeatures, mtmZoneFromLonLat, noElementSelected, nominatimSearchSourceFactory, ogcFilterWidgetFactory, olLayerFeatureIsQueryable, olLayerIsQueryable, optionsApiFactory, osrmDirectionsSourcesFactory, pointerPositionSummaryMarker, provideCadastreSearchSource, provideCoordinatesReverseSearchSource, provideDefaultCoordinatesSearchResultFormatter, provideDefaultIChercheSearchResultFormatter, provideIChercheReverseSearchSource, provideIChercheSearchSource, provideILayerSearchResultFormatter, provideILayerSearchSource, provideNominatimSearchSource, provideOgcFilterWidget, provideOptionsApi, provideOsrmDirectionsSource, provideSearchSourceService, provideStoredQueriesReverseSearchSource, provideStoredQueriesSearchSource, provideStyleListLoader, provideStyleListOptions, removeStopFromStore, renderFeatureFromOl, roundCoordTo, scaleExtent, searchSourceServiceFactory, setRowsInMapExtent, setSelectedOnly, sliceOlGeometry, sliceOlLineString, sliceOlPolygon, sourceCanReverseSearch, sourceCanReverseSearchAsSummary, sourceCanSearch, squareMetersToAcres, squareMetersToHectares, squareMetersToSquareFeet, squareMetersToSquareKilometers, squareMetersToSquareMiles, squareMetersToUnit, standardizeUrl, storedqueriesReverseSearchSourceFactory, storedqueriesSearchSourceFactory, stringToLonLat, styleListFactory, translateBearing, translateModifier, tryAddLoadingStrategy, tryAddSelectionStrategy, tryBindStoreLayer, updateOlGeometryCenter, updateOlGeometryMidpoints, updateOlTooltipAtCenter, updateOlTooltipDrawAtCenter, updateOlTooltipsAtMidpoints, updateOlTooltipsDrawAtMidpoints, updateStoreSorting, utmZoneFromLonLat, viewStatesAreEqual, zoneMtm, zoneUtm };
+export { AddCatalogDialogComponent, ArcGISRestDataSource, BaseLayersSwitcherComponent, CapabilitiesService, CartoDataSource, Catalog, CatalogBrowserComponent, CatalogFactory, CatalogItemType, CatalogLibaryComponent, CatalogService, ClusterDataSource, CompositeCatalog, ConfigFileToGeoDBService, ConfirmationPopupComponent, CoordinatesReverseSearchSource, CoordinatesReverseSearchSourceFactory, CoordinatesSearchResultFormatter, CoordinatesUnit, DDtoDMS, DataService, DataSource, DataSourceService, DirectionRelativePositionType, DirectionType, DirectionsButtonsComponent, DirectionsComponent, DirectionsFormat, DirectionsInputsComponent, DirectionsResultsComponent, DirectionsService, DirectionsSource, DownloadButtonComponent, DownloadService, DrawComponent, DrawControl, DrawIconService, DrawStyleService, DropGeoFileDirective, EditionWorkspace, EditionWorkspaceService, EncodingFormat, EsriStyleGenerator, ExportButtonComponent, ExportError, ExportFormat, ExportInvalidFileError, ExportNothingToExportError, ExportService, FEATURE, FeatureDataSource, FeatureDetailsComponent, FeatureDetailsDirective, FeatureFormComponent, FeatureMotion, FeatureStore, FeatureStoreInMapExtentStrategy, FeatureStoreInMapResolutionStrategy, FeatureStoreLoadingLayerStrategy, FeatureStoreLoadingStrategy, FeatureStoreSelectionStrategy, FeatureWorkspace, FeatureWorkspaceService, FilterableDataSourcePipe, FontType, GeoDBService, GeoNetworkService, GeolocateButtonComponent, GeometryFormFieldComponent, GeometryFormFieldInputComponent, GeometrySliceError, GeometrySliceLineStringError, GeometrySliceMultiPolygonError, GeometrySliceTooManyIntersectionError, GeometryType, GoogleLinks, HomeExtentButtonComponent, HoverFeatureDirective, IChercheReverseSearchSource, IChercheSearchResultFormatter, IChercheSearchSource, ILayerSearchResultFormatter, ILayerSearchSource, IgoCatalogBrowserModule, IgoCatalogLibraryModule, IgoCatalogModule, IgoConfirmationPopupModule, IgoDataSourceModule, IgoDirectionsModule, IgoDownloadModule, IgoDrawModule, IgoDrawingToolModule, IgoFeatureDetailsModule, IgoFeatureFormModule, IgoFeatureModule, IgoFilterModule, IgoGeoModule, IgoGeoWorkspaceModule, IgoGeometryFormFieldModule, IgoGeometryModule, IgoHttpParameterCodec, IgoImportExportModule, IgoLayerModule, IgoMap, IgoMapModule, IgoMeasureModule, IgoMeasurerModule, IgoMetadataModule, IgoOgcFilterModule, IgoOverlayModule, IgoPrintModule, IgoQueryModule, IgoSearchBarModule, IgoSearchModule, IgoSearchResultsModule, IgoSearchSelectorModule, IgoSearchSettingsModule, IgoStyleListModule, IgoToastModule, IgoWktModule, IgoWorkspaceSelectorModule, IgoWorkspaceUpdatorModule, ImageArcGISRestDataSource, ImageLayer, ImageWatcher, ImportError, ImportExportComponent, ImportInvalidFileError, ImportNothingToImportError, ImportOgreServerError, ImportSRSError, ImportService, ImportSizeError, ImportUnreadableFileError, InfoSectionComponent, InsertSourceInsertDBEnum, LAYER, LabelType, Layer, LayerItemComponent, LayerLegendComponent, LayerLegendItemComponent, LayerLegendListBindingDirective, LayerLegendListComponent, LayerListBindingDirective, LayerListComponent, LayerListControlsEnum, LayerListDisplacement, LayerListSelectVisibleEnum, LayerListToolComponent, LayerListToolControlsEnum, LayerListToolService, LayerService, LinkedProperties, MEASURE_UNIT_AUTO, MVTDataSource, MapBrowserComponent, MapCenterComponent, MapController, MapGeolocationController, MapOfflineDirective, MapService, MapViewAction, MapViewController, MeasureAreaUnit, MeasureAreaUnitAbbreviation, MeasureFormatPipe, MeasureLengthUnit, MeasureLengthUnitAbbreviation, MeasureType, MeasurerComponent, MenuButtonComponent, MetadataAbstractComponent, MetadataButtonComponent, MetadataService, MiniBaseMapComponent, ModifyControl, NominatimSearchSource, OGCFilterService, OSMDataSource, OfflineButtonComponent, OgcFilterButtonComponent, OgcFilterComponent, OgcFilterFormComponent, OgcFilterOperator, OgcFilterOperatorType, OgcFilterSelectionComponent, OgcFilterTimeComponent, OgcFilterTimeSliderComponent, OgcFilterWidget, OgcFilterWriter, OgcFilterableFormComponent, OgcFilterableItemComponent, OgcFilterableListBindingDirective, OgcFilterableListComponent, OlDragSelectInteraction, OptionsApiService, OptionsService, OsmLinks, OsrmDirectionsSource, Overlay, OverlayAction, OverlayDirective, OverlayService, PointerPositionDirective, PrintComponent, PrintFormComponent, PrintLegendPosition, PrintOrientation, PrintOutputFormat, PrintPaperFormat, PrintResolution, PrintSaveImageFormat, PrintService, ProjectionService, ProposalType, QueryDirective, QueryFormat, QueryFormatMimeType, QueryHtmlTarget, QuerySearchSource, QueryService, ResponseType, RotationButtonComponent, RoutesFeatureStore, SEARCH_TYPES, STYLELIST_OPTIONS, SearchBarComponent, SearchPointerSummaryDirective, SearchResultAddButtonComponent, SearchResultMode, SearchResultsComponent, SearchResultsItemComponent, SearchSelectorComponent, SearchService, SearchSettingsComponent, SearchSource, SearchSourceService, SliceControl, SourceDirectionsType, SpatialFilterItemComponent, SpatialFilterItemType, SpatialFilterListComponent, SpatialFilterQueryType, SpatialFilterService, SpatialFilterType, SpatialFilterTypeComponent, StepFeatureStore, StopsFeatureStore, StopsStore, StoredQueriesReverseSearchSource, StoredQueriesSearchSource, StyleListService, StyleModalComponent, StyleService, SwipeControlComponent, TileArcGISRestDataSource, TileDebugDataSource, TileLayer, TileWatcher, TimeFilterButtonComponent, TimeFilterFormComponent, TimeFilterItemComponent, TimeFilterListBindingDirective, TimeFilterListComponent, TimeFilterService, TimeFilterStyle, TimeFilterType, ToastComponent, TooltipType, TrackFeatureButtonComponent, TypeCapabilities, TypeCatalog, VectorLayer, VectorTileLayer, VectorWatcher, WFSDataSource, WFSService, WMSDataSource, WMTSDataSource, WakeLockButtonComponent, WebSocketDataSource, WfsWorkspace, WfsWorkspaceService, WktService, WorkspaceSelectorDirective, WorkspaceUpdatorDirective, XYZDataSource, ZoomButtonComponent, addDirectionToRoutesFeatureStore, addLayerAndFeaturesStyledToMap, addLayerAndFeaturesToMap, addLinearRingToOlPolygon, addStopToStopsFeatureStore, addStopToStore, buildUrl, checkWfsParams, clearOlGeometryMidpoints, computeBestAreaUnit, computeBestLengthUnit, computeLayerTitleFromFile, computeMVTOptionsOnHover, computeOlFeatureExtent, computeOlFeaturesDiff, computeOlFeaturesExtent, computeProjectionsConstraints, computeRelativePosition, computeStopsPosition, computeTermSimilarity, convertDDToDMS, createDefaultTileGrid, createDrawHoleInteractionStyle, createDrawInteractionStyle, createInteractionStyle, createMeasureInteractionStyle, createMeasureLayerStyle, createOlTooltipAtPoint, createOlTooltipDrawAtPoint, createOverlayDefaultStyle, createOverlayLayer, createOverlayMarkerStyle, ctrlKeyDown, defaultCoordinatesSearchResultFormatterFactory, defaultEpsg, defaultFieldNameGeometry, defaultIChercheSearchResultFormatterFactory, defaultMaxFeatures, defaultWfsVersion, directionsStyle, entitiesToRowData, exportToCSV, featureFromOl, featureToOl, featureToSearchResult, featuresAreOutOfView, featuresAreTooDeepInView, findDiff, formatDistance, formatDuration, formatInstruction, formatMeasure, formatScale, formatWFSQueryString, generateArcgisRestIdFromSourceOptions, generateFeatureIdFromSourceOptions, generateId, generateIdFromSourceOptions, generateWMSIdFromSourceOptions, generateWMTSIdFromSourceOptions, generateWfsIdFromSourceOptions, generateXYZIdFromSourceOptions, getAllChildLayersByDeletion, getAllChildLayersByProperty, getCommonVectorSelectedStyle, getCommonVectorStyle, getDirectChildLayersByDeletion, getDirectChildLayersByProperty, getDirectParentLayerByDeletion, getDirectParentLayerByProperty, getFileExtension, getFormatFromOptions, getIgoLayerByLinkId, getLayersLegends, getLinkedLayersOptions, getMousePositionFromOlGeometryEvent, getOlTooltipAtCenter, getOlTooltipsAtMidpoints, getResolutionFromScale, getRootParentByDeletion, getRootParentByProperty, getRowsInMapExtent, getScaleFromResolution, getSelectedOnly, getTooltipsOfOlGeometry, gmlRegex, handleFileExportError, handleFileExportSuccess, handleFileImportError, handleFileImportSuccess, handleInvalidFileImportError, handleLayerPropertyChange, handleNothingToExportError, handleNothingToImportError, handleOgreServerImportError, handleSRSImportError, handleSizeFileImportError, handleUnreadbleFileImportError, hideOlFeature, hoverFeatureMarker, ichercheReverseSearchSourceFactory, ichercheSearchSourceFactory, ilayerSearchResultFormatterFactory, ilayerSearchSourceFactory, initLayerSyncFromRootParentLayers, initRoutesFeatureStore, initStepFeatureStore, initStopsFeatureStore, jsonRegex, layerFeatureIsQueryable, layerHasLinkDeletion, layerHasLinkWithProperty, layerIsQueryable, lonLatConversion, mapExtentStrategyActiveToolTip, measureOlGeometry, measureOlGeometryArea, measureOlGeometryLength, metersToFeet, metersToKilometers, metersToMiles, metersToUnit, moveToOlFeatures, mtmZoneFromLonLat, noElementSelected, nominatimSearchSourceFactory, ogcFilterWidgetFactory, olLayerFeatureIsQueryable, olLayerIsQueryable, optionsApiFactory, osrmDirectionsSourcesFactory, pointerPositionSummaryMarker, provideCoordinatesReverseSearchSource, provideDefaultCoordinatesSearchResultFormatter, provideDefaultIChercheSearchResultFormatter, provideIChercheReverseSearchSource, provideIChercheSearchSource, provideILayerSearchResultFormatter, provideILayerSearchSource, provideNominatimSearchSource, provideOgcFilterWidget, provideOptionsApi, provideOsrmDirectionsSource, provideSearchSourceService, provideStoredQueriesReverseSearchSource, provideStoredQueriesSearchSource, provideStyleListLoader, provideStyleListOptions, removeStopFromStore, renderFeatureFromOl, roundCoordTo, roundCoordToString, scaleExtent, searchSourceServiceFactory, setRowsInMapExtent, setSelectedOnly, sliceOlGeometry, sliceOlLineString, sliceOlPolygon, sourceCanReverseSearch, sourceCanReverseSearchAsSummary, sourceCanSearch, squareMetersToAcres, squareMetersToHectares, squareMetersToSquareFeet, squareMetersToSquareKilometers, squareMetersToSquareMiles, squareMetersToUnit, standardizeUrl, storedqueriesReverseSearchSourceFactory, storedqueriesSearchSourceFactory, stringToLonLat, styleListFactory, translateBearing, translateModifier, tryAddLoadingStrategy, tryAddSelectionStrategy, tryBindStoreLayer, updateOlGeometryCenter, updateOlGeometryMidpoints, updateOlTooltipAtCenter, updateOlTooltipDrawAtCenter, updateOlTooltipsAtMidpoints, updateOlTooltipsDrawAtMidpoints, updateStoreSorting, utmZoneFromLonLat, viewStatesAreEqual, zoneMtm, zoneUtm };
 //# sourceMappingURL=igo2-geo.mjs.map