@igo2/geo 1.10.0 → 1.11.0

package/fesm2015/igo2-geo.js

@@ -10,7 +10,7 @@ import * as i1$3 from '@angular/material/list';
 import { MatListModule } from '@angular/material/list';
 import * as i3 from '@angular/material/tooltip';
 import { MatTooltipModule } from '@angular/material/tooltip';
-import * as i6$1 from '@igo2/common';
+import * as i6 from '@igo2/common';
 import { getEntityId, getEntityTitle, getEntityProperty, getEntityRevision, getEntityIcon, EntityStore, EntityStoreStrategy, EntityStoreWatcher, SecureImagePipe, IgoListModule, IgoCollapsibleModule, IgoImageModule, IgoPanelModule, IgoMatBadgeIconModule, IgoCustomHtmlModule, IgoEntityTableModule, IgoKeyValueModule, IgoFormModule, IgoFormFieldComponent, EntityStoreFilterSelectionStrategy, EntityTableColumnRenderer, IgoEntityModule, DragAndDropDirective, IgoSpinnerModule, IgoDrapDropModule, IgoConfirmDialogModule, getEntityTitleHtml, EntityStoreFilterCustomFuncStrategy, IgoStopPropagationModule, IgoFlexibleModule, WidgetService, Workspace, ActionStore, IgoWidgetModule } from '@igo2/common';
 import * as i2 from '@angular/material/button';
 import { MatButtonModule } from '@angular/material/button';
@@ -85,7 +85,7 @@ import olFormatMVT from 'ol/format/MVT';
 import { __decorate, __awaiter } from 'tslib';
 import { Cacheable } from 'ts-cacheable';
 import { optionsFromCapabilities } from 'ol/source/WMTS.js';
-import * as i6 from '@igo2/auth';
+import * as i5 from '@igo2/auth';
 import { AuthService } from '@igo2/auth';
 import OlDragBoxInteraction from 'ol/interaction/DragBox';
 import olLayerVectorTile from 'ol/layer/VectorTile';
@@ -108,15 +108,15 @@ import * as i11 from '@angular/material/checkbox';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import * as i10 from '@angular/material/divider';
 import { MatDividerModule } from '@angular/material/divider';
-import * as i5 from '@angular/material/input';
+import * as i5$1 from '@angular/material/input';
 import { MatInputModule } from '@angular/material/input';
-import * as i5$1 from '@angular/material/menu';
+import * as i5$2 from '@angular/material/menu';
 import { MatMenuModule } from '@angular/material/menu';
 import * as i22 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 i6$2 from '@angular/material/autocomplete';
+import * as i6$1 from '@angular/material/autocomplete';
 import { MatAutocompleteModule } from '@angular/material/autocomplete';
 import * as i18 from '@angular/material/button-toggle';
 import { MatButtonToggleModule } from '@angular/material/button-toggle';
@@ -156,6 +156,7 @@ import html2canvas from 'html2canvas';
 import * as JSZip from 'jszip';
 import * as i2$2 from '@angular/cdk/drag-drop';
 import { moveItemInArray, DragDropModule } from '@angular/cdk/drag-drop';
+import Collection from 'ol/Collection';
 
 class MetadataService {
     constructor() { }
@@ -1252,6 +1253,10 @@ class OgcFilterWriter {
         return conditions;
     }
     formatProcessedOgcFilter(processedFilter, layersOrTypenames) {
+        if (!processedFilter) {
+            return undefined;
+        }
+        ;
         let appliedFilter = '';
         if (processedFilter.length === 0 && layersOrTypenames.indexOf(',') === -1) {
             appliedFilter = processedFilter;
@@ -1271,6 +1276,9 @@ class OgcFilterWriter {
         if (!value) {
             return defaultValue;
         }
+        else if (value === 'today') {
+            return undefined;
+        }
         else if (moment$3(value).isValid()) {
             return value;
         }
@@ -1324,7 +1332,7 @@ const jsonRegex = new RegExp(/(.*)?json(.*)?/gi);
  * @param ogcFilters  OgcFiltersOptions
  * @returns A string representing the datasource options, based on filter and views
  */
-function buildUrl(options, extent, proj, ogcFilters) {
+function buildUrl(options, extent, proj, ogcFilters, randomParam) {
     const paramsWFS = options.paramsWFS;
     const queryStringValues = formatWFSQueryString(options, undefined, options.paramsWFS.srsName);
     let igoFilters;
@@ -1344,6 +1352,9 @@ function buildUrl(options, extent, proj, ogcFilters) {
     const patternFilter = /(filter|bbox)=.*/gi;
     baseUrl = patternFilter.test(paramsWFS.xmlFilter) ? `${baseUrl}&${paramsWFS.xmlFilter}` : baseUrl;
     options.download = Object.assign({}, options.download, { dynamicUrl: baseUrl });
+    if (randomParam) {
+        baseUrl += `$&_t${new Date().getTime()}`;
+    }
     return baseUrl.replace(/&&/g, '&');
 }
 /**
@@ -1558,6 +1569,12 @@ class WMSDataSource extends DataSource {
                 || initOgcFilters.radioButtons || initOgcFilters.select)
                 ? false
                 : true;
+            if (initOgcFilters.advancedOgcFilters && initOgcFilters.filters) {
+                const filterDuring = initOgcFilters.filters;
+                if (filterDuring.calendarModeYear) {
+                    initOgcFilters.advancedOgcFilters = false;
+                }
+            }
             if (initOgcFilters.pushButtons) {
                 initOgcFilters.pushButtons.selectorType = 'pushButton';
             }
@@ -1846,7 +1863,9 @@ class LayerSyncWatcher extends Watcher {
                         const layerType = layerToApply.ol.getProperties().sourceOptions.type;
                         layerToApply.dataSource.setOgcFilters(ogcFilters, false);
                         if (layerType === 'wfs') {
-                            layerToApply.ol.getSource().refresh();
+                            if (ogcFilters !== layerToApply.dataSource.ogcFilters$.value) {
+                                layerToApply.ol.getSource().refresh();
+                            }
                         }
                         if (layerType === 'wms') {
                             let appliedOgcFilter;
@@ -1872,8 +1891,10 @@ class LayerSyncWatcher extends Watcher {
                             l.bidirectionnal !== false && l.linkedIds.indexOf(currentLinkedId) !== -1) {
                             const layerType = layer.ol.getProperties().sourceOptions.type;
                             if (layerType === 'wfs') {
-                                layer.dataSource.setOgcFilters(ogcFilters, true);
-                                layer.ol.getSource().refresh();
+                                if (ogcFilters !== layer.dataSource.ogcFilters$.value) {
+                                    layer.dataSource.setOgcFilters(ogcFilters, true);
+                                    layer.ol.getSource().refresh();
+                                }
                             }
                             if (layerType === 'wms') {
                                 let appliedOgcFilter;
@@ -1914,7 +1935,7 @@ class LayerSyncWatcher extends Watcher {
                     });
                     if (childLayer) {
                         childLayer.dataSource.setTimeFilter(timeFilter, false);
-                        const appliedTimeFilter = this.ol.get('values_').source.getParams().TIME;
+                        const appliedTimeFilter = this.ol.getSource().getParams().TIME;
                         childLayer.dataSource.ol.updateParams({ TIME: appliedTimeFilter });
                     }
                 });
@@ -1930,7 +1951,7 @@ class LayerSyncWatcher extends Watcher {
                     parentLayer.options.linkedLayers.links.map(l => {
                         if (l.properties && l.properties.indexOf(LinkedProperties.TIMEFILTER) !== -1 &&
                             l.bidirectionnal !== false && l.linkedIds.indexOf(currentLinkedId) !== -1) {
-                            const appliedTimeFilter = this.ol.get('values_').source.getParams().TIME;
+                            const appliedTimeFilter = this.ol.getSource().getParams().TIME;
                             parentLayer.dataSource.ol.updateParams({ TIME: appliedTimeFilter });
                             parentLayer.dataSource.setTimeFilter(timeFilter, true);
                         }
@@ -2607,6 +2628,14 @@ class Layer {
             : true;
         this.ol.set('_layer', this, true);
     }
+    /**
+     * Define if a layer is generated by code OR defined by layer/context user layer.
+     * Useful for filtering layers list in mapOffline.directive or in the sharemap...
+     * return false by default.
+     */
+    get isIgoInternalLayer() {
+        return this.options.isIgoInternalLayer || false;
+    }
     get id() {
         return this.options.id || this.dataSource.id;
     }
@@ -2891,14 +2920,15 @@ class VectorLayer extends Layer {
      * @param proj the projection to retrieve the data
      * @param success success callback
      * @param failure failure callback
+     * @param randomParam random parameter to ensure cache is not causing problems in retrieving new data
      */
-    customWFSLoader(vectorSource, options, interceptor, extent, resolution, proj, success, failure) {
+    customWFSLoader(vectorSource, options, interceptor, extent, resolution, proj, success, failure, randomParam) {
         {
             const paramsWFS = options.paramsWFS;
             const wfsProj = paramsWFS.srsName ? new olProjection({ code: paramsWFS.srsName }) : proj;
             const currentExtent = olproj.transformExtent(extent, proj, wfsProj);
             paramsWFS.srsName = paramsWFS.srsName || proj.getCode();
-            const url = buildUrl(options, currentExtent, wfsProj, options.ogcFilters);
+            const url = buildUrl(options, currentExtent, wfsProj, options.ogcFilters, randomParam);
             let startIndex = 0;
             if (paramsWFS.version === '2.0.0' && paramsWFS.maxFeatures > defaultMaxFeatures) {
                 const nbOfFeature = 1000;
@@ -2930,6 +2960,7 @@ class VectorLayer extends Layer {
      * @param failure failure callback
      */
     getFeatures(vectorSource, interceptor, extent, dataProjection, featureProjection, url, threshold, success, failure) {
+        const idAssociatedCall = this.dataSource.mostRecentIdCallOGCFilter;
         const xhr = new XMLHttpRequest();
         const alteredUrlWithKeyAuth = interceptor.alterUrlWithKeyAuth(url);
         let modifiedUrl = url;
@@ -2954,8 +2985,14 @@ class VectorLayer extends Layer {
                 /*if (features.length === 0 || features.length < threshold ) {
                   console.log('No more data to download at this resolution');
                 }*/
-                vectorSource.addFeatures(features);
-                success(features);
+                // Avoids retrieving an older call that took longer to be process
+                if (idAssociatedCall === this.dataSource.mostRecentIdCallOGCFilter) {
+                    vectorSource.addFeatures(features);
+                    success(features);
+                }
+                else {
+                    success([]);
+                }
             }
             else {
                 onError();
@@ -3058,6 +3095,7 @@ class WFSDataSource extends DataSource {
         this.options = options;
         this.wfsService = wfsService;
         this.authInterceptor = authInterceptor;
+        this.mostRecentIdCallOGCFilter = 0;
         this.ogcFilters$ = new BehaviorSubject(undefined);
         const ogcFilters = this.options.ogcFilters;
         const fieldNameGeometry = this.options.paramsWFS.fieldNameGeometry || defaultFieldNameGeometry;
@@ -3106,6 +3144,7 @@ class WFSDataSource extends DataSource {
     }
     setOgcFilters(ogcFilters, triggerEvent = false) {
         this.ogcFilters = ogcFilters;
+        this.mostRecentIdCallOGCFilter += 1;
         if (triggerEvent) {
             this.ogcFilters$.next(this.ogcFilters);
         }
@@ -3443,26 +3482,96 @@ class ArcGISRestDataSource extends DataSource {
         if (legendInfo === undefined || legend.length > 0) {
             return legend;
         }
-        const id = parseInt(this.options.layer, 10);
-        const lyr = legendInfo.layers.find(layer => layer.layerId === id);
-        if (!lyr) {
+        if (!legendInfo) {
             return;
         }
         let htmlString = '<table>';
-        for (const lyrLegend of lyr.legend) {
-            const modifiedUrl = this.options.url.replace('FeatureServer', 'MapServer');
-            const src = `${modifiedUrl}/${lyr.layerId}/images/${lyrLegend.url}`;
-            const label = lyrLegend.label.replace('<Null>', 'Null');
-            htmlString +=
-                `<tr><td align='left'><img src="` +
-                    src +
-                    `" alt ='' /></td><td>` +
-                    label +
-                    '</td></tr>';
+        let src;
+        let label;
+        let svg;
+        if (legendInfo.legend) {
+            for (const legendElement of legendInfo.legend) {
+                src = this.htmlImgSrc(legendElement.contentType, legendElement.imageData);
+                label = legendElement.label ? legendElement.label.replace('<Null>', 'Null') : '';
+                htmlString +=
+                    `<tr><td align='left'><img src="` +
+                        src +
+                        `" alt ='' /></td><td class="mat-typography">` +
+                        label +
+                        '</td></tr>';
+            }
+        }
+        else if (legendInfo.type === "uniqueValue") {
+            for (const legendElement of legendInfo.uniqueValueInfos) {
+                label = legendElement.label.replace('<Null>', 'Null');
+                if (legendElement.symbol.type === 'esriPMS') {
+                    src = this.htmlImgSrc(legendElement.symbol.contentType, legendElement.symbol.imageData);
+                    htmlString +=
+                        `<tr><td align='left'><img src="` +
+                            src +
+                            `" alt ='' /></td><td class="mat-typography">` +
+                            label +
+                            '</td></tr>';
+                }
+                else if (legendElement.symbol.type !== 'esriPMS') {
+                    svg = this.createSVG(legendElement.symbol);
+                    htmlString += `<tr><td align='left'>` + svg + `</td><td class="mat-typography">` + label + '</td></tr>';
+                }
+            }
+        }
+        else if (legendInfo.type === "simple") {
+            label = legendInfo.label ? legendInfo.label.replace('<Null>', 'Null') : '';
+            if (legendInfo.symbol.type === 'esriPMS') {
+                src = this.htmlImgSrc(legendInfo.symbol.contentType, legendInfo.symbol.imageData);
+                htmlString +=
+                    `<tr><td align='left'><img src="` +
+                        src +
+                        `" alt ='' /></td><td class="mat-typography">` +
+                        label +
+                        '</td></tr>';
+            }
+            else if (legendInfo.symbol.type !== 'esriPMS') {
+                svg = this.createSVG(legendInfo.symbol);
+                htmlString += `<tr><td align='left'>` + svg + `</td><td class="mat-typography">` + label + '</td></tr>';
+            }
         }
         htmlString += '</table>';
         return [{ html: htmlString }];
     }
+    htmlImgSrc(contentType, imageData) {
+        return `data:${contentType};base64,${imageData}`;
+    }
+    createSVG(symbol) {
+        let svg = '';
+        const color = symbol.color ? symbol.color : [0, 0, 0, 0];
+        if (symbol.type === 'esriSLS') {
+            const width = symbol.width ? symbol.width : 0;
+            const stroke = `stroke:rgba(` + color[0] + ',' + color[1] + ',' + color[2] + ',' + color[3] + ')';
+            const strokeWidth = `stroke-width:` + width;
+            if (symbol.style === 'esriSLSSolid') {
+                svg = `<svg height="30" width="30"><line x1="0" y1="15" x2="30" y2="15" style="` + stroke + ';' + strokeWidth + `"/></svg>`;
+            }
+            else if (symbol.style === 'esriSLSDash') {
+                const strokeDashArray = `stroke-dasharray="5,5"`;
+                svg = `<svg height="30" width="30"><line x1="0" y1="15" x2="30" y2="15" style="` + stroke + ';' + strokeWidth + `" ` + strokeDashArray + `/></svg>`;
+            }
+        }
+        else if (symbol.style === 'esriSMSCircle' || symbol.style === 'esriSFSSolid') {
+            const outlineColor = symbol.outline.color;
+            const outlineWidth = symbol.outline.width;
+            const size = symbol.size;
+            const stroke = `stroke:rgba(` + outlineColor[0] + ',' + outlineColor[1] + ',' + outlineColor[2] + ',' + outlineColor[3] + ')';
+            const strokeWidth = `stroke-width:` + outlineWidth;
+            const fill = `fill:rgba(` + color[0] + ',' + color[1] + ',' + color[2] + ',' + color[3] + ')';
+            if (symbol.style === 'esriSMSCircle') {
+                svg = `<svg height="30" width="30"><circle cx="15" cy="15" r="` + size / 2 + `" style="` + stroke + ';' + strokeWidth + ';' + fill + `"/></svg>`;
+            }
+            else {
+                svg = `<svg height="30" width="30"><rect x="5" y="5" width="20" height="20" style ="` + stroke + ';' + strokeWidth + ';' + fill + `"/></svg>`;
+            }
+        }
+        return svg;
+    }
     onUnwatch() { }
 }
 
@@ -3495,25 +3604,22 @@ class ImageArcGISRestDataSource extends DataSource {
         });
     }
     getLegend() {
-        var _a, _b;
-        const legendInfo = ((_a = this.options.options) === null || _a === void 0 ? void 0 : _a.legendInfo) || ((_b = this.params) === null || _b === void 0 ? void 0 : _b.legendInfo);
+        const legendInfo = this.options.legendInfo;
         const legend = super.getLegend();
         if (legendInfo === undefined || this.options.layer === undefined || legend.length > 0) {
             return legend;
         }
-        const id = parseInt(this.options.layer, 10);
-        const lyr = legendInfo.layers.find(layer => layer.layerId === id);
-        if (!lyr) {
+        if (!legendInfo) {
             return;
         }
         let htmlString = '<table>';
-        for (const lyrLegend of lyr.legend) {
-            const src = `${this.options.url}/${lyr.layerId}/images/${lyrLegend.url}`;
-            const label = lyrLegend.label.replace('<Null>', 'Null');
+        for (const legendElement of legendInfo.legend) {
+            const src = `${this.options.url}/${legendInfo.layerId}/images/${legendElement.url}`;
+            const label = legendElement.label.replace('<Null>', 'Null');
             htmlString +=
                 `<tr><td align='left'><img src="` +
                     src +
-                    `" alt ='' /></td><td>` +
+                    `" alt ='' /></td><td class="mat-typography">` +
                     label +
                     '</td></tr>';
         }
@@ -3546,22 +3652,20 @@ class TileArcGISRestDataSource extends DataSource {
     getLegend() {
         const legendInfo = this.options.legendInfo;
         const legend = super.getLegend();
-        if (legendInfo === undefined || legend.length > 0) {
+        if (legendInfo === undefined || this.options.layer === undefined || legend.length > 0) {
             return legend;
         }
-        const id = parseInt(this.options.layer, 10);
-        const lyr = legendInfo.layers.find(layer => layer.layerId === id);
-        if (!lyr) {
+        if (!legendInfo) {
             return;
         }
         let htmlString = '<table>';
-        for (const lyrLegend of lyr.legend) {
-            const src = `${this.options.url}/${lyr.layerId}/images/${lyrLegend.url}`;
-            const label = lyrLegend.label.replace('<Null>', 'Null');
+        for (const legendElement of legendInfo.legend) {
+            const src = `${this.options.url}/${legendInfo.layerId}/images/${legendElement.url}`;
+            const label = legendElement.label.replace('<Null>', 'Null');
             htmlString +=
                 `<tr><td align='left'><img src="` +
                     src +
-                    `" alt ='' /></td><td>` +
+                    `" alt ='' /></td><td class="mat-typography">` +
                     label +
                     '</td></tr>';
         }
@@ -4287,12 +4391,25 @@ class CapabilitiesService {
         });
         return ObjectUtils.mergeDeep(options, baseOptions);
     }
-    parseArcgisOptions(baseOptions, arcgisOptions, serviceCapabilities, legend) {
+    parseArcgisOptions(baseOptions, arcgisOptions, legend, serviceCapabilities) {
+        var _a;
         const title = arcgisOptions.name;
-        const legendInfo = legend.layers ? legend : undefined;
-        const styleGenerator = new EsriStyleGenerator();
-        const units = arcgisOptions.units === 'esriMeters' ? 'm' : 'degrees';
-        const style = styleGenerator.generateStyle(arcgisOptions, units);
+        let legendInfo;
+        if (legend.layers) {
+            legendInfo = legend.layers.find(x => x.layerName === title);
+        }
+        else if ((_a = arcgisOptions.drawingInfo) === null || _a === void 0 ? void 0 : _a.renderer) {
+            legendInfo = arcgisOptions.drawingInfo.renderer;
+        }
+        else {
+            legendInfo = undefined;
+        }
+        let style;
+        if (arcgisOptions.drawingInfo) {
+            const styleGenerator = new EsriStyleGenerator();
+            const units = arcgisOptions.units === 'esriMeters' ? 'm' : 'degrees';
+            style = styleGenerator.generateStyle(arcgisOptions, units);
+        }
         const attributions = new olAttribution({
             target: arcgisOptions.copyrightText
         });
@@ -4314,10 +4431,9 @@ class CapabilitiesService {
             };
         }
         const params = Object.assign({}, {
-            legendInfo,
             style,
-            timeFilter,
-            timeExtent
+            LAYERS: baseOptions.layer ? 'show:' + baseOptions.layer : undefined,
+            time: timeExtent
         });
         const options = ObjectUtils.removeUndefined({
             params,
@@ -4330,15 +4446,17 @@ class CapabilitiesService {
                     abstract: arcgisOptions.description || serviceCapabilities.serviceDescription
                 },
             },
+            legendInfo,
+            timeFilter,
             sourceFields: arcgisOptions.fields,
             queryTitle: arcgisOptions.displayField
         });
-        options.params.attributions = attributions;
+        options.attributions = attributions;
         return ObjectUtils.mergeDeep(options, baseOptions);
     }
     parseTileOrImageArcgisOptions(baseOptions, arcgisOptions, legend, serviceCapabilities) {
         const title = arcgisOptions.name;
-        const legendInfo = legend.layers ? legend : undefined;
+        const legendInfo = legend.layers ? legend.layers.find(x => x.layerName === title) : undefined;
         const attributions = new olAttribution({
             target: arcgisOptions.copyrightText
         });
@@ -4723,7 +4841,7 @@ class DataSourceService {
         return new Observable(d => d.next(new ClusterDataSource(context)));
     }
 }
-DataSourceService.ɵfac = function DataSourceService_Factory(t) { return new (t || DataSourceService)(i0.ɵɵinject(CapabilitiesService), i0.ɵɵinject(OptionsService, 8), i0.ɵɵinject(WFSService), i0.ɵɵinject(i2$1.LanguageService), i0.ɵɵinject(i2$1.MessageService), i0.ɵɵinject(ProjectionService), i0.ɵɵinject(i6.AuthInterceptor)); };
+DataSourceService.ɵfac = function DataSourceService_Factory(t) { return new (t || DataSourceService)(i0.ɵɵinject(CapabilitiesService), i0.ɵɵinject(OptionsService, 8), i0.ɵɵinject(WFSService), i0.ɵɵinject(i2$1.LanguageService), i0.ɵɵinject(i2$1.MessageService), i0.ɵɵinject(ProjectionService), i0.ɵɵinject(i5.AuthInterceptor)); };
 DataSourceService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: DataSourceService, factory: DataSourceService.ɵfac, providedIn: 'root' });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(DataSourceService, [{
         type: Injectable,
@@ -4732,7 +4850,7 @@ DataSourceService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: DataSo
             }]
     }], function () { return [{ type: CapabilitiesService }, { type: OptionsService, decorators: [{
                 type: Optional
-            }] }, { type: WFSService }, { type: i2$1.LanguageService }, { type: i2$1.MessageService }, { type: ProjectionService }, { type: i6.AuthInterceptor }]; }, null); })();
+            }] }, { type: WFSService }, { type: i2$1.LanguageService }, { type: i2$1.MessageService }, { type: ProjectionService }, { type: i5.AuthInterceptor }]; }, null); })();
 
 class OptionsApiService extends OptionsService {
     constructor(http, options = {}) {
@@ -4954,6 +5072,7 @@ function featureFromOl(olFeature, projectionIn, olLayer, projectionOut = 'EPSG:4
     }
     const mapTitle = olFeature.get('_mapTitle');
     const id = olFeature.getId() ? olFeature.getId() : olFeature.get(idColumn) ? olFeature.get(idColumn) : uuid();
+    const newFeature = olFeature.get('_newFeature');
     return {
         type: FEATURE,
         projection: projectionOut,
@@ -5331,10 +5450,23 @@ class FeatureStoreInMapExtentStrategy extends EntityStoreStrategy {
         if ((_b = (_a = store === null || store === void 0 ? void 0 : store.layer) === null || _a === void 0 ? void 0 : _a.map) === null || _b === void 0 ? void 0 : _b.viewController) {
             store.state.updateAll({ inMapExtent: false });
             const mapExtent = store.layer.map.viewController.getExtent();
-            const entitiesInMapExtent = store.entities$.value
-                .filter((entity) => olextent.intersects(entity.ol.getGeometry().getExtent(), mapExtent));
+            let entitiesInMapExtent = [];
+            let entitiesWithNoGeom = [];
+            for (const entity of store.entities$.value) {
+                if (entity.ol) {
+                    if (olextent.intersects(entity.ol.getGeometry().getExtent(), mapExtent)) {
+                        entitiesInMapExtent.push(entity);
+                    }
+                }
+                else {
+                    entitiesWithNoGeom.push(entity);
+                }
+            }
             if (entitiesInMapExtent.length > 0) {
-                store.state.updateMany(entitiesInMapExtent, { inMapExtent: true }, true);
+                store.state.updateMany(entitiesInMapExtent, { inMapExtent: true }, false);
+            }
+            if (entitiesWithNoGeom.length > 0) {
+                store.state.updateMany(entitiesWithNoGeom, { inMapExtent: true }, false);
             }
         }
     }
@@ -7651,7 +7783,7 @@ MapBrowserComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: MapBrow
         i0.ɵɵprojection(1);
     } if (rf & 2) {
         i0.ɵɵproperty("id", ctx.id);
-    } }, styles: ["[_nghost-%COMP%]{position:relative;display:block}[_nghost-%COMP%], .igo-map-browser-target[_ngcontent-%COMP%]{width:100%;height:100%}[_nghost-%COMP%]     igo-zoom-button{position:absolute;bottom:5px;right:5px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){[_nghost-%COMP%]     igo-zoom-button{display:none}}[_nghost-%COMP%]     igo-offline-button{position:absolute;bottom:15px;right:5px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){[_nghost-%COMP%]     igo-offline-button{bottom:5px}}[_nghost-%COMP%]     igo-geolocate-button{position:absolute;bottom:5px;right:5px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){[_nghost-%COMP%]     igo-geolocate-button{bottom:5px}}[_nghost-%COMP%]     igo-rotation-button{position:absolute;top:calc(40px + 5px + 5px);right:5px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){[_nghost-%COMP%]     igo-rotation-button{top:calc(40px + 5px + 5px)}}[_nghost-%COMP%]     igo-user-button{position:absolute;bottom:5px;right:calc(5px + 50px)}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){[_nghost-%COMP%]     igo-user-button{right:calc(5px + 90px)}}[_nghost-%COMP%]     igo-baselayers-switcher{position:absolute;bottom:5px;left:5px}[_nghost-%COMP%]     .ol-attribution{flex-flow:row;left:calc(40px + 5px + 5px);bottom:5px;text-align:left;padding:0;margin-right:90px;background-color:#fff0;width:calc(100% - 100px)}[_nghost-%COMP%]     .ol-attribution.ol-logo-only{height:inherit}[_nghost-%COMP%]     .ol-attribution.ol-collapsed{background:none}[_nghost-%COMP%]     .ol-attribution.ol-collapsed button{transform:none}[_nghost-%COMP%]     .ol-attribution button{transform:rotate(180deg);background-color:#fff;cursor:pointer;outline:none}[_nghost-%COMP%]     .ol-scale-line-inner{color:#000;border-color:#000;text-shadow:white -1px -1px 3px,white 1px -1px 3px,white -1px 1px 3px,white 1px 1px 4px;box-shadow:0 1px 0 1px #fff9}[_nghost-%COMP%]     .ol-scale-line{background-color:#fff0;bottom:4px;transform:translate(-50%);left:50%}[_nghost-%COMP%]     .ol-scale-bar{background-color:#fff0;bottom:4px;transform:translate(-50%);left:50%}[_nghost-%COMP%]     .ol-scale-text{text-shadow:white -1px -1px 3px,white 1px -1px 3px,white -1px 1px 3px,white 1px 1px 4px}[_nghost-%COMP%]     .ol-scale-step-text{text-shadow:white -1px -1px 3px,white 1px -1px 3px,white -1px 1px 3px,white 1px 1px 4px}[_nghost-%COMP%]     canvas{display:block}"] });
+    } }, styles: ["[_nghost-%COMP%]{position:relative;display:block}[_nghost-%COMP%], .igo-map-browser-target[_ngcontent-%COMP%]{width:100%;height:100%}[_nghost-%COMP%]     igo-zoom-button{position:absolute;bottom:calc(40px + 5px + 5px);right:5px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){[_nghost-%COMP%]     igo-zoom-button{display:none}}[_nghost-%COMP%]     igo-offline-button{position:absolute;bottom:15px;right:5px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){[_nghost-%COMP%]     igo-offline-button{bottom:5px}}[_nghost-%COMP%]     igo-geolocate-button{position:absolute;bottom:5px;right:5px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){[_nghost-%COMP%]     igo-geolocate-button{bottom:5px}}[_nghost-%COMP%]     igo-rotation-button{position:absolute;top:calc(40px + 5px + 5px);right:5px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){[_nghost-%COMP%]     igo-rotation-button{bottom:calc(40px + 5px + 5px)}}[_nghost-%COMP%]     igo-home-extent-button{position:absolute;bottom:calc((3 * 40px) + 5px + (2 * 5px));right:5px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){[_nghost-%COMP%]     igo-home-extent-button{bottom:5px;right:calc((2 * 40px) + (3 * 5px))}}[_nghost-%COMP%]     igo-user-button{position:absolute;bottom:5px;right:calc(5px + 50px)}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){[_nghost-%COMP%]     igo-user-button{right:calc((2 * 40px) + (2 * 5px))}}[_nghost-%COMP%]     igo-baselayers-switcher{position:absolute;bottom:5px;left:5px}[_nghost-%COMP%]     .ol-attribution{flex-flow:row;left:calc(40px + 5px + 5px);bottom:5px;text-align:left;padding:0;margin-right:90px;background-color:#fff0;width:calc(100% - 100px)}[_nghost-%COMP%]     .ol-attribution.ol-logo-only{height:inherit}[_nghost-%COMP%]     .ol-attribution.ol-collapsed{background:none}[_nghost-%COMP%]     .ol-attribution.ol-collapsed button{transform:none}[_nghost-%COMP%]     .ol-attribution button{transform:rotate(180deg);background-color:#fff;cursor:pointer;outline:none}[_nghost-%COMP%]     .ol-scale-line-inner{color:#000;border-color:#000;text-shadow:white -1px -1px 3px,white 1px -1px 3px,white -1px 1px 3px,white 1px 1px 4px;box-shadow:0 1px 0 1px #fff9}[_nghost-%COMP%]     .ol-scale-line{background-color:#fff0;bottom:4px;transform:translate(-50%);left:50%}[_nghost-%COMP%]     .ol-scale-bar{background-color:#fff0;bottom:4px;transform:translate(-50%);left:50%}[_nghost-%COMP%]     .ol-scale-text{text-shadow:white -1px -1px 3px,white 1px -1px 3px,white -1px 1px 3px,white 1px 1px 4px}[_nghost-%COMP%]     .ol-scale-step-text{text-shadow:white -1px -1px 3px,white 1px -1px 3px,white -1px 1px 3px,white 1px 1px 4px}[_nghost-%COMP%]     canvas{display:block}"] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(MapBrowserComponent, [{
         type: Component,
         args: [{
@@ -7684,19 +7816,24 @@ class MapOfflineDirective {
     }
     ngAfterViewInit() {
         this.map.offlineButtonToggle$.subscribe((offlineButtonToggle) => {
+            if (this.previousMessageId) {
+                this.messageService.remove(this.previousMessageId);
+            }
             this.offlineButtonStatus = offlineButtonToggle;
             const translate = this.languageService.translate;
             if (this.offlineButtonStatus && this.networkState.connection) {
                 const message = translate.instant('igo.geo.network.offline.message');
                 const title = translate.instant('igo.geo.network.offline.title');
-                this.messageService.info(message, title);
+                const messageObj = this.messageService.info(message, title);
+                this.previousMessageId = messageObj.toastId;
                 this.offlineButtonState.connection = false;
                 this.changeLayer();
             }
             else if (!this.offlineButtonStatus && !this.networkState.connection) {
                 const message = translate.instant('igo.geo.network.offline.message');
                 const title = translate.instant('igo.geo.network.offline.title');
-                this.messageService.info(message, title);
+                const messageObj = this.messageService.info(message, title);
+                this.previousMessageId = messageObj.toastId;
                 this.offlineButtonState.connection = false;
                 this.changeLayer();
             }
@@ -7711,7 +7848,10 @@ class MapOfflineDirective {
                 titleObs.subscribe((title1) => {
                     title = title1;
                 });
-                this.messageService.info(message, title);
+                if (message) {
+                    const messageObj = this.messageService.info(message, title);
+                    this.previousMessageId = messageObj.toastId;
+                }
                 this.offlineButtonState.connection = true;
                 this.changeLayer();
             }
@@ -7730,6 +7870,9 @@ class MapOfflineDirective {
         let sourceOptions;
         const layerList = this.map.layers$.value;
         layerList.forEach(layer => {
+            if (layer.isIgoInternalLayer) {
+                return;
+            }
             if (layer.options.source instanceof MVTDataSource) {
                 sourceOptions = layer.options.sourceOptions;
                 layer.ol.getSource().refresh();
@@ -7764,7 +7907,7 @@ class MapOfflineDirective {
                         sourceOptions.type === 'cluster') {
                         return;
                     }
-                    // layer.ol.getSource().setUrl(sourceOptions.pathOffline);
+                    layer.ol.getSource().setUrl(sourceOptions.pathOffline);
                 }
                 else if ((sourceOptions.pathOffline &&
                     this.networkState.connection === false) ||
@@ -7774,7 +7917,7 @@ class MapOfflineDirective {
                         sourceOptions.type === 'cluster') {
                         return;
                     }
-                    // layer.ol.getSource().setUrl(sourceOptions.url);
+                    layer.ol.getSource().setUrl(sourceOptions.url);
                 }
                 else {
                     if (this.networkState.connection === false ||
@@ -8183,6 +8326,7 @@ class HoverFeatureDirective {
     initStore() {
         const store = this.store;
         const layer = new VectorLayer({
+            isIgoInternalLayer: true,
             id: 'hoverFeatureId',
             title: 'hoverFeature',
             zIndex: 900,
@@ -8810,6 +8954,67 @@ GeolocateButtonComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: Ge
             type: Input
         }] }); })();
 
+/*
+Button to center the map to the home extent
+*/
+class HomeExtentButtonComponent {
+    constructor(configService) {
+        this.configService = configService;
+        this.computeHomeExtent();
+    }
+    computeHomeExtent() {
+        this.homeExtentButtonExtent = this.extentOverride || this.configService.getConfig('homeExtentButton.homeExtButtonExtent');
+        this.homeExtentButtonCenter = this.centerOverride || this.configService.getConfig('homeExtentButton.homeExtButtonCenter');
+        this.homeExtentButtonZoom = this.zoomOverride || this.configService.getConfig('homeExtentButton.homeExtButtonZoom');
+        // priority over extent if these 2 properties are defined;
+        if (this.centerOverride && this.zoomOverride) {
+            this.homeExtentButtonExtent = undefined;
+        }
+    }
+    onToggleClick() {
+        this.computeHomeExtent();
+        if (this.homeExtentButtonExtent) {
+            this.map.viewController.zoomToExtent(this.homeExtentButtonExtent);
+        }
+        else if (this.homeExtentButtonCenter && this.homeExtentButtonZoom) {
+            const center = olproj.fromLonLat(this.homeExtentButtonCenter, this.map.viewController.olView.getProjection().getCode());
+            this.map.viewController.olView.setCenter(center);
+            this.map.viewController.zoomTo(this.homeExtentButtonZoom);
+        }
+    }
+}
+HomeExtentButtonComponent.ɵfac = function HomeExtentButtonComponent_Factory(t) { return new (t || HomeExtentButtonComponent)(i0.ɵɵdirectiveInject(i2$1.ConfigService)); };
+HomeExtentButtonComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: HomeExtentButtonComponent, selectors: [["igo-home-extent-button"]], inputs: { map: "map", color: "color", extentOverride: "extentOverride", centerOverride: "centerOverride", zoomOverride: "zoomOverride" }, decls: 4, vars: 4, consts: [[1, "igo-home-extent-button-container"], ["mat-icon-button", "", "matTooltipPosition", "left", 3, "matTooltip", "color", "click"], ["svgIcon", "home-map-marker"]], template: function HomeExtentButtonComponent_Template(rf, ctx) { if (rf & 1) {
+        i0.ɵɵelementStart(0, "div", 0);
+        i0.ɵɵelementStart(1, "button", 1);
+        i0.ɵɵlistener("click", function HomeExtentButtonComponent_Template_button_click_1_listener() { return ctx.onToggleClick(); });
+        i0.ɵɵpipe(2, "translate");
+        i0.ɵɵelement(3, "mat-icon", 2);
+        i0.ɵɵelementEnd();
+        i0.ɵɵelementEnd();
+    } if (rf & 2) {
+        i0.ɵɵadvance(1);
+        i0.ɵɵproperty("matTooltip", i0.ɵɵpipeBind1(2, 2, "igo.geo.mapButtons.home-extent"))("color", ctx.color);
+    } }, directives: [i2.MatButton, i3.MatTooltip, i4.MatIcon], pipes: [i7.TranslatePipe], styles: ["@charset \"UTF-8\";.igo-home-extent-button-container[_ngcontent-%COMP%]{width:40px;background-color:#fff}\\a0[_ngcontent-%COMP%]   .igo-home-extent-button-container[_ngcontent-%COMP%]:hover{background-color:#efefef}button[_ngcontent-%COMP%], [_nghost-%COMP%]     button .mat-button-ripple-round{border-radius:0}"] });
+(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(HomeExtentButtonComponent, [{
+        type: Component,
+        args: [{
+                selector: 'igo-home-extent-button',
+                templateUrl: './home-extent-button.component.html',
+                styleUrls: ['./home-extent-button.component.scss'],
+            }]
+    }], function () { return [{ type: i2$1.ConfigService }]; }, { map: [{
+            type: Input
+        }], color: [{
+            type: Input
+        }], extentOverride: [{
+            type: Input
+        }], centerOverride: [{
+            type: Input
+        }], zoomOverride: [{
+            type: Input
+        }] }); })();
+
 const _c0$h = function (a0) { return [a0]; };
 function OfflineButtonComponent_div_0_Template(rf, ctx) { if (rf & 1) {
     const _r2 = i0.ɵɵgetCurrentView();
@@ -9142,14 +9347,14 @@ class LayerService {
         }));
     }
 }
-LayerService.ɵfac = function LayerService_Factory(t) { return new (t || LayerService)(i0.ɵɵinject(i1$2.HttpClient), i0.ɵɵinject(StyleService), i0.ɵɵinject(DataSourceService), i0.ɵɵinject(i2$1.MessageService), i0.ɵɵinject(i2$1.LanguageService), i0.ɵɵinject(i6.AuthInterceptor, 8)); };
+LayerService.ɵfac = function LayerService_Factory(t) { return new (t || LayerService)(i0.ɵɵinject(i1$2.HttpClient), i0.ɵɵinject(StyleService), i0.ɵɵinject(DataSourceService), i0.ɵɵinject(i2$1.MessageService), i0.ɵɵinject(i2$1.LanguageService), i0.ɵɵinject(i5.AuthInterceptor, 8)); };
 LayerService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: LayerService, factory: LayerService.ɵfac, providedIn: 'root' });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(LayerService, [{
         type: Injectable,
         args: [{
                 providedIn: 'root'
             }]
-    }], function () { return [{ type: i1$2.HttpClient }, { type: StyleService }, { type: DataSourceService }, { type: i2$1.MessageService }, { type: i2$1.LanguageService }, { type: i6.AuthInterceptor, decorators: [{
+    }], function () { return [{ type: i1$2.HttpClient }, { type: StyleService }, { type: DataSourceService }, { type: i2$1.MessageService }, { type: i2$1.LanguageService }, { type: i5.AuthInterceptor, decorators: [{
                 type: Optional
             }] }]; }, null); })();
 
@@ -9613,7 +9818,7 @@ MapCenterComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: MapCente
         i0.ɵɵelement(1, "div", 1);
         i0.ɵɵelement(2, "div", 2);
         i0.ɵɵelementEnd();
-    } }, styles: [".mapCenter[_ngcontent-%COMP%]{width:30px;height:30px;position:absolute;top:50%;left:50%;transform:translate(-15px,-15px)}.mapCenter[_ngcontent-%COMP%]   .vertical[_ngcontent-%COMP%], .mapCenter[_ngcontent-%COMP%]   .horizontal[_ngcontent-%COMP%]{width:4px;height:30px;position:absolute;left:13px;background-color:#000}.mapCenter[_ngcontent-%COMP%]   .horizontal[_ngcontent-%COMP%]{transform:rotate(90deg)}"] });
+    } }, styles: [".mapCenter[_ngcontent-%COMP%]{width:30px;height:30px;position:absolute;top:50%;left:50%;transform:translate(-15px,-15px);pointer-events:none}.mapCenter[_ngcontent-%COMP%]   .vertical[_ngcontent-%COMP%], .mapCenter[_ngcontent-%COMP%]   .horizontal[_ngcontent-%COMP%]{width:4px;height:30px;position:absolute;left:13px;background-color:#000}.mapCenter[_ngcontent-%COMP%]   .horizontal[_ngcontent-%COMP%]{transform:rotate(90deg)}"] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(MapCenterComponent, [{
         type: Component,
         args: [{
@@ -9625,6 +9830,39 @@ MapCenterComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: MapCente
             type: Input
         }] }); })();
 
+function InfoSectionComponent_div_0_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "div", 1);
+    i0.ɵɵelementStart(1, "pre");
+    i0.ɵɵtext(2);
+    i0.ɵɵelementEnd();
+    i0.ɵɵelementEnd();
+} if (rf & 2) {
+    const ctx_r0 = i0.ɵɵnextContext();
+    i0.ɵɵadvance(2);
+    i0.ɵɵtextInterpolate(ctx_r0.infoContent);
+} }
+class InfoSectionComponent {
+    constructor() {
+        this.infoContent = '';
+    }
+}
+InfoSectionComponent.ɵfac = function InfoSectionComponent_Factory(t) { return new (t || InfoSectionComponent)(); };
+InfoSectionComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: InfoSectionComponent, selectors: [["igo-info-section"]], inputs: { infoContent: "infoContent" }, decls: 1, vars: 1, consts: [["class", "infoSection", 4, "ngIf"], [1, "infoSection"]], template: function InfoSectionComponent_Template(rf, ctx) { if (rf & 1) {
+        i0.ɵɵtemplate(0, InfoSectionComponent_div_0_Template, 3, 1, "div", 0);
+    } if (rf & 2) {
+        i0.ɵɵproperty("ngIf", ctx.infoContent && ctx.infoContent.length);
+    } }, directives: [i1$1.NgIf], styles: [".infoSection[_ngcontent-%COMP%]{border-radius:10px;background-color:#6e6e6e66;padding:calc(5px / 2);position:absolute;text-align:center;top:5px;left:50%;text-shadow:0 0 5px white,0 0 10px white,0 0 15px white}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.infoSection[_ngcontent-%COMP%]{top:calc(40px + 5px + 5px);left:10%}}"] });
+(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(InfoSectionComponent, [{
+        type: Component,
+        args: [{
+                selector: 'igo-info-section',
+                templateUrl: './info-section.component.html',
+                styleUrls: ['./info-section.component.scss']
+            }]
+    }], function () { return []; }, { infoContent: [{
+            type: Input
+        }] }); })();
+
 var CatalogItemType;
 (function (CatalogItemType) {
     CatalogItemType["Layer"] = "layer";
@@ -9754,16 +9992,19 @@ class QueryService {
             QueryFormat.HTMLGML2) {
             const urlGml = this.getQueryUrl(layer.dataSource, options, true);
             return this.http.get(urlGml, { responseType: 'text' }).pipe(mergeMap(gmlRes => {
-                const imposedGeom = this.mergeGML(gmlRes, url);
+                const mergedGML = this.mergeGML(gmlRes, url, layer);
+                const imposedGeom = mergedGML[0];
+                const imposedProperties = mergedGML[1];
                 return this.http
                     .get(url, { responseType: 'text' })
-                    .pipe(map(res => this.extractData(res, layer, options, url, imposedGeom)));
+                    .pipe(map(res => this.extractData(res, layer, options, url, imposedGeom, imposedProperties)));
             }));
         }
         const request = this.http.get(url, { responseType: 'text' });
         return request.pipe(map(res => this.extractData(res, layer, options, url)));
     }
-    mergeGML(gmlRes, url) {
+    mergeGML(gmlRes, url, layer) {
+        var _a, _b;
         const parser = new olFormatGML2();
         let features = parser.readFeatures(gmlRes);
         // Handle non standard GML output (MapServer)
@@ -9785,7 +10026,22 @@ class QueryService {
         const bboxExtent = olextent.createEmpty();
         olextent.extend(bboxExtent, bbox);
         const outBboxExtent = false;
+        let titleContent;
+        let queryTileField;
+        if ((_b = (_a = layer.options) === null || _a === void 0 ? void 0 : _a.source) === null || _b === void 0 ? void 0 : _b.options) {
+            const dataSourceOptions = layer.options.source
+                .options;
+            if (dataSourceOptions.queryTitle) {
+                queryTileField = dataSourceOptions.queryTitle;
+            }
+        }
         features.map(feature => {
+            if (queryTileField) {
+                let queryTitleContent = feature.getProperties()[queryTileField];
+                if (queryTitleContent) {
+                    titleContent = !titleContent ? queryTitleContent : `${titleContent},${queryTitleContent}`;
+                }
+            }
             /*  if (!feature.getGeometry().simplify(100).intersectsExtent(bboxExtent)) {
               outBboxExtent = true;
               // TODO: Check to project the geometry?
@@ -9832,27 +10088,31 @@ class QueryService {
                 coordinates: [this.convexHull(ptsArray)]
             };
         }
+        let returnGeometry;
         switch (firstFeatureType) {
             case 'LineString':
-                return {
+                returnGeometry = {
                     type: olmline.getType(),
                     coordinates: olmline.getCoordinates()
                 };
             case 'Point':
                 return olmpts;
             case 'Polygon':
-                return {
+                returnGeometry = {
                     type: olmpoly.getType(),
                     coordinates: olmpoly.getCoordinates()
                 };
             case 'MultiPolygon':
-                return {
+                returnGeometry = {
                     type: olmpoly.getType(),
                     coordinates: olmpoly.getCoordinates()
                 };
-            default:
-                return;
         }
+        const imposedProperties = {};
+        if (queryTileField) {
+            imposedProperties[queryTileField] = titleContent;
+        }
+        return [returnGeometry, imposedProperties];
     }
     cross(a, b, o) {
         return (a[0] - o[0]) * (b[1] - o[1]) - (a[1] - o[1]) * (b[0] - o[0]);
@@ -9886,7 +10146,7 @@ class QueryService {
         lower.pop();
         return lower.concat(upper);
     }
-    extractData(res, layer, options, url, imposedGeometry) {
+    extractData(res, layer, options, url, imposedGeometry, imposedProperties) {
         const queryDataSource = layer.dataSource;
         const allowedFieldsAndAlias = this.getAllowedFieldsAndAlias(layer);
         let features = [];
@@ -9909,7 +10169,7 @@ class QueryService {
                 features = this.extractHtmlData(res, queryDataSource.queryHtmlTarget, url);
                 break;
             case QueryFormat.HTMLGML2:
-                features = this.extractHtmlData(res, queryDataSource.queryHtmlTarget, url, imposedGeometry);
+                features = this.extractHtmlData(res, queryDataSource.queryHtmlTarget, url, imposedGeometry, imposedProperties);
                 break;
             case QueryFormat.GML2:
             default:
@@ -10065,7 +10325,7 @@ class QueryService {
         // TODO
         return [];
     }
-    extractHtmlData(res, htmlTarget, url, imposedGeometry) {
+    extractHtmlData(res, htmlTarget, url, imposedGeometry, imposedProperties) {
         const searchParams = this.getQueryParams(url.toLowerCase());
         const projection = searchParams.crs || searchParams.srs || 'EPSG:3857';
         const geomToAdd = this.createGeometryFromUrlClick(url);
@@ -10085,7 +10345,7 @@ class QueryService {
             {
                 type: FEATURE,
                 projection,
-                properties: { target: htmlTarget, body: res, url },
+                properties: Object.assign({ target: htmlTarget, body: res, url }, imposedProperties),
                 geometry: imposedGeometry || geomToAdd
             }
         ];
@@ -10439,6 +10699,9 @@ class QueryDirective {
         if (event.type === 'singleclick') {
             this.map.ol.forEachFeatureAtPixel(event.pixel, (featureOL, layerOL) => {
                 const layer = this.map.getLayerById(layerOL.values_._layer.id);
+                if (layer.dataSource.options.queryFormatAsWms) {
+                    return;
+                }
                 if (featureOL) {
                     if (featureOL.get('features')) {
                         for (const feature of featureOL.get('features')) {
@@ -10725,7 +10988,7 @@ class SearchSource {
                         hashtagsValid.push(types[index]);
                     }
                 }
-                if (conf.hashtags && conf.hashtags.indexOf(hashtagKey) !== -1) {
+                if (conf.hashtags && conf.hashtags.indexOf(hashtagKey.toLowerCase()) !== -1) {
                     hashtagsValid.push(conf.value);
                 }
             });
@@ -11282,7 +11545,10 @@ class CatalogService {
         if (!capabilities) {
             return [];
         }
-        const layers = capabilities.layers.filter(layer => !layer.type || layer.type === 'Feature Layer');
+        const layers = !capabilities.layers ? [] : capabilities.layers.filter(layer => !layer.type || layer.type === 'Feature Layer');
+        if (!capabilities.layers) {
+            this.messageService.error(this.languageService.translate.instant('igo.geo.catalog.someUnavailable'), this.languageService.translate.instant('igo.geo.catalog.unavailableTitle'));
+        }
         const regexes = (catalog.regFilters || []).map((pattern) => new RegExp(pattern));
         let abstract;
         if (capabilities.serviceDescription && capabilities.serviceDescription.length) {
@@ -11523,7 +11789,7 @@ class CatalogBrowserComponent {
      */
     addLayersToMap(layers) {
         const layers$ = layers.map((layer) => {
-            if (layer.options.sourceOptions.optionsFromApi === undefined) {
+            if (!layer.options.sourceOptions.optionsFromApi) {
                 layer.options.sourceOptions.optionsFromApi = true;
             }
             return this.layerService.createAsyncLayer(layer.options);
@@ -11832,13 +12098,11 @@ class LayerLegendComponent {
         let lastlLegend = this.layer.legend;
         this.styles = this.listStyles();
         const sourceOptions = this.layer.options.source.options;
-        if (sourceOptions &&
-            sourceOptions.params &&
-            sourceOptions.params.STYLES) {
+        if (sourceOptions && sourceOptions.params && sourceOptions.params.STYLES) {
             // if a styles is provided into the layers wms params
             this.currentStyle = this.styles.find(style => style.name === sourceOptions.params.STYLES).name;
         }
-        else if (!this.layer.legend) {
+        else if (!lastlLegend) {
             // if no legend is manually provided
             if (this.styles && this.styles.length > 1) {
                 this.currentStyle = this.styles[0].name;
@@ -11853,10 +12117,9 @@ class LayerLegendComponent {
         else {
             lastlLegend = this.layer.dataSource.getLegend(this.currentStyle, this.view);
         }
-        if (this.updateLegendOnResolutionChange === true || sourceOptions.contentDependentLegend) {
+        if (this.updateLegendOnResolutionChange || sourceOptions.contentDependentLegend) {
             const state$ = this.layer.map.viewController.state$;
-            this.state$$ = state$
-                .subscribe(() => this.onViewControllerStateChange());
+            this.state$$ = state$.subscribe(() => this.onViewControllerStateChange());
         }
         else if (lastlLegend && lastlLegend.length !== 0) {
             this.legendItems$.next(lastlLegend);
@@ -11874,20 +12137,22 @@ class LayerLegendComponent {
         }
     }
     getLegendGraphic(item) {
-        const secureIMG = new SecureImagePipe(this.http);
-        secureIMG.transform(item.url).pipe(catchError((err) => {
-            if (err.error) {
-                err.error.caught = true;
-                this.getLegend = false;
+        if (item.url) {
+            const secureIMG = new SecureImagePipe(this.http);
+            secureIMG.transform(item.url).pipe(catchError((err) => {
+                if (err.error) {
+                    err.error.caught = true;
+                    this.getLegend = false;
+                    this.cdRef.detectChanges();
+                    return err;
+                }
+            })).subscribe(obsLegGraph => {
+                const idx = this.legendItems$.value.findIndex(leg => leg.title === item.title);
+                const legendGraph = obsLegGraph;
+                this.legendItems$.value[idx].imgGraphValue = legendGraph;
                 this.cdRef.detectChanges();
-                return err;
-            }
-        })).subscribe(obsLegGraph => {
-            const idx = this.legendItems$.value.findIndex(leg => leg.title === item.title);
-            const legendGraph = obsLegGraph;
-            this.legendItems$.value[idx].imgGraphValue = legendGraph;
-            this.cdRef.detectChanges();
-        });
+            });
+        }
     }
     toggleLegendItem(collapsed, item) {
         item.collapsed = collapsed;
@@ -11993,7 +12258,7 @@ LayerLegendComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: LayerL
         i0.ɵɵpipe(1, "async");
     } if (rf & 2) {
         i0.ɵɵproperty("ngIf", i0.ɵɵpipeBind1(1, 1, ctx.legendItems$));
-    } }, directives: [i1$1.NgIf, i1$1.NgForOf, i1$1.NgClass, i1$3.MatListItem, i4.MatIcon, i1$3.MatListAvatarCssMatStyler, i6$1.CollapseDirective, i9.MatLine, i12.MatFormField, i13.MatSelect, i3.MatTooltip, i16.NgControlStatus, i16.NgModel, i9.MatOption, i1$1.NgStyle], pipes: [i1$1.AsyncPipe, i7.TranslatePipe, i6$1.SanitizeHtmlPipe], styles: [".igo-layer-legend.with-title[_ngcontent-%COMP%]{padding-left:18px}img[_ngcontent-%COMP%]:after{content:\" \";position:relative;height:17px;float:left;width:17px;top:-3px;right:19px;background-color:#fff;border:3px solid #f3f3f3;border-radius:50%;-webkit-animation:2s linear infinite spin;animation:2s linear infinite spin}@-moz-document url-prefix(){img:after{margin-left:19px}}@-webkit-keyframes spin{0%{transform:rotate(0)}to{transform:rotate(360deg)}}@keyframes spin{0%{transform:rotate(0)}to{transform:rotate(360deg)}}"], changeDetection: 0 });
+    } }, directives: [i1$1.NgIf, i1$1.NgForOf, i1$1.NgClass, i1$3.MatListItem, i4.MatIcon, i1$3.MatListAvatarCssMatStyler, i6.CollapseDirective, i9.MatLine, i12.MatFormField, i13.MatSelect, i3.MatTooltip, i16.NgControlStatus, i16.NgModel, i9.MatOption, i1$1.NgStyle], pipes: [i1$1.AsyncPipe, i7.TranslatePipe, i6.SanitizeHtmlPipe], styles: [".igo-layer-legend.with-title[_ngcontent-%COMP%]{padding-left:18px}img[_ngcontent-%COMP%]:after{content:\" \";position:relative;height:17px;float:left;width:17px;top:-3px;right:19px;background-color:#fff;border:3px solid #f3f3f3;border-radius:50%;-webkit-animation:2s linear infinite spin;animation:2s linear infinite spin}@-moz-document url-prefix(){img:after{margin-left:19px}}@-webkit-keyframes spin{0%{transform:rotate(0)}to{transform:rotate(360deg)}}@keyframes spin{0%{transform:rotate(0)}to{transform:rotate(360deg)}}"], changeDetection: 0 });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(LayerLegendComponent, [{
         type: Component,
         args: [{
@@ -12244,7 +12509,7 @@ CatalogBrowserLayerComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type
         i0.ɵɵproperty("matBadgeHidden", ctx.isInResolutionsRange())("svgIcon", i0.ɵɵpipeBind1(10, 15, ctx.isPreview$) ? "plus" : ctx.added ? "delete" : "plus");
         i0.ɵɵadvance(4);
         i0.ɵɵproperty("ngIf", i0.ɵɵpipeBind1(14, 17, ctx.layerLegendShown$) && i0.ɵɵpipeBind1(15, 19, ctx.igoLayer$) && ctx.catalogAllowLegend);
-    } }, directives: [i1$3.MatListItem, i1$1.NgIf, i9.MatLine, i1$1.NgClass, i3.MatTooltip, MetadataButtonComponent, i2.MatButton, i4.MatIcon, i9$1.MatBadge, i6$1.IgoBadgeIconDirective, i1$3.MatListAvatarCssMatStyler, LayerLegendComponent], pipes: [i7.TranslatePipe, i1$1.AsyncPipe], styles: [".igo-cataloglayer-title[_ngcontent-%COMP%]{cursor:pointer}.igo-cataloglayer-legend-container[_ngcontent-%COMP%]{padding-left:18px;width:calc(100% - 18px);margin-left:40px}.igo-cataloglayer-external-icon[_ngcontent-%COMP%]{cursor:help}"], changeDetection: 0 });
+    } }, directives: [i1$3.MatListItem, i1$1.NgIf, i9.MatLine, i1$1.NgClass, i3.MatTooltip, MetadataButtonComponent, i2.MatButton, i4.MatIcon, i9$1.MatBadge, i6.IgoBadgeIconDirective, i1$3.MatListAvatarCssMatStyler, LayerLegendComponent], pipes: [i7.TranslatePipe, i1$1.AsyncPipe], styles: [".igo-cataloglayer-title[_ngcontent-%COMP%]{cursor:pointer}.igo-cataloglayer-legend-container[_ngcontent-%COMP%]{padding-left:18px;width:calc(100% - 18px);margin-left:40px}.igo-cataloglayer-external-icon[_ngcontent-%COMP%]{cursor:help}"], changeDetection: 0 });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CatalogBrowserLayerComponent, [{
         type: Component,
         args: [{
@@ -12529,7 +12794,7 @@ CatalogBrowserGroupComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type
         i0.ɵɵproperty("ngIf", i0.ɵɵpipeBind1(6, 8, ctx.added$) && i0.ɵɵpipeBind1(7, 10, ctx.preview$) === false)("ngIfElse", _r2);
         i0.ɵɵadvance(7);
         i0.ɵɵproperty("ngForOf", i0.ɵɵpipeBind1(13, 12, ctx.store.view.all$()));
-    } }, directives: [i1$3.MatListItem, i4.MatIcon, i1$3.MatListAvatarCssMatStyler, i6$1.CollapseDirective, i9.MatLine, i3.MatTooltip, i1$1.NgIf, i1$1.NgForOf, i2.MatButton, CatalogBrowserLayerComponent, i6$1.ListItemDirective], pipes: [i1$1.AsyncPipe, i7.TranslatePipe], styles: [".igo-catalog-group-title[_ngcontent-%COMP%]{cursor:pointer;opacity:.9}#catalog-group-title[_ngcontent-%COMP%]{font-weight:bold}.igo-cataloggroup-external-icon[_ngcontent-%COMP%]{cursor:help}"], changeDetection: 0 });
+    } }, directives: [i1$3.MatListItem, i4.MatIcon, i1$3.MatListAvatarCssMatStyler, i6.CollapseDirective, i9.MatLine, i3.MatTooltip, i1$1.NgIf, i1$1.NgForOf, i2.MatButton, CatalogBrowserLayerComponent, i6.ListItemDirective], pipes: [i1$1.AsyncPipe, i7.TranslatePipe], styles: [".igo-catalog-group-title[_ngcontent-%COMP%]{cursor:pointer;opacity:.9}#catalog-group-title[_ngcontent-%COMP%]{font-weight:bold}.igo-cataloggroup-external-icon[_ngcontent-%COMP%]{cursor:help}"], changeDetection: 0 });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CatalogBrowserGroupComponent, [{
         type: Component,
         args: [{
@@ -14061,7 +14326,7 @@ LayerListToolComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: Laye
         i0.ɵɵproperty("matTooltip", ctx.selectionMode ? i0.ɵɵpipeBind1(17, 26, "igo.geo.layer.deactivateSelectionMode") : i0.ɵɵpipeBind1(18, 28, "igo.geo.layer.activateSelectionMode"));
         i0.ɵɵadvance(4);
         i0.ɵɵproperty("svgIcon", ctx.selectionMode ? "checkbox-multiple-marked-outline" : "checkbox-multiple-blank-outline");
-    } }, directives: [i1$3.MatListItem, i12.MatFormField, i5.MatInput, i16.DefaultValueAccessor, i3.MatTooltip, i16.NgControlStatus, i16.NgModel, i1$1.NgIf, i2.MatButton, i4.MatIcon, i9$1.MatBadge, i6$1.IgoBadgeIconDirective, i12.MatSuffix], pipes: [i7.TranslatePipe], styles: ["mat-form-field.inputFilter[_ngcontent-%COMP%]{width:calc(100% - 100px);max-width:200px}.selection-mode[_ngcontent-%COMP%]{margin-left:5px}"], changeDetection: 0 });
+    } }, directives: [i1$3.MatListItem, i12.MatFormField, i5$1.MatInput, i16.DefaultValueAccessor, i3.MatTooltip, i16.NgControlStatus, i16.NgModel, i1$1.NgIf, i2.MatButton, i4.MatIcon, i9$1.MatBadge, i6.IgoBadgeIconDirective, i12.MatSuffix], pipes: [i7.TranslatePipe], styles: ["mat-form-field.inputFilter[_ngcontent-%COMP%]{width:calc(100% - 100px);max-width:200px}.selection-mode[_ngcontent-%COMP%]{margin-left:5px}"], changeDetection: 0 });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(LayerListToolComponent, [{
         type: Component,
         args: [{
@@ -14644,8 +14909,8 @@ IgoLayerModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [[
         TrackFeatureButtonComponent] }); })();
 i0.ɵɵsetComponentScope(LayerItemComponent, [i1$3.MatListItem, i1$1.NgIf, i11.MatCheckbox, i1$3.MatListIconCssMatStyler, i9.MatLine, i3.MatTooltip, i2.MatButton, i4.MatIcon, i9$1.MatBadge, i1$1.NgClass, LayerLegendComponent], [i7.TranslatePipe, i1$1.AsyncPipe]);
 i0.ɵɵsetComponentScope(LayerLegendItemComponent, [i1$3.MatListItem, i9.MatLine, i3.MatTooltip, LayerLegendComponent], []);
-i0.ɵɵsetComponentScope(LayerListComponent, [i1$3.MatList, i1$1.NgIf, LayerListToolComponent, i1$3.MatListItem, i11.MatCheckbox, i10.MatDivider, i6$1.ListComponent, i1$1.NgClass, i1$1.NgForOf, LayerItemComponent, i6$1.ListItemDirective, i6$1.PanelComponent, i2.MatButton, i3.MatTooltip, i4.MatIcon, i9$1.MatBadge, i5$1.MatMenuTrigger, i5$1.MatMenu, i13$1.MatSlider, i1$1.NgTemplateOutlet, i16.NgControlStatus, i16.NgModel], [i1$1.AsyncPipe, i7.TranslatePipe]);
-i0.ɵɵsetComponentScope(LayerLegendListComponent, [i1$1.NgIf, i22.MatSlideToggle, i3.MatTooltip, i10.MatDivider, i6$1.ListComponent, i1$1.NgForOf, LayerLegendItemComponent, i6$1.ListItemDirective], [i7.TranslatePipe, i1$1.AsyncPipe]);
+i0.ɵɵsetComponentScope(LayerListComponent, [i1$3.MatList, i1$1.NgIf, LayerListToolComponent, i1$3.MatListItem, i11.MatCheckbox, i10.MatDivider, i6.ListComponent, i1$1.NgClass, i1$1.NgForOf, LayerItemComponent, i6.ListItemDirective, i6.PanelComponent, i2.MatButton, i3.MatTooltip, i4.MatIcon, i9$1.MatBadge, i5$2.MatMenuTrigger, i5$2.MatMenu, i13$1.MatSlider, i1$1.NgTemplateOutlet, i16.NgControlStatus, i16.NgModel], [i1$1.AsyncPipe, i7.TranslatePipe]);
+i0.ɵɵsetComponentScope(LayerLegendListComponent, [i1$1.NgIf, i22.MatSlideToggle, i3.MatTooltip, i10.MatDivider, i6.ListComponent, i1$1.NgForOf, LayerLegendItemComponent, i6.ListItemDirective], [i7.TranslatePipe, i1$1.AsyncPipe]);
 
 /**
  * @ignore
@@ -14709,8 +14974,8 @@ IgoCatalogBrowserModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [
         IgoCollapsibleModule,
         IgoMetadataModule,
         IgoLayerModule], exports: [CatalogBrowserComponent] }); })();
-i0.ɵɵsetComponentScope(CatalogBrowserComponent, [i6$1.ListComponent, i1$1.NgForOf, i1$1.NgIf, CatalogBrowserGroupComponent,
-    CatalogBrowserLayerComponent, i6$1.ListItemDirective], [i1$1.AsyncPipe]);
+i0.ɵɵsetComponentScope(CatalogBrowserComponent, [i6.ListComponent, i1$1.NgForOf, i1$1.NgIf, CatalogBrowserGroupComponent,
+    CatalogBrowserLayerComponent, i6.ListItemDirective], [i1$1.AsyncPipe]);
 
 function AddCatalogDialogComponent_mat_option_11_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "mat-option", 17);
@@ -14914,7 +15179,7 @@ AddCatalogDialogComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: A
         i0.ɵɵproperty("disabled", !ctx.form.valid);
         i0.ɵɵadvance(1);
         i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(33, 23, "igo.geo.catalog.library.add"), " ");
-    } }, directives: [i1.MatDialogTitle, i1.MatDialogContent, i16.ɵNgNoValidate, i16.NgControlStatusGroup, i16.FormGroupDirective, i12.MatFormField, i16.DefaultValueAccessor, i5.MatInput, i6$2.MatAutocompleteTrigger, i16.NgControlStatus, i16.FormControlName, i6$2.MatAutocomplete, i1$1.NgForOf, i13.MatSelect, i1$1.NgIf, i1.MatDialogActions, i2.MatButton, i9.MatOption, i3.MatTooltip, i9.MatLine], pipes: [i7.TranslatePipe, i1$1.AsyncPipe], styles: ["mat-form-field[_ngcontent-%COMP%]{width:100%}.add-catalog-button-top-padding[_ngcontent-%COMP%]{padding-top:25px}.igo-form[_ngcontent-%COMP%]{padding:10px 5px 5px}.igo-form-button-group[_ngcontent-%COMP%]{text-align:center}button[_ngcontent-%COMP%]{cursor:pointer}button#addCatalogBtnDialog[disabled=true][_ngcontent-%COMP%]{cursor:default;background-color:#0000001f;color:#00000042}.error[_ngcontent-%COMP%]{color:red}"] });
+    } }, directives: [i1.MatDialogTitle, i1.MatDialogContent, i16.ɵNgNoValidate, i16.NgControlStatusGroup, i16.FormGroupDirective, i12.MatFormField, i16.DefaultValueAccessor, i5$1.MatInput, i6$1.MatAutocompleteTrigger, i16.NgControlStatus, i16.FormControlName, i6$1.MatAutocomplete, i1$1.NgForOf, i13.MatSelect, i1$1.NgIf, i1.MatDialogActions, i2.MatButton, i9.MatOption, i3.MatTooltip, i9.MatLine], pipes: [i7.TranslatePipe, i1$1.AsyncPipe], styles: ["mat-form-field[_ngcontent-%COMP%]{width:100%}.add-catalog-button-top-padding[_ngcontent-%COMP%]{padding-top:25px}.igo-form[_ngcontent-%COMP%]{padding:10px 5px 5px}.igo-form-button-group[_ngcontent-%COMP%]{text-align:center}button[_ngcontent-%COMP%]{cursor:pointer}button#addCatalogBtnDialog[disabled=true][_ngcontent-%COMP%]{cursor:default;background-color:#0000001f;color:#00000042}.error[_ngcontent-%COMP%]{color:red}"] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(AddCatalogDialogComponent, [{
         type: Component,
         args: [{
@@ -15048,23 +15313,23 @@ class CatalogLibaryComponent {
             this.messageService.error(message, title);
             throw e;
         }))
-            .subscribe((capabilies) => {
+            .subscribe((capabilities) => {
             let title;
             let version;
             switch (addedCatalog.type) {
                 case 'wms':
-                    title = addedCatalog.title || capabilies.Service.Title;
-                    version = addedCatalog.version || capabilies.version;
+                    title = addedCatalog.title || capabilities.Service.Title;
+                    version = addedCatalog.version || capabilities.version;
                     break;
                 case 'arcgisrest':
                 case 'imagearcgisrest':
                 case 'tilearcgisrest':
-                    title = addedCatalog.title || capabilies.mapName;
+                    title = addedCatalog.title || capabilities.mapName;
                     break;
                 case 'wmts':
                     title =
                         addedCatalog.title ||
-                            capabilies.ServiceIdentification.ServiceType;
+                            capabilities.ServiceIdentification.ServiceType;
                     break;
                 default:
                     title = addedCatalog.title;
@@ -15288,7 +15553,7 @@ IgoCatalogLibraryModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [
         MatAutocompleteModule,
         MatDialogModule], exports: [CatalogLibaryComponent,
         AddCatalogDialogComponent] }); })();
-i0.ɵɵsetComponentScope(CatalogLibaryComponent, [i6$1.ListComponent, i1$1.NgForOf, CatalogLibaryItemComponent, i6$1.ListItemDirective, i1$1.NgIf, i2.MatButton, i3.MatTooltip, i4.MatIcon], [i1$1.AsyncPipe, i7.TranslatePipe]);
+i0.ɵɵsetComponentScope(CatalogLibaryComponent, [i6.ListComponent, i1$1.NgForOf, CatalogLibaryItemComponent, i6.ListItemDirective, i1$1.NgIf, i2.MatButton, i3.MatTooltip, i4.MatIcon], [i1$1.AsyncPipe, i7.TranslatePipe]);
 
 class IgoCatalogModule {
 }
@@ -16271,7 +16536,7 @@ FeatureDetailsComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: Fea
         i0.ɵɵproperty("ngIf", ctx.ready && ctx.feature && ctx.isObject(ctx.feature.properties) && ctx.feature.properties.target !== "iframe");
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("ngIf", ctx.isHtmlDisplay());
-    } }, directives: [i1$1.NgIf, i1$1.NgForOf, i4.MatIcon], pipes: [i6$1.KeyValuePipe, i7.TranslatePipe, i1$1.AsyncPipe, i6$1.SecureImagePipe, i1$1.JsonPipe], styles: ["table[_ngcontent-%COMP%]{width:100%}table[_ngcontent-%COMP%]   td[_ngcontent-%COMP%]{padding:5px}#keyValue[_ngcontent-%COMP%]{width:30%}table[_ngcontent-%COMP%]     .routing{cursor:pointer}iframe[_ngcontent-%COMP%]{height:calc(100% - 4px);width:100%;border:0}"], changeDetection: 0 });
+    } }, directives: [i1$1.NgIf, i1$1.NgForOf, i4.MatIcon], pipes: [i6.KeyValuePipe, i7.TranslatePipe, i1$1.AsyncPipe, i6.SecureImagePipe, i1$1.JsonPipe], styles: ["table[_ngcontent-%COMP%]{width:100%}table[_ngcontent-%COMP%]   td[_ngcontent-%COMP%]{padding:5px}#keyValue[_ngcontent-%COMP%]{width:30%}table[_ngcontent-%COMP%]     .routing{cursor:pointer}iframe[_ngcontent-%COMP%]{height:calc(100% - 4px);width:100%;border:0}"], changeDetection: 0 });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(FeatureDetailsComponent, [{
         type: Component,
         args: [{
@@ -16385,7 +16650,7 @@ FeatureFormComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: Featur
         i0.ɵɵelementEnd();
     } if (rf & 2) {
         i0.ɵɵproperty("form", ctx.form)("formData", i0.ɵɵpipeBind1(2, 2, ctx.feature$));
-    } }, directives: [i6$1.FormComponent], pipes: [i1$1.AsyncPipe], styles: ["[_nghost-%COMP%]{display:block}igo-form[_ngcontent-%COMP%]{height:100%}"], changeDetection: 0 });
+    } }, directives: [i6.FormComponent], pipes: [i1$1.AsyncPipe], styles: ["[_nghost-%COMP%]{display:block}igo-form[_ngcontent-%COMP%]{height:100%}"], changeDetection: 0 });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(FeatureFormComponent, [{
         type: Component,
         args: [{
@@ -16580,6 +16845,10 @@ class DrawControl {
          * Draw select observable (modify drawn features)
          */
         this.select$ = new Subject();
+        /**
+         * Draw abort observable (abort drawn features)
+         */
+        this.abort$ = new Subject();
         /**
          * Freehand mode observable (defaults to false)
          */
@@ -16703,6 +16972,7 @@ class DrawControl {
         this.olDrawInteraction = olDrawInteraction;
         this.onDrawStartKey = olDrawInteraction.on('drawstart', (event) => this.onDrawStart(event));
         this.onDrawEndKey = olDrawInteraction.on('drawend', (event) => this.onDrawEnd(event));
+        this.onDrawAbortKey = olDrawInteraction.on('drawabort', (event) => this.abort$.next(event.feature.getGeometry()));
         if (activateModifyAndSelect) {
             // Create a Modify interaction, add it to map and create a listener
             const olModifyInteraction = new OlModify({
@@ -16727,7 +16997,7 @@ class DrawControl {
      */
     removeOlInteractions() {
         this.unsubscribeKeyDown();
-        unByKey([this.onDrawStartKey, this.onDrawEndKey, this.onDrawKey]);
+        unByKey([this.onDrawStartKey, this.onDrawEndKey, this.onDrawKey, this.onDrawAbortKey]);
         if (this.olMap) {
             this.olMap.removeInteraction(this.olDrawInteraction);
             this.olMap.removeInteraction(this.olModifyInteraction);
@@ -16853,7 +17123,7 @@ DrawPopupComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: DrawPopu
         i0.ɵɵtextInterpolate1("", i0.ɵɵpipeBind1(11, 9, "igo.geo.draw.noLabel"), " ");
         i0.ɵɵadvance(2);
         i0.ɵɵproperty("mat-dialog-close", _r0.value);
-    } }, directives: [i1.MatDialogContent, i12.MatFormField, i5.MatInput, i1.MatDialogActions, i2.MatButton, i1.MatDialogClose], pipes: [i7.TranslatePipe], styles: [""] });
+    } }, directives: [i1.MatDialogContent, i12.MatFormField, i5$1.MatInput, i1.MatDialogActions, i2.MatButton, i1.MatDialogClose], pipes: [i7.TranslatePipe], styles: [""] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(DrawPopupComponent, [{
         type: Component,
         args: [{
@@ -17862,6 +18132,7 @@ class DrawComponent {
     initStore() {
         this.map.removeLayer(this.olDrawingLayer);
         this.olDrawingLayer = new VectorLayer({
+            isIgoInternalLayer: true,
             id: 'igo-draw-layer',
             title: this.languageService.translate.instant('igo.geo.draw.drawing'),
             zIndex: 200,
@@ -18288,7 +18559,7 @@ DrawComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: DrawComponent
         i0.ɵɵproperty("store", ctx.store)("template", ctx.tableTemplate);
         i0.ɵɵadvance(3);
         i0.ɵɵproperty("matTooltip", i0.ɵɵpipeBind1(54, 76, "igo.geo.draw.shortcuts"));
-    } }, directives: [i18.MatButtonToggleGroup, i18.MatButtonToggle, i22.MatSlideToggle, i16.ɵNgNoValidate, i16.NgControlStatusGroup, i16.FormGroupDirective, i4.MatIcon, i12.MatFormField, i3.MatTooltip, i12.MatLabel, i16.DefaultValueAccessor, i5.MatInput, i16.NgControlStatus, i16.FormControlName, i12$1.ColorPickerDirective, i1$1.NgIf, i10.MatDivider, i6$1.EntityTableComponent, i2.MatButton, i13.MatSelect, i13.MatSelectTrigger, i9.MatOption, i1$1.NgForOf], pipes: [i7.TranslatePipe, i1$1.AsyncPipe], 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)}.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}img[_ngcontent-%COMP%]{width:100%;height:100%}.deleteBtn[_ngcontent-%COMP%]{margin-left:12px}"], changeDetection: 0 });
+    } }, directives: [i18.MatButtonToggleGroup, i18.MatButtonToggle, i22.MatSlideToggle, i16.ɵNgNoValidate, i16.NgControlStatusGroup, i16.FormGroupDirective, i4.MatIcon, i12.MatFormField, i3.MatTooltip, i12.MatLabel, i16.DefaultValueAccessor, i5$1.MatInput, i16.NgControlStatus, i16.FormControlName, i12$1.ColorPickerDirective, i1$1.NgIf, i10.MatDivider, i6.EntityTableComponent, i2.MatButton, i13.MatSelect, i13.MatSelectTrigger, i9.MatOption, i1$1.NgForOf], pipes: [i7.TranslatePipe, i1$1.AsyncPipe], 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)}.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}img[_ngcontent-%COMP%]{width:100%;height:100%}.deleteBtn[_ngcontent-%COMP%]{margin-left:12px}"], changeDetection: 0 });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(DrawComponent, [{
         type: Component,
         args: [{
@@ -19991,6 +20262,7 @@ class MeasurerComponent {
         const store = this.store;
         const layer = new VectorLayer({
             title: this.languageService.translate.instant('igo.geo.measure.layerTitle'),
+            isIgoInternalLayer: true,
             id: `igo-measures-${uuid()}`,
             zIndex: 200,
             source: new FeatureDataSource(),
@@ -20126,6 +20398,11 @@ class MeasurerComponent {
             .subscribe((olGeometry) => this.onDrawEnd(olGeometry));
         this.drawChanges$$ = drawControl.changes$
             .subscribe((olGeometry) => this.onDrawChanges(olGeometry));
+        this.drawChanges$$ = drawControl.abort$
+            .subscribe((olGeometry) => {
+            this.clearTooltipsOfOlGeometry(olGeometry);
+            this.clearMeasures();
+        });
         drawControl.setOlMap(this.map.ol, false);
     }
     /**
@@ -21220,7 +21497,7 @@ GeometryFormFieldComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type:
         i0.ɵɵproperty("ngIf", ctx.geometryTypeField);
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("ngIf", ctx.drawGuideField);
-    } }, directives: [GeometryFormFieldInputComponent, i16.NgControlStatus, i16.FormControlDirective, i1$1.NgIf, i18.MatButtonToggleGroup, i16.NgModel, i18.MatButtonToggle, i12.MatFormField, i5.MatInput, i16.NumberValueAccessor, i16.DefaultValueAccessor, i4.MatIcon, i12.MatPrefix, i12.MatSuffix], pipes: [i1$1.AsyncPipe, i7.TranslatePipe], styles: ["[_nghost-%COMP%]{display:block;width:100%}.geometry-type-toggle[_ngcontent-%COMP%], .draw-guide-field[_ngcontent-%COMP%]{width:100%}.geometry-type-toggle[_ngcontent-%COMP%]{padding:10px;text-align:center}.draw-guide-field[_ngcontent-%COMP%]   mat-icon[_ngcontent-%COMP%]{margin:0 10px}.draw-guide-units[_ngcontent-%COMP%]{padding:10px}"], changeDetection: 0 });
+    } }, directives: [GeometryFormFieldInputComponent, i16.NgControlStatus, i16.FormControlDirective, i1$1.NgIf, i18.MatButtonToggleGroup, i16.NgModel, i18.MatButtonToggle, i12.MatFormField, i5$1.MatInput, i16.NumberValueAccessor, i16.DefaultValueAccessor, i4.MatIcon, i12.MatPrefix, i12.MatSuffix], pipes: [i1$1.AsyncPipe, i7.TranslatePipe], styles: ["[_nghost-%COMP%]{display:block;width:100%}.geometry-type-toggle[_ngcontent-%COMP%], .draw-guide-field[_ngcontent-%COMP%]{width:100%}.geometry-type-toggle[_ngcontent-%COMP%]{padding:10px;text-align:center}.draw-guide-field[_ngcontent-%COMP%]   mat-icon[_ngcontent-%COMP%]{margin:0 10px}.draw-guide-units[_ngcontent-%COMP%]{padding:10px}"], changeDetection: 0 });
 GeometryFormFieldComponent = __decorate([
     IgoFormFieldComponent('geometry')
 ], GeometryFormFieldComponent);
@@ -22149,7 +22426,7 @@ TimeFilterFormComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: Tim
         i0.ɵɵproperty("ngIf", !ctx.isRange && ctx.style === "slider" && ctx.type === "year");
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("ngIf", ctx.style === "slider" && ctx.type !== "year");
-    } }, directives: [i1$1.NgIf, i12.MatFormField, i4$1.MatDatetimepickerToggle, i12.MatSuffix, i4$1.MatDatetimepicker, i5.MatInput, i4$1.MatDatetimepickerInput, i16.DefaultValueAccessor, i16.NgControlStatus, i16.NgModel, i13.MatSelect, i1$1.NgForOf, i9.MatOption, i13$1.MatSlider, i22.MatSlideToggle, i3.MatTooltip, i2.MatButton, i4.MatIcon], pipes: [i7.TranslatePipe], styles: [".igo-layer-filters-container[_ngcontent-%COMP%]{padding-left:5px}mat-slider[_ngcontent-%COMP%]     div.mat-slider-thumb-label{width:32px;height:32px;margin:0 auto}mat-slider[_ngcontent-%COMP%]     span.mat-slider-thumb-label-text{font-size:10px}#time-slider[_ngcontent-%COMP%]{width:70%;margin:0 auto}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){#time-slider[_ngcontent-%COMP%]{width:60%;margin:0 auto}}.date-below[_ngcontent-%COMP%]{margin:0}mat-form-field[_ngcontent-%COMP%]{text-align:center}mat-datetimepicker-toggle[_ngcontent-%COMP%]     .mat-icon{padding-bottom:30px}.igo-layer-actions-container[_ngcontent-%COMP%] > .mat-slide-toggle[_ngcontent-%COMP%]{vertical-align:middle}"] });
+    } }, directives: [i1$1.NgIf, i12.MatFormField, i4$1.MatDatetimepickerToggle, i12.MatSuffix, i4$1.MatDatetimepicker, i5$1.MatInput, i4$1.MatDatetimepickerInput, i16.DefaultValueAccessor, i16.NgControlStatus, i16.NgModel, i13.MatSelect, i1$1.NgForOf, i9.MatOption, i13$1.MatSlider, i22.MatSlideToggle, i3.MatTooltip, i2.MatButton, i4.MatIcon], pipes: [i7.TranslatePipe], styles: [".igo-layer-filters-container[_ngcontent-%COMP%]{padding-left:5px}mat-slider[_ngcontent-%COMP%]     div.mat-slider-thumb-label{width:32px;height:32px;margin:0 auto}mat-slider[_ngcontent-%COMP%]     span.mat-slider-thumb-label-text{font-size:10px}#time-slider[_ngcontent-%COMP%]{width:70%;margin:0 auto}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){#time-slider[_ngcontent-%COMP%]{width:60%;margin:0 auto}}.date-below[_ngcontent-%COMP%]{margin:0}mat-form-field[_ngcontent-%COMP%]{text-align:center}mat-datetimepicker-toggle[_ngcontent-%COMP%]     .mat-icon{padding-bottom:30px}.igo-layer-actions-container[_ngcontent-%COMP%] > .mat-slide-toggle[_ngcontent-%COMP%]{vertical-align:middle}"] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(TimeFilterFormComponent, [{
         type: Component,
         args: [{
@@ -22373,22 +22650,22 @@ class WktService {
     extentToWkt(epsgTO, extent, extentProj) {
         let currentExtent = olproj.transformExtent(extent, extentProj, epsgTO);
         currentExtent = this.roundCoordinateArray(currentExtent, epsgTO, 0);
-        const wktPoly = `POLYGON((
-      ${extent[0]} ${extent[1]},
-      ${extent[0]} ${extent[3]},
-      ${extent[2]} ${extent[3]},
-      ${extent[2]} ${extent[1]},
+        const wktPoly = `POLYGON((
+      ${extent[0]} ${extent[1]},
+      ${extent[0]} ${extent[3]},
+      ${extent[2]} ${extent[3]},
+      ${extent[2]} ${extent[1]},
       ${extent[0]} ${extent[1]}))`;
-        const wktLine = `LINESTRING(
-      ${extent[0]} ${extent[1]},
-      ${extent[0]} ${extent[3]},
-      ${extent[2]} ${extent[3]},
-      ${extent[2]} ${extent[1]},
+        const wktLine = `LINESTRING(
+      ${extent[0]} ${extent[1]},
+      ${extent[0]} ${extent[3]},
+      ${extent[2]} ${extent[3]},
+      ${extent[2]} ${extent[1]},
       ${extent[0]} ${extent[1]})`;
-        const wktMultiPoints = `MULTIPOINT(
-        ${extent[0]} ${extent[1]},
-        ${extent[0]} ${extent[3]},
-        ${extent[2]} ${extent[3]},
+        const wktMultiPoints = `MULTIPOINT(
+        ${extent[0]} ${extent[1]},
+        ${extent[0]} ${extent[3]},
+        ${extent[2]} ${extent[3]},
         ${extent[2]} ${extent[1]})`;
         return {
             wktPoly,
@@ -23746,6 +24023,20 @@ class OgcFilterButtonComponent {
         else if (filter && filter.filters && filter.filters.filters) {
             return filter.filters.filters.length;
         }
+        if (filter.filters && filter.filters.operator === 'During' && filter.filters.active &&
+            filter.interfaceOgcFilters && filter.interfaceOgcFilters[0].active) {
+            const filterActiveValue = filter.interfaceOgcFilters[0];
+            if (filter.filters.calendarModeYear) {
+                // year mode check just year
+                if ((filterActiveValue.begin.substring(0, 4) !== this.options.minDate.substring(0, 4)) ||
+                    (filterActiveValue.end.substring(0, 4) !== this.options.maxDate.substring(0, 4))) {
+                    cnt += 1;
+                }
+            }
+            else if ((filterActiveValue.begin !== this.options.minDate) || (filterActiveValue.end !== this.options.maxDate)) {
+                cnt += 1;
+            }
+        }
         return cnt > 0 ? cnt : undefined;
     }
     get layer() {
@@ -24327,23 +24618,41 @@ function OgcFilterSelectionComponent_div_1_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵadvance(1);
     i0.ɵɵproperty("ngIf", selector_r2.selectorType === "select");
 } }
+function OgcFilterSelectionComponent_div_2_h4_2_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "h4");
+    i0.ɵɵtext(1);
+    i0.ɵɵpipe(2, "translate");
+    i0.ɵɵelementEnd();
+} if (rf & 2) {
+    i0.ɵɵadvance(1);
+    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(2, 1, "igo.geo.filter.reportingDate"));
+} }
+function OgcFilterSelectionComponent_div_2_h4_3_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "h4");
+    i0.ɵɵtext(1);
+    i0.ɵɵelementEnd();
+} if (rf & 2) {
+    const ctx_r93 = i0.ɵɵnextContext(2);
+    i0.ɵɵadvance(1);
+    i0.ɵɵtextInterpolate(ctx_r93.currentFilter.title);
+} }
 function OgcFilterSelectionComponent_div_2_Template(rf, ctx) { if (rf & 1) {
-    const _r93 = i0.ɵɵgetCurrentView();
+    const _r95 = i0.ɵɵgetCurrentView();
     i0.ɵɵelementStart(0, "div");
     i0.ɵɵelement(1, "mat-divider");
-    i0.ɵɵelementStart(2, "h4");
-    i0.ɵɵtext(3);
-    i0.ɵɵpipe(4, "translate");
-    i0.ɵɵelementEnd();
-    i0.ɵɵelementStart(5, "igo-ogc-filter-time", 46);
-    i0.ɵɵlistener("datasourceChange", function OgcFilterSelectionComponent_div_2_Template_igo_ogc_filter_time_datasourceChange_5_listener($event) { i0.ɵɵrestoreView(_r93); const ctx_r92 = i0.ɵɵnextContext(); return ctx_r92.datasource = $event; })("currentFilterChange", function OgcFilterSelectionComponent_div_2_Template_igo_ogc_filter_time_currentFilterChange_5_listener($event) { i0.ɵɵrestoreView(_r93); const ctx_r94 = i0.ɵɵnextContext(); return ctx_r94.currentFilter = $event; })("changeProperty", function OgcFilterSelectionComponent_div_2_Template_igo_ogc_filter_time_changeProperty_5_listener($event) { i0.ɵɵrestoreView(_r93); const ctx_r95 = i0.ɵɵnextContext(); return ctx_r95.changeProperty($event.value, $event.pos); });
+    i0.ɵɵtemplate(2, OgcFilterSelectionComponent_div_2_h4_2_Template, 3, 3, "h4", 2);
+    i0.ɵɵtemplate(3, OgcFilterSelectionComponent_div_2_h4_3_Template, 2, 1, "h4", 2);
+    i0.ɵɵelementStart(4, "igo-ogc-filter-time", 46);
+    i0.ɵɵlistener("datasourceChange", function OgcFilterSelectionComponent_div_2_Template_igo_ogc_filter_time_datasourceChange_4_listener($event) { i0.ɵɵrestoreView(_r95); const ctx_r94 = i0.ɵɵnextContext(); return ctx_r94.datasource = $event; })("currentFilterChange", function OgcFilterSelectionComponent_div_2_Template_igo_ogc_filter_time_currentFilterChange_4_listener($event) { i0.ɵɵrestoreView(_r95); const ctx_r96 = i0.ɵɵnextContext(); return ctx_r96.currentFilter = $event; })("changeProperty", function OgcFilterSelectionComponent_div_2_Template_igo_ogc_filter_time_changeProperty_4_listener($event) { i0.ɵɵrestoreView(_r95); const ctx_r97 = i0.ɵɵnextContext(); return ctx_r97.changeProperty($event.value, $event.pos); });
     i0.ɵɵelementEnd();
     i0.ɵɵelementEnd();
 } if (rf & 2) {
     const ctx_r1 = i0.ɵɵnextContext();
-    i0.ɵɵadvance(3);
-    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(4, 3, "igo.geo.filter.reportingDate"));
     i0.ɵɵadvance(2);
+    i0.ɵɵproperty("ngIf", !ctx_r1.currentFilter.title);
+    i0.ɵɵadvance(1);
+    i0.ɵɵproperty("ngIf", ctx_r1.currentFilter.title);
+    i0.ɵɵadvance(1);
     i0.ɵɵproperty("datasource", ctx_r1.datasource)("currentFilter", ctx_r1.currentFilter);
 } }
 class OgcFilterSelectionComponent {
@@ -24697,7 +25006,7 @@ class OgcFilterSelectionComponent {
                 });
             }
         }
-        if (this.isTemporalOperator()) {
+        if (this.isTemporalOperator() && this._currentFilter.active) {
             conditions.push(this.datasource.options.ogcFilters.interfaceOgcFilters[0]);
         }
         if (conditions.length >= 1) {
@@ -24790,14 +25099,14 @@ OgcFilterSelectionComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type:
         i0.ɵɵelementStart(0, "form", 0);
         i0.ɵɵtemplate(1, OgcFilterSelectionComponent_div_1_Template, 5, 4, "div", 1);
         i0.ɵɵelementEnd();
-        i0.ɵɵtemplate(2, OgcFilterSelectionComponent_div_2_Template, 6, 5, "div", 2);
+        i0.ɵɵtemplate(2, OgcFilterSelectionComponent_div_2_Template, 5, 4, "div", 2);
     } if (rf & 2) {
         i0.ɵɵproperty("formGroup", ctx.form);
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("ngForOf", ctx.ogcFiltersSelectors);
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("ngIf", ctx.isTemporalOperator());
-    } }, styles: [".mat-button-toggle-group[_ngcontent-%COMP%]{margin:5px;flex-wrap:wrap;box-shadow:none}.checkboxes[_ngcontent-%COMP%]{flex-wrap:wrap;box-shadow:none}.groupsSelector[_ngcontent-%COMP%]{text-align:center}mat-button-toggle[_ngcontent-%COMP%]{display:inline-flex;border:1.5px solid black;border-radius:5px;margin:5px;white-space:normal;min-height:40px;height:auto;width:150px}mat-button-toggle[_ngcontent-%COMP%]     .mat-button-toggle-label-content{line-height:unset;font-size:small;display:block}  .material-tooltip{white-space:pre-wrap}mat-checkbox[_ngcontent-%COMP%], mat-radio-button[_ngcontent-%COMP%]{margin:7px;width:95%;display:inline-flex;font-size:larger}mat-checkbox[_ngcontent-%COMP%]     label, mat-radio-button[_ngcontent-%COMP%]     label{white-space:normal}mat-checkbox[_ngcontent-%COMP%]{vertical-align:middle}mat-button[_ngcontent-%COMP%]{padding-right:10px}h4[_ngcontent-%COMP%]{margin:7px;text-align:left}u[_ngcontent-%COMP%]{cursor:pointer;color:#00f;margin:5px}p[_ngcontent-%COMP%]{margin:unset}igo-ogc-filter-time[_ngcontent-%COMP%]     .datetime-input{width:140px;margin:10px 0 5px 10px}"] });
+    } }, styles: [".mat-button-toggle-group[_ngcontent-%COMP%]{margin:5px;flex-wrap:wrap;box-shadow:none}.checkboxes[_ngcontent-%COMP%]{flex-wrap:wrap;box-shadow:none}.groupsSelector[_ngcontent-%COMP%]{text-align:center}mat-button-toggle[_ngcontent-%COMP%]{display:inline-flex;border:1.5px solid black;border-radius:5px;margin:5px;white-space:normal;min-height:40px;height:auto;width:150px}mat-button-toggle[_ngcontent-%COMP%]     .mat-button-toggle-label-content{line-height:unset;font-size:small;display:block}  .material-tooltip{white-space:pre-wrap}mat-checkbox[_ngcontent-%COMP%], mat-radio-button[_ngcontent-%COMP%]{margin:7px;width:95%;display:inline-flex;font-size:larger}mat-checkbox[_ngcontent-%COMP%]     label, mat-radio-button[_ngcontent-%COMP%]     label{white-space:normal}mat-checkbox[_ngcontent-%COMP%]{vertical-align:middle}mat-button[_ngcontent-%COMP%]{padding-right:10px}h4[_ngcontent-%COMP%]{margin:7px;text-align:left}u[_ngcontent-%COMP%]{cursor:pointer;color:#00f;margin:5px}p[_ngcontent-%COMP%]{margin:unset}"] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(OgcFilterSelectionComponent, [{
         type: Component,
         args: [{
@@ -25158,7 +25467,7 @@ SpatialFilterListComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type:
         i0.ɵɵproperty("value", ctx.measureUnit);
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("ngForOf", ctx.measureUnits);
-    } }, directives: [i16.ɵNgNoValidate, i16.NgControlStatusGroup, i16.NgForm, i12.MatFormField, i5.MatInput, i16.DefaultValueAccessor, i6$2.MatAutocompleteTrigger, i16.NgControlStatus, i16.FormControlDirective, i6$2.MatAutocomplete, i1$1.NgForOf, i16.NumberValueAccessor, i13.MatSelect, i9.MatOption], pipes: [i7.TranslatePipe, i1$1.AsyncPipe], styles: [".buffer-div[_ngcontent-%COMP%]{display:flex;width:100%;margin-left:2px;padding:5px}.zone-list[_ngcontent-%COMP%]{padding:5px;width:95%;margin-left:2px}.buffer[_ngcontent-%COMP%]{display:flex;flex-flow:column nowrap;width:110%}.unit-field[_ngcontent-%COMP%]{width:110px;margin-left:30px}"], changeDetection: 0 });
+    } }, directives: [i16.ɵNgNoValidate, i16.NgControlStatusGroup, i16.NgForm, i12.MatFormField, i5$1.MatInput, i16.DefaultValueAccessor, i6$1.MatAutocompleteTrigger, i16.NgControlStatus, i16.FormControlDirective, i6$1.MatAutocomplete, i1$1.NgForOf, i16.NumberValueAccessor, i13.MatSelect, i9.MatOption], pipes: [i7.TranslatePipe, i1$1.AsyncPipe], styles: [".buffer-div[_ngcontent-%COMP%]{display:flex;width:100%;margin-left:2px;padding:5px}.zone-list[_ngcontent-%COMP%]{padding:5px;width:95%;margin-left:2px}.buffer[_ngcontent-%COMP%]{display:flex;flex-flow:column nowrap;width:110%}.unit-field[_ngcontent-%COMP%]{width:110px;margin-left:30px}"], changeDetection: 0 });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(SpatialFilterListComponent, [{
         type: Component,
         args: [{
@@ -26304,7 +26613,7 @@ function OgcFilterTimeComponent_div_2_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵproperty("begin", ctx_r1.beginValue)("max", ctx_r1.restrictedToStep() ? ctx_r1.maxDate : ctx_r1.endValue)("currentFilter", ctx_r1.currentFilter)("datasource", ctx_r1.datasource);
 } }
 function OgcFilterTimeComponent_div_3_div_1_Template(rf, ctx) { if (rf & 1) {
-    const _r16 = i0.ɵɵgetCurrentView();
+    const _r15 = i0.ɵɵgetCurrentView();
     i0.ɵɵelementStart(0, "div", 9);
     i0.ɵɵelementStart(1, "mat-form-field", 10);
     i0.ɵɵelementStart(2, "mat-label");
@@ -26312,11 +26621,11 @@ function OgcFilterTimeComponent_div_3_div_1_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵpipe(4, "translate");
     i0.ɵɵelementEnd();
     i0.ɵɵelementStart(5, "input", 11);
-    i0.ɵɵlistener("change", function OgcFilterTimeComponent_div_3_div_1_Template_input_change_5_listener($event) { i0.ɵɵrestoreView(_r16); const _r11 = i0.ɵɵreference(8); const ctx_r15 = i0.ɵɵnextContext(2); return ctx_r15.yearOnlyInputChange($event, _r11, "begin"); });
+    i0.ɵɵlistener("change", function OgcFilterTimeComponent_div_3_div_1_Template_input_change_5_listener($event) { i0.ɵɵrestoreView(_r15); const _r10 = i0.ɵɵreference(8); const ctx_r14 = i0.ɵɵnextContext(2); return ctx_r14.yearOnlyInputChange($event, _r10, "begin"); });
     i0.ɵɵelementEnd();
     i0.ɵɵelement(6, "mat-datepicker-toggle", 12);
     i0.ɵɵelementStart(7, "mat-datepicker", 13, 14);
-    i0.ɵɵlistener("yearSelected", function OgcFilterTimeComponent_div_3_div_1_Template_mat_datepicker_yearSelected_7_listener($event) { i0.ɵɵrestoreView(_r16); const _r11 = i0.ɵɵreference(8); const ctx_r17 = i0.ɵɵnextContext(2); return ctx_r17.yearSelected($event, _r11, "begin"); });
+    i0.ɵɵlistener("yearSelected", function OgcFilterTimeComponent_div_3_div_1_Template_mat_datepicker_yearSelected_7_listener($event) { i0.ɵɵrestoreView(_r15); const _r10 = i0.ɵɵreference(8); const ctx_r16 = i0.ɵɵnextContext(2); return ctx_r16.yearSelected($event, _r10, "begin"); });
     i0.ɵɵelementEnd();
     i0.ɵɵelement(9, "input", 15, 16);
     i0.ɵɵelementEnd();
@@ -26325,240 +26634,278 @@ function OgcFilterTimeComponent_div_3_div_1_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵtext(13);
     i0.ɵɵpipe(14, "translate");
     i0.ɵɵelementEnd();
-    i0.ɵɵelement(15, "input", 17);
+    i0.ɵɵelementStart(15, "input", 11);
+    i0.ɵɵlistener("change", function OgcFilterTimeComponent_div_3_div_1_Template_input_change_15_listener($event) { i0.ɵɵrestoreView(_r15); const _r12 = i0.ɵɵreference(18); const ctx_r17 = i0.ɵɵnextContext(2); return ctx_r17.yearOnlyInputChange($event, _r12, "end"); });
+    i0.ɵɵelementEnd();
     i0.ɵɵelement(16, "mat-datepicker-toggle", 12);
-    i0.ɵɵelementStart(17, "mat-datepicker", 13, 18);
-    i0.ɵɵlistener("yearSelected", function OgcFilterTimeComponent_div_3_div_1_Template_mat_datepicker_yearSelected_17_listener($event) { i0.ɵɵrestoreView(_r16); const _r13 = i0.ɵɵreference(18); const ctx_r18 = i0.ɵɵnextContext(2); return ctx_r18.yearSelected($event, _r13, "end"); });
+    i0.ɵɵelementStart(17, "mat-datepicker", 13, 17);
+    i0.ɵɵlistener("yearSelected", function OgcFilterTimeComponent_div_3_div_1_Template_mat_datepicker_yearSelected_17_listener($event) { i0.ɵɵrestoreView(_r15); const _r12 = i0.ɵɵreference(18); const ctx_r18 = i0.ɵɵnextContext(2); return ctx_r18.yearSelected($event, _r12, "end"); });
+    i0.ɵɵelementEnd();
+    i0.ɵɵelement(19, "input", 15, 18);
     i0.ɵɵelementEnd();
-    i0.ɵɵelement(19, "input", 15, 19);
+    i0.ɵɵelementStart(21, "button", 19);
+    i0.ɵɵlistener("click", function OgcFilterTimeComponent_div_3_div_1_Template_button_click_21_listener() { i0.ɵɵrestoreView(_r15); const ctx_r19 = i0.ɵɵnextContext(2); return ctx_r19.resetFilter(); });
+    i0.ɵɵpipe(22, "translate");
+    i0.ɵɵelement(23, "mat-icon", 20);
+    i0.ɵɵelementEnd();
+    i0.ɵɵelementStart(24, "mat-slide-toggle", 21);
+    i0.ɵɵlistener("change", function OgcFilterTimeComponent_div_3_div_1_Template_mat_slide_toggle_change_24_listener() { i0.ɵɵrestoreView(_r15); const ctx_r20 = i0.ɵɵnextContext(2); return ctx_r20.toggleFilterState(); });
+    i0.ɵɵpipe(25, "translate");
     i0.ɵɵelementEnd();
     i0.ɵɵelementEnd();
 } if (rf & 2) {
-    const _r11 = i0.ɵɵreference(8);
-    const _r13 = i0.ɵɵreference(18);
+    const _r10 = i0.ɵɵreference(8);
+    const _r12 = i0.ɵɵreference(18);
     const ctx_r8 = i0.ɵɵnextContext(2);
     i0.ɵɵadvance(3);
-    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(4, 18, "igo.geo.timeFilter.startYear"));
+    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(4, 27, "igo.geo.timeFilter.startYear"));
     i0.ɵɵadvance(2);
     i0.ɵɵpropertyInterpolate("value", ctx_r8.onlyYearBegin);
+    i0.ɵɵproperty("disabled", ctx_r8.filterStateDisable);
     i0.ɵɵadvance(1);
-    i0.ɵɵproperty("for", _r11);
+    i0.ɵɵproperty("for", _r10)("disabled", ctx_r8.filterStateDisable);
     i0.ɵɵadvance(1);
     i0.ɵɵproperty("startView", ctx_r8.calendarView())("startAt", ctx_r8.beginValue);
     i0.ɵɵadvance(2);
-    i0.ɵɵproperty("matDatepicker", _r11)("value", ctx_r8.beginValue ? ctx_r8.beginValue : ctx_r8.handleDate(ctx_r8.datasource.options.minDate))("min", ctx_r8.handleDate(ctx_r8.datasource.options.minDate))("max", ctx_r8.endValue && !ctx_r8.restrictedToStep() ? ctx_r8.endValue : ctx_r8.handleDate(ctx_r8.datasource.options.maxDate));
+    i0.ɵɵproperty("matDatepicker", _r10)("value", ctx_r8.beginValue ? ctx_r8.beginValue : ctx_r8.handleDate(ctx_r8.datasource.options.minDate))("min", ctx_r8.handleDate(ctx_r8.datasource.options.minDate))("max", ctx_r8.endValue && !ctx_r8.restrictedToStep() ? ctx_r8.endValue : ctx_r8.handleDate(ctx_r8.datasource.options.maxDate));
     i0.ɵɵadvance(4);
-    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(14, 20, "igo.geo.timeFilter.endYear"));
+    i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(14, 29, "igo.geo.timeFilter.endYear"));
     i0.ɵɵadvance(2);
     i0.ɵɵpropertyInterpolate("value", ctx_r8.onlyYearEnd);
+    i0.ɵɵproperty("disabled", ctx_r8.filterStateDisable);
     i0.ɵɵadvance(1);
-    i0.ɵɵproperty("for", _r13);
+    i0.ɵɵproperty("for", _r12)("disabled", ctx_r8.filterStateDisable);
     i0.ɵɵadvance(1);
     i0.ɵɵproperty("startView", ctx_r8.calendarView())("startAt", ctx_r8.endValue);
     i0.ɵɵadvance(2);
-    i0.ɵɵproperty("matDatepicker", _r13)("value", ctx_r8.endValue ? ctx_r8.endValue : ctx_r8.handleDate(ctx_r8.datasource.options.maxDate))("min", ctx_r8.beginValue ? ctx_r8.beginValue : ctx_r8.handleDate(ctx_r8.datasource.options.minDate))("max", ctx_r8.handleDate(ctx_r8.datasource.options.maxDate));
+    i0.ɵɵproperty("matDatepicker", _r12)("value", ctx_r8.endValue ? ctx_r8.endValue : ctx_r8.handleDate(ctx_r8.datasource.options.maxDate))("min", ctx_r8.beginValue ? ctx_r8.beginValue : ctx_r8.handleDate(ctx_r8.datasource.options.minDate))("max", ctx_r8.handleDate(ctx_r8.datasource.options.maxDate));
+    i0.ɵɵadvance(2);
+    i0.ɵɵproperty("matTooltip", i0.ɵɵpipeBind1(22, 31, "igo.geo.filter.resetFilters"))("disabled", ctx_r8.filterStateDisable);
+    i0.ɵɵadvance(2);
+    i0.ɵɵpropertyInterpolate("svgIcon", ctx_r8.resetIcon);
+    i0.ɵɵadvance(1);
+    i0.ɵɵproperty("matTooltip", i0.ɵɵpipeBind1(25, 33, "igo.geo.filter.toggleFilterState"))("checked", !ctx_r8.filterStateDisable);
 } }
-function OgcFilterTimeComponent_div_3_div_2_mat_form_field_10_mat_option_5_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementStart(0, "mat-option", 32);
+function OgcFilterTimeComponent_div_3_div_2_mat_form_field_11_mat_option_5_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "mat-option", 36);
     i0.ɵɵtext(1);
     i0.ɵɵelementEnd();
 } if (rf & 2) {
-    const hour_r24 = ctx.$implicit;
-    i0.ɵɵproperty("value", hour_r24);
+    const hour_r27 = ctx.$implicit;
+    i0.ɵɵproperty("value", hour_r27);
     i0.ɵɵadvance(1);
-    i0.ɵɵtextInterpolate(hour_r24);
+    i0.ɵɵtextInterpolate(hour_r27);
 } }
-function OgcFilterTimeComponent_div_3_div_2_mat_form_field_10_Template(rf, ctx) { if (rf & 1) {
-    const _r26 = i0.ɵɵgetCurrentView();
-    i0.ɵɵelementStart(0, "mat-form-field", 29);
+function OgcFilterTimeComponent_div_3_div_2_mat_form_field_11_Template(rf, ctx) { if (rf & 1) {
+    const _r29 = i0.ɵɵgetCurrentView();
+    i0.ɵɵelementStart(0, "mat-form-field", 33);
     i0.ɵɵelementStart(1, "mat-label");
     i0.ɵɵtext(2);
     i0.ɵɵpipe(3, "translate");
     i0.ɵɵelementEnd();
-    i0.ɵɵelementStart(4, "mat-select", 30);
-    i0.ɵɵlistener("selectionChange", function OgcFilterTimeComponent_div_3_div_2_mat_form_field_10_Template_mat_select_selectionChange_4_listener() { i0.ɵɵrestoreView(_r26); i0.ɵɵnextContext(); const _r19 = i0.ɵɵreference(4); const ctx_r25 = i0.ɵɵnextContext(2); return ctx_r25.changeTemporalProperty(_r19.value, 1); });
-    i0.ɵɵtemplate(5, OgcFilterTimeComponent_div_3_div_2_mat_form_field_10_mat_option_5_Template, 2, 2, "mat-option", 31);
+    i0.ɵɵelementStart(4, "mat-select", 34);
+    i0.ɵɵlistener("selectionChange", function OgcFilterTimeComponent_div_3_div_2_mat_form_field_11_Template_mat_select_selectionChange_4_listener() { i0.ɵɵrestoreView(_r29); i0.ɵɵnextContext(); const _r21 = i0.ɵɵreference(5); const ctx_r28 = i0.ɵɵnextContext(2); return ctx_r28.changeTemporalProperty(_r21.value, 1); });
+    i0.ɵɵtemplate(5, OgcFilterTimeComponent_div_3_div_2_mat_form_field_11_mat_option_5_Template, 2, 2, "mat-option", 35);
     i0.ɵɵelementEnd();
     i0.ɵɵelementEnd();
 } if (rf & 2) {
-    const ctx_r21 = i0.ɵɵnextContext(3);
+    const ctx_r23 = i0.ɵɵnextContext(3);
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(3, 4, "igo.geo.timeFilter.hour"));
     i0.ɵɵadvance(2);
-    i0.ɵɵproperty("formControl", ctx_r21.beginHourFormControl);
-    i0.ɵɵattribute("disabled", !ctx_r21.currentFilter.active);
+    i0.ɵɵproperty("formControl", ctx_r23.beginHourFormControl);
+    i0.ɵɵattribute("disabled", !ctx_r23.currentFilter.active);
     i0.ɵɵadvance(1);
-    i0.ɵɵproperty("ngForOf", ctx_r21.beginHours);
+    i0.ɵɵproperty("ngForOf", ctx_r23.beginHours);
 } }
-function OgcFilterTimeComponent_div_3_div_2_mat_form_field_11_mat_option_5_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementStart(0, "mat-option", 32);
+function OgcFilterTimeComponent_div_3_div_2_mat_form_field_12_mat_option_5_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "mat-option", 36);
     i0.ɵɵtext(1);
     i0.ɵɵelementEnd();
 } if (rf & 2) {
-    const minute_r28 = ctx.$implicit;
-    i0.ɵɵproperty("value", minute_r28);
+    const minute_r31 = ctx.$implicit;
+    i0.ɵɵproperty("value", minute_r31);
     i0.ɵɵadvance(1);
-    i0.ɵɵtextInterpolate(minute_r28);
+    i0.ɵɵtextInterpolate(minute_r31);
 } }
-function OgcFilterTimeComponent_div_3_div_2_mat_form_field_11_Template(rf, ctx) { if (rf & 1) {
-    const _r30 = i0.ɵɵgetCurrentView();
-    i0.ɵɵelementStart(0, "mat-form-field", 33);
+function OgcFilterTimeComponent_div_3_div_2_mat_form_field_12_Template(rf, ctx) { if (rf & 1) {
+    const _r33 = i0.ɵɵgetCurrentView();
+    i0.ɵɵelementStart(0, "mat-form-field", 37);
     i0.ɵɵelementStart(1, "mat-label");
     i0.ɵɵtext(2);
     i0.ɵɵpipe(3, "translate");
     i0.ɵɵelementEnd();
-    i0.ɵɵelementStart(4, "mat-select", 30);
-    i0.ɵɵlistener("selectionChange", function OgcFilterTimeComponent_div_3_div_2_mat_form_field_11_Template_mat_select_selectionChange_4_listener() { i0.ɵɵrestoreView(_r30); i0.ɵɵnextContext(); const _r19 = i0.ɵɵreference(4); const ctx_r29 = i0.ɵɵnextContext(2); return ctx_r29.changeTemporalProperty(_r19.value, 1); });
-    i0.ɵɵtemplate(5, OgcFilterTimeComponent_div_3_div_2_mat_form_field_11_mat_option_5_Template, 2, 2, "mat-option", 31);
+    i0.ɵɵelementStart(4, "mat-select", 34);
+    i0.ɵɵlistener("selectionChange", function OgcFilterTimeComponent_div_3_div_2_mat_form_field_12_Template_mat_select_selectionChange_4_listener() { i0.ɵɵrestoreView(_r33); i0.ɵɵnextContext(); const _r21 = i0.ɵɵreference(5); const ctx_r32 = i0.ɵɵnextContext(2); return ctx_r32.changeTemporalProperty(_r21.value, 1); });
+    i0.ɵɵtemplate(5, OgcFilterTimeComponent_div_3_div_2_mat_form_field_12_mat_option_5_Template, 2, 2, "mat-option", 35);
     i0.ɵɵelementEnd();
     i0.ɵɵelementEnd();
 } if (rf & 2) {
-    const ctx_r22 = i0.ɵɵnextContext(3);
+    const ctx_r24 = i0.ɵɵnextContext(3);
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(3, 4, "igo.geo.timeFilter.minute"));
     i0.ɵɵadvance(2);
-    i0.ɵɵproperty("formControl", ctx_r22.beginMinuteFormControl);
-    i0.ɵɵattribute("disabled", !ctx_r22.currentFilter.active);
-    i0.ɵɵadvance(1);
-    i0.ɵɵproperty("ngForOf", ctx_r22.beginMinutes);
-} }
-function OgcFilterTimeComponent_div_3_div_2_Template(rf, ctx) { if (rf & 1) {
-    const _r32 = i0.ɵɵgetCurrentView();
-    i0.ɵɵelementStart(0, "div", 20);
-    i0.ɵɵelementStart(1, "mat-form-field", 21);
-    i0.ɵɵelement(2, "mat-datepicker-toggle", 12);
-    i0.ɵɵelementStart(3, "input", 22, 23);
-    i0.ɵɵlistener("dateChange", function OgcFilterTimeComponent_div_3_div_2_Template_input_dateChange_3_listener() { i0.ɵɵrestoreView(_r32); const _r19 = i0.ɵɵreference(4); const ctx_r31 = i0.ɵɵnextContext(2); return ctx_r31.changeTemporalProperty(_r19.value, 1); });
-    i0.ɵɵpipe(5, "translate");
-    i0.ɵɵelementEnd();
-    i0.ɵɵelement(6, "span", 24);
-    i0.ɵɵelementStart(7, "mat-datepicker", 25, 14);
-    i0.ɵɵlistener("yearSelected", function OgcFilterTimeComponent_div_3_div_2_Template_mat_datepicker_yearSelected_7_listener($event) { i0.ɵɵrestoreView(_r32); const _r20 = i0.ɵɵreference(8); const ctx_r33 = i0.ɵɵnextContext(2); return ctx_r33.yearSelected($event, _r20, "begin"); })("monthSelected", function OgcFilterTimeComponent_div_3_div_2_Template_mat_datepicker_monthSelected_7_listener($event) { i0.ɵɵrestoreView(_r32); const _r20 = i0.ɵɵreference(8); const ctx_r34 = i0.ɵɵnextContext(2); return ctx_r34.monthSelected($event, _r20, "begin"); });
-    i0.ɵɵelementEnd();
-    i0.ɵɵelementEnd();
-    i0.ɵɵelementStart(9, "div", 26);
-    i0.ɵɵtemplate(10, OgcFilterTimeComponent_div_3_div_2_mat_form_field_10_Template, 6, 6, "mat-form-field", 27);
-    i0.ɵɵtemplate(11, OgcFilterTimeComponent_div_3_div_2_mat_form_field_11_Template, 6, 6, "mat-form-field", 28);
-    i0.ɵɵelementEnd();
-    i0.ɵɵelementEnd();
-} if (rf & 2) {
-    const _r20 = i0.ɵɵreference(8);
-    const ctx_r9 = i0.ɵɵnextContext(2);
-    i0.ɵɵadvance(2);
-    i0.ɵɵproperty("for", _r20);
-    i0.ɵɵadvance(1);
-    i0.ɵɵproperty("matDatepicker", _r20)("placeholder", i0.ɵɵpipeBind1(5, 12, "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));
-    i0.ɵɵattribute("disabled", !ctx_r9.currentFilter.active);
-    i0.ɵɵadvance(4);
-    i0.ɵɵproperty("startView", ctx_r9.calendarView())("startAt", ctx_r9.beginValue);
-    i0.ɵɵadvance(3);
-    i0.ɵɵproperty("ngIf", ctx_r9.calendarType() === "datetime");
+    i0.ɵɵproperty("formControl", ctx_r24.beginMinuteFormControl);
+    i0.ɵɵattribute("disabled", !ctx_r24.currentFilter.active);
     i0.ɵɵadvance(1);
-    i0.ɵɵproperty("ngIf", ctx_r9.calendarType() === "datetime");
+    i0.ɵɵproperty("ngForOf", ctx_r24.beginMinutes);
 } }
-function OgcFilterTimeComponent_div_3_div_3_mat_form_field_10_mat_option_5_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementStart(0, "mat-option", 32);
+function OgcFilterTimeComponent_div_3_div_2_div_13_mat_form_field_10_mat_option_5_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "mat-option", 36);
     i0.ɵɵtext(1);
     i0.ɵɵelementEnd();
 } if (rf & 2) {
-    const hour_r40 = ctx.$implicit;
-    i0.ɵɵproperty("value", hour_r40);
+    const hour_r39 = ctx.$implicit;
+    i0.ɵɵproperty("value", hour_r39);
     i0.ɵɵadvance(1);
-    i0.ɵɵtextInterpolate(hour_r40);
+    i0.ɵɵtextInterpolate(hour_r39);
 } }
-function OgcFilterTimeComponent_div_3_div_3_mat_form_field_10_Template(rf, ctx) { if (rf & 1) {
-    const _r42 = i0.ɵɵgetCurrentView();
-    i0.ɵɵelementStart(0, "mat-form-field", 29);
+function OgcFilterTimeComponent_div_3_div_2_div_13_mat_form_field_10_Template(rf, ctx) { if (rf & 1) {
+    const _r41 = i0.ɵɵgetCurrentView();
+    i0.ɵɵelementStart(0, "mat-form-field", 33);
     i0.ɵɵelementStart(1, "mat-label");
     i0.ɵɵtext(2);
     i0.ɵɵpipe(3, "translate");
     i0.ɵɵelementEnd();
-    i0.ɵɵelementStart(4, "mat-select", 30);
-    i0.ɵɵlistener("selectionChange", function OgcFilterTimeComponent_div_3_div_3_mat_form_field_10_Template_mat_select_selectionChange_4_listener() { i0.ɵɵrestoreView(_r42); i0.ɵɵnextContext(); const _r35 = i0.ɵɵreference(4); const ctx_r41 = i0.ɵɵnextContext(2); return ctx_r41.changeTemporalProperty(_r35.value, 2); });
-    i0.ɵɵtemplate(5, OgcFilterTimeComponent_div_3_div_3_mat_form_field_10_mat_option_5_Template, 2, 2, "mat-option", 31);
+    i0.ɵɵelementStart(4, "mat-select", 34);
+    i0.ɵɵlistener("selectionChange", function OgcFilterTimeComponent_div_3_div_2_div_13_mat_form_field_10_Template_mat_select_selectionChange_4_listener() { i0.ɵɵrestoreView(_r41); i0.ɵɵnextContext(); const _r34 = i0.ɵɵreference(4); const ctx_r40 = i0.ɵɵnextContext(3); return ctx_r40.changeTemporalProperty(_r34.value, 2); });
+    i0.ɵɵtemplate(5, OgcFilterTimeComponent_div_3_div_2_div_13_mat_form_field_10_mat_option_5_Template, 2, 2, "mat-option", 35);
     i0.ɵɵelementEnd();
     i0.ɵɵelementEnd();
 } if (rf & 2) {
-    const ctx_r37 = i0.ɵɵnextContext(3);
+    const ctx_r36 = i0.ɵɵnextContext(4);
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(3, 4, "igo.geo.timeFilter.hour"));
     i0.ɵɵadvance(2);
-    i0.ɵɵproperty("formControl", ctx_r37.endHourFormControl);
-    i0.ɵɵattribute("disabled", !ctx_r37.currentFilter.active);
+    i0.ɵɵproperty("formControl", ctx_r36.endHourFormControl);
+    i0.ɵɵattribute("disabled", !ctx_r36.currentFilter.active);
     i0.ɵɵadvance(1);
-    i0.ɵɵproperty("ngForOf", ctx_r37.endHours);
+    i0.ɵɵproperty("ngForOf", ctx_r36.endHours);
 } }
-function OgcFilterTimeComponent_div_3_div_3_mat_form_field_11_mat_option_5_Template(rf, ctx) { if (rf & 1) {
-    i0.ɵɵelementStart(0, "mat-option", 32);
+function OgcFilterTimeComponent_div_3_div_2_div_13_mat_form_field_11_mat_option_5_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "mat-option", 36);
     i0.ɵɵtext(1);
     i0.ɵɵelementEnd();
 } if (rf & 2) {
-    const minute_r44 = ctx.$implicit;
-    i0.ɵɵproperty("value", minute_r44);
+    const minute_r43 = ctx.$implicit;
+    i0.ɵɵproperty("value", minute_r43);
     i0.ɵɵadvance(1);
-    i0.ɵɵtextInterpolate(minute_r44);
+    i0.ɵɵtextInterpolate(minute_r43);
 } }
-function OgcFilterTimeComponent_div_3_div_3_mat_form_field_11_Template(rf, ctx) { if (rf & 1) {
-    const _r46 = i0.ɵɵgetCurrentView();
-    i0.ɵɵelementStart(0, "mat-form-field", 33);
+function OgcFilterTimeComponent_div_3_div_2_div_13_mat_form_field_11_Template(rf, ctx) { if (rf & 1) {
+    const _r45 = i0.ɵɵgetCurrentView();
+    i0.ɵɵelementStart(0, "mat-form-field", 37);
     i0.ɵɵelementStart(1, "mat-label");
     i0.ɵɵtext(2);
     i0.ɵɵpipe(3, "translate");
     i0.ɵɵelementEnd();
-    i0.ɵɵelementStart(4, "mat-select", 30);
-    i0.ɵɵlistener("selectionChange", function OgcFilterTimeComponent_div_3_div_3_mat_form_field_11_Template_mat_select_selectionChange_4_listener() { i0.ɵɵrestoreView(_r46); i0.ɵɵnextContext(); const _r35 = i0.ɵɵreference(4); const ctx_r45 = i0.ɵɵnextContext(2); return ctx_r45.changeTemporalProperty(_r35.value, 2); });
-    i0.ɵɵtemplate(5, OgcFilterTimeComponent_div_3_div_3_mat_form_field_11_mat_option_5_Template, 2, 2, "mat-option", 31);
+    i0.ɵɵelementStart(4, "mat-select", 34);
+    i0.ɵɵlistener("selectionChange", function OgcFilterTimeComponent_div_3_div_2_div_13_mat_form_field_11_Template_mat_select_selectionChange_4_listener() { i0.ɵɵrestoreView(_r45); i0.ɵɵnextContext(); const _r34 = i0.ɵɵreference(4); const ctx_r44 = i0.ɵɵnextContext(3); return ctx_r44.changeTemporalProperty(_r34.value, 2); });
+    i0.ɵɵtemplate(5, OgcFilterTimeComponent_div_3_div_2_div_13_mat_form_field_11_mat_option_5_Template, 2, 2, "mat-option", 35);
     i0.ɵɵelementEnd();
     i0.ɵɵelementEnd();
 } if (rf & 2) {
-    const ctx_r38 = i0.ɵɵnextContext(3);
+    const ctx_r37 = i0.ɵɵnextContext(4);
     i0.ɵɵadvance(2);
     i0.ɵɵtextInterpolate(i0.ɵɵpipeBind1(3, 4, "igo.geo.timeFilter.minute"));
     i0.ɵɵadvance(2);
-    i0.ɵɵproperty("formControl", ctx_r38.endMinuteFormControl);
-    i0.ɵɵattribute("disabled", !ctx_r38.currentFilter.active);
+    i0.ɵɵproperty("formControl", ctx_r37.endMinuteFormControl);
+    i0.ɵɵattribute("disabled", !ctx_r37.currentFilter.active);
     i0.ɵɵadvance(1);
-    i0.ɵɵproperty("ngForOf", ctx_r38.endMinutes);
+    i0.ɵɵproperty("ngForOf", ctx_r37.endMinutes);
 } }
-function OgcFilterTimeComponent_div_3_div_3_Template(rf, ctx) { if (rf & 1) {
-    const _r48 = i0.ɵɵgetCurrentView();
-    i0.ɵɵelementStart(0, "div", 20);
-    i0.ɵɵelementStart(1, "mat-form-field", 21);
+function OgcFilterTimeComponent_div_3_div_2_div_13_Template(rf, ctx) { if (rf & 1) {
+    const _r47 = i0.ɵɵgetCurrentView();
+    i0.ɵɵelementStart(0, "div", 23);
+    i0.ɵɵelementStart(1, "mat-form-field", 24);
     i0.ɵɵelement(2, "mat-datepicker-toggle", 12);
-    i0.ɵɵelementStart(3, "input", 22, 34);
-    i0.ɵɵlistener("dateChange", function OgcFilterTimeComponent_div_3_div_3_Template_input_dateChange_3_listener() { i0.ɵɵrestoreView(_r48); const _r35 = i0.ɵɵreference(4); const ctx_r47 = i0.ɵɵnextContext(2); return ctx_r47.changeTemporalProperty(_r35.value, 2); });
+    i0.ɵɵelementStart(3, "input", 25, 38);
+    i0.ɵɵlistener("dateChange", function OgcFilterTimeComponent_div_3_div_2_div_13_Template_input_dateChange_3_listener() { i0.ɵɵrestoreView(_r47); const _r34 = i0.ɵɵreference(4); const ctx_r46 = i0.ɵɵnextContext(3); return ctx_r46.changeTemporalProperty(_r34.value, 2); });
     i0.ɵɵpipe(5, "translate");
     i0.ɵɵelementEnd();
-    i0.ɵɵelement(6, "span", 24);
-    i0.ɵɵelementStart(7, "mat-datepicker", 25, 18);
-    i0.ɵɵlistener("yearSelected", function OgcFilterTimeComponent_div_3_div_3_Template_mat_datepicker_yearSelected_7_listener($event) { i0.ɵɵrestoreView(_r48); const _r36 = i0.ɵɵreference(8); const ctx_r49 = i0.ɵɵnextContext(2); return ctx_r49.yearSelected($event, _r36, "end"); })("monthSelected", function OgcFilterTimeComponent_div_3_div_3_Template_mat_datepicker_monthSelected_7_listener($event) { i0.ɵɵrestoreView(_r48); const _r36 = i0.ɵɵreference(8); const ctx_r50 = i0.ɵɵnextContext(2); return ctx_r50.monthSelected($event, _r36, "end"); });
+    i0.ɵɵelement(6, "span", 27);
+    i0.ɵɵelementStart(7, "mat-datepicker", 28, 17);
+    i0.ɵɵlistener("yearSelected", function OgcFilterTimeComponent_div_3_div_2_div_13_Template_mat_datepicker_yearSelected_7_listener($event) { i0.ɵɵrestoreView(_r47); const _r35 = i0.ɵɵreference(8); const ctx_r48 = i0.ɵɵnextContext(3); return ctx_r48.yearSelected($event, _r35, "end"); })("monthSelected", function OgcFilterTimeComponent_div_3_div_2_div_13_Template_mat_datepicker_monthSelected_7_listener($event) { i0.ɵɵrestoreView(_r47); const _r35 = i0.ɵɵreference(8); const ctx_r49 = i0.ɵɵnextContext(3); return ctx_r49.monthSelected($event, _r35, "end"); });
     i0.ɵɵelementEnd();
     i0.ɵɵelementEnd();
-    i0.ɵɵelementStart(9, "div", 26);
-    i0.ɵɵtemplate(10, OgcFilterTimeComponent_div_3_div_3_mat_form_field_10_Template, 6, 6, "mat-form-field", 27);
-    i0.ɵɵtemplate(11, OgcFilterTimeComponent_div_3_div_3_mat_form_field_11_Template, 6, 6, "mat-form-field", 28);
+    i0.ɵɵelementStart(9, "div", 29);
+    i0.ɵɵtemplate(10, OgcFilterTimeComponent_div_3_div_2_div_13_mat_form_field_10_Template, 6, 6, "mat-form-field", 30);
+    i0.ɵɵtemplate(11, OgcFilterTimeComponent_div_3_div_2_div_13_mat_form_field_11_Template, 6, 6, "mat-form-field", 31);
     i0.ɵɵelementEnd();
     i0.ɵɵelementEnd();
 } if (rf & 2) {
-    const _r36 = i0.ɵɵreference(8);
-    const ctx_r10 = i0.ɵɵnextContext(2);
+    const _r35 = i0.ɵɵreference(8);
+    const ctx_r25 = i0.ɵɵnextContext(3);
     i0.ɵɵadvance(2);
-    i0.ɵɵproperty("for", _r36);
+    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.ɵɵattribute("disabled", !ctx_r25.currentFilter.active);
+    i0.ɵɵadvance(4);
+    i0.ɵɵproperty("startView", ctx_r25.calendarView())("startAt", ctx_r25.endValue);
+    i0.ɵɵadvance(3);
+    i0.ɵɵproperty("ngIf", ctx_r25.calendarType() === "datetime");
+    i0.ɵɵadvance(1);
+    i0.ɵɵproperty("ngIf", ctx_r25.calendarType() === "datetime");
+} }
+function OgcFilterTimeComponent_div_3_div_2_Template(rf, ctx) { if (rf & 1) {
+    const _r51 = i0.ɵɵgetCurrentView();
+    i0.ɵɵelementStart(0, "div", 22);
+    i0.ɵɵelementStart(1, "div", 23);
+    i0.ɵɵelementStart(2, "mat-form-field", 24);
+    i0.ɵɵelement(3, "mat-datepicker-toggle", 12);
+    i0.ɵɵelementStart(4, "input", 25, 26);
+    i0.ɵɵlistener("dateChange", function OgcFilterTimeComponent_div_3_div_2_Template_input_dateChange_4_listener() { i0.ɵɵrestoreView(_r51); const _r21 = i0.ɵɵreference(5); const ctx_r50 = i0.ɵɵnextContext(2); return ctx_r50.changeTemporalProperty(_r21.value, 1); });
+    i0.ɵɵpipe(6, "translate");
+    i0.ɵɵelementEnd();
+    i0.ɵɵelement(7, "span", 27);
+    i0.ɵɵelementStart(8, "mat-datepicker", 28, 14);
+    i0.ɵɵlistener("yearSelected", function OgcFilterTimeComponent_div_3_div_2_Template_mat_datepicker_yearSelected_8_listener($event) { i0.ɵɵrestoreView(_r51); const _r22 = i0.ɵɵreference(9); const ctx_r52 = i0.ɵɵnextContext(2); return ctx_r52.yearSelected($event, _r22, "begin"); })("monthSelected", function OgcFilterTimeComponent_div_3_div_2_Template_mat_datepicker_monthSelected_8_listener($event) { i0.ɵɵrestoreView(_r51); const _r22 = i0.ɵɵreference(9); const ctx_r53 = i0.ɵɵnextContext(2); return ctx_r53.monthSelected($event, _r22, "begin"); });
+    i0.ɵɵelementEnd();
+    i0.ɵɵelementEnd();
+    i0.ɵɵelementStart(10, "div", 29);
+    i0.ɵɵtemplate(11, OgcFilterTimeComponent_div_3_div_2_mat_form_field_11_Template, 6, 6, "mat-form-field", 30);
+    i0.ɵɵtemplate(12, OgcFilterTimeComponent_div_3_div_2_mat_form_field_12_Template, 6, 6, "mat-form-field", 31);
+    i0.ɵɵelementEnd();
+    i0.ɵɵelementEnd();
+    i0.ɵɵtemplate(13, OgcFilterTimeComponent_div_3_div_2_div_13_Template, 12, 16, "div", 32);
+    i0.ɵɵelementStart(14, "button", 19);
+    i0.ɵɵlistener("click", function OgcFilterTimeComponent_div_3_div_2_Template_button_click_14_listener() { i0.ɵɵrestoreView(_r51); const ctx_r54 = i0.ɵɵnextContext(2); return ctx_r54.resetFilter(); });
+    i0.ɵɵpipe(15, "translate");
+    i0.ɵɵelement(16, "mat-icon", 20);
+    i0.ɵɵelementEnd();
+    i0.ɵɵelementStart(17, "mat-slide-toggle", 21);
+    i0.ɵɵlistener("change", function OgcFilterTimeComponent_div_3_div_2_Template_mat_slide_toggle_change_17_listener() { i0.ɵɵrestoreView(_r51); const ctx_r55 = i0.ɵɵnextContext(2); return ctx_r55.toggleFilterState(); });
+    i0.ɵɵpipe(18, "translate");
+    i0.ɵɵelementEnd();
+    i0.ɵɵelementEnd();
+} if (rf & 2) {
+    const _r22 = i0.ɵɵreference(9);
+    const ctx_r9 = i0.ɵɵnextContext(2);
+    i0.ɵɵadvance(3);
+    i0.ɵɵproperty("for", _r22)("disabled", ctx_r9.filterStateDisable);
     i0.ɵɵadvance(1);
-    i0.ɵɵproperty("matDatepicker", _r36)("placeholder", i0.ɵɵpipeBind1(5, 12, "igo.geo.timeFilter.endDate"))("matDatepickerFilter", ctx_r10.dateFilter.bind(ctx_r10, "end"))("value", ctx_r10.endValue ? ctx_r10.endValue : ctx_r10.handleDate(ctx_r10.datasource.options.maxDate))("min", ctx_r10.beginValue ? ctx_r10.beginValue : ctx_r10.handleDate(ctx_r10.datasource.options.minDate))("max", ctx_r10.handleDate(ctx_r10.datasource.options.maxDate));
-    i0.ɵɵattribute("disabled", !ctx_r10.currentFilter.active);
+    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.ɵɵattribute("disabled", !ctx_r9.currentFilter.active);
     i0.ɵɵadvance(4);
-    i0.ɵɵproperty("startView", ctx_r10.calendarView())("startAt", ctx_r10.endValue);
+    i0.ɵɵproperty("startView", ctx_r9.calendarView())("startAt", ctx_r9.beginValue);
     i0.ɵɵadvance(3);
-    i0.ɵɵproperty("ngIf", ctx_r10.calendarType() === "datetime");
+    i0.ɵɵproperty("ngIf", ctx_r9.calendarType() === "datetime");
+    i0.ɵɵadvance(1);
+    i0.ɵɵproperty("ngIf", ctx_r9.calendarType() === "datetime");
+    i0.ɵɵadvance(1);
+    i0.ɵɵproperty("ngIf", !ctx_r9.restrictedToStep());
     i0.ɵɵadvance(1);
-    i0.ɵɵproperty("ngIf", ctx_r10.calendarType() === "datetime");
+    i0.ɵɵproperty("matTooltip", i0.ɵɵpipeBind1(15, 22, "igo.geo.filter.resetFilters"))("disabled", ctx_r9.filterStateDisable);
+    i0.ɵɵadvance(2);
+    i0.ɵɵpropertyInterpolate("svgIcon", ctx_r9.resetIcon);
+    i0.ɵɵadvance(1);
+    i0.ɵɵproperty("matTooltip", i0.ɵɵpipeBind1(18, 24, "igo.geo.filter.toggleFilterState"))("checked", !ctx_r9.filterStateDisable);
 } }
 function OgcFilterTimeComponent_div_3_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "div");
-    i0.ɵɵtemplate(1, OgcFilterTimeComponent_div_3_div_1_Template, 21, 22, "div", 7);
-    i0.ɵɵtemplate(2, OgcFilterTimeComponent_div_3_div_2_Template, 12, 14, "div", 8);
-    i0.ɵɵtemplate(3, OgcFilterTimeComponent_div_3_div_3_Template, 12, 14, "div", 8);
+    i0.ɵɵtemplate(1, OgcFilterTimeComponent_div_3_div_1_Template, 26, 35, "div", 7);
+    i0.ɵɵtemplate(2, OgcFilterTimeComponent_div_3_div_2_Template, 19, 26, "div", 8);
     i0.ɵɵelementEnd();
 } if (rf & 2) {
     const ctx_r2 = i0.ɵɵnextContext();
@@ -26566,8 +26913,6 @@ function OgcFilterTimeComponent_div_3_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵproperty("ngIf", ctx_r2.calendarTypeYear);
     i0.ɵɵadvance(1);
     i0.ɵɵproperty("ngIf", ctx_r2.calendarType() !== "year");
-    i0.ɵɵadvance(1);
-    i0.ɵɵproperty("ngIf", !ctx_r2.restrictedToStep() && ctx_r2.calendarType() !== "year");
 } }
 const moment$1 = moment_;
 class OgcFilterTimeComponent {
@@ -26586,6 +26931,7 @@ class OgcFilterTimeComponent {
         this.sliderMode = false;
         this.defaultStepMillisecond = 60000;
         this.calendarTypeYear = false;
+        this.resetIcon = 'replay';
     }
     get step() {
         return this.datasource.options.stepDate
@@ -26629,12 +26975,10 @@ class OgcFilterTimeComponent {
         this.onlyYearBegin = this.beginValue.getUTCFullYear();
         this.onlyYearEnd = this.endValue.getUTCFullYear();
         this.calendarTypeYear = this.isCalendarYearMode();
+        this.setFilterStateDisable();
         this.updateHoursMinutesArray();
         // update value for now value
         this.updateValues();
-        if (this.currentFilter.calendarModeYear) {
-            this.beginValue.setUTCFullYear(this.beginValue.getUTCFullYear() + 1);
-        }
     }
     parseFilter(filter) {
         if (!filter) {
@@ -26668,10 +27012,32 @@ class OgcFilterTimeComponent {
             }
             return new Date();
         }
-        return filter ? new Date(filter) : new Date();
+        if (this.currentFilter.calendarModeYear) {
+            const date = this.getDateFromStringWithoutTime(filter);
+            return date;
+        }
+        else {
+            return filter ? new Date(filter) : new Date();
+        }
     }
     changeTemporalProperty(value, position, refreshFilter = true) {
         let valueTmp = this.getDateTime(value, position);
+        if (this.isCalendarYearMode()) {
+            let dateStringFromYearNotime;
+            if (position === 1) {
+                this.beginValue = value;
+                this.onlyYearBegin = this.beginValue.getFullYear();
+                dateStringFromYearNotime = `${this.onlyYearBegin}-01-01`;
+            }
+            else {
+                this.endValue = value;
+                this.onlyYearEnd = this.endValue.getFullYear();
+                dateStringFromYearNotime = `${this.onlyYearEnd}-01-01`;
+            }
+            // call service with string date without time
+            this.changeProperty.next({ value: dateStringFromYearNotime, pos: position, refreshFilter });
+            return;
+        }
         if (position === 2 && this.calendarType() === 'date' && !this.sliderMode) {
             /* Above month: see yearSelected or monthSelected */
             valueTmp = moment$1(valueTmp).endOf('day').toDate();
@@ -26692,6 +27058,9 @@ class OgcFilterTimeComponent {
         if (!value || value === '') {
             return undefined;
         }
+        if (typeof (value) === 'string' && this.currentFilter.calendarModeYear) {
+            return this.getDateFromStringWithoutTime(value);
+        }
         return new Date(value);
     }
     calendarType() {
@@ -26713,38 +27082,22 @@ class OgcFilterTimeComponent {
     }
     yearOnlyInputChange(changeEvent, datePicker, property) {
         const year = changeEvent.target.value;
-        const dateString = `${year}-01-01T05:00:00.000Z`;
-        const dateUtc = new Date(dateString);
-        this.yearSelected(dateUtc, datePicker, property);
+        const date = this.getDateFromStringWithoutTime(year);
+        this.yearSelected(date, datePicker, property);
     }
     yearSelected(year, datePicker, property, refreshFilter = true) {
         if (this.ogcFilterTimeService.stepIsYearDuration(this.step)) {
             if (datePicker) {
                 datePicker.close();
             }
-            const yearInt = year.getUTCFullYear();
-            if (property === 'begin' && this.currentFilter.calendarModeYear) {
-                this.onlyYearBegin = yearInt;
-                // in year mode, change begin date -1 to include day 1 of same year in filter
-                const yearPast = year.getUTCFullYear() - 1;
-                year = moment$1().set('year', yearPast).toDate();
-                year = moment$1(year).endOf('year').toDate();
-            }
             if (property === 'end') {
-                this.onlyYearEnd = yearInt;
                 // change value 01 jan to 31 dec same year
                 year = moment$1(year).endOf('year').toDate();
             }
-            else if (property === 'begin' && this.restrictedToStep()) {
+            else if (property === 'begin' && this.restrictedToStep() && !this.calendarTypeYear) {
                 this.yearSelected(year, undefined, 'end');
             }
             this.changeTemporalProperty(year, property === 'begin' ? 1 : 2, refreshFilter);
-            if (property === 'begin' && this.currentFilter.calendarModeYear) {
-                // datepicker value set to original year not year-1
-                const newMoment = moment$1(year).startOf('year');
-                const newDate = newMoment.set('year', year.getFullYear() + 1).toDate();
-                this.beginValue = newDate;
-            }
         }
     }
     monthSelected(month, datePicker, property, refreshFilter = true) {
@@ -26977,6 +27330,97 @@ class OgcFilterTimeComponent {
             this.updateValues();
         }
     }
+    setFilterStateDisable() {
+        if (this.currentFilter) {
+            this.filterStateDisable = !this.currentFilter.active;
+        }
+        else {
+            this.filterStateDisable = false;
+        }
+        if (this.calendarType() === 'datetime') {
+            if (this.filterStateDisable === true) {
+                this.beginHourFormControl.disable();
+                this.beginMinuteFormControl.disable();
+                this.endHourFormControl.disable();
+                this.endMinuteFormControl.disable();
+            }
+            else {
+                this.beginHourFormControl.enable();
+                this.beginMinuteFormControl.enable();
+                this.endHourFormControl.enable();
+                this.endMinuteFormControl.enable();
+            }
+        }
+    }
+    getDateFromStringWithoutTime(stringDate) {
+        // warning create date with no time make a date UTC with TZ and the date create maybe not the same year, month and day
+        // exemple:
+        // new Date('2022-01-01') -> Fri Dec 31 2021 19:00:00 GMT-0500 (heure normale de l’Est nord-américain)
+        // to create same date as string, add time 00 in the creation
+        // new Date('2022-01-01 00:00:00') -> Sat Jan 01 2022 00:00:00 GMT-0500 (heure normale de l’Est nord-américain)
+        let year;
+        let month = '01';
+        let day = '01';
+        if (stringDate.length === 10) {
+            const dateItems = stringDate.split('-');
+            if (dateItems.length !== 3) {
+                throw new Error('Error in config date begin-end for ogcFilter: Date without time format need to be YYYY-MM-DD or YYYY');
+            }
+            else {
+                year = dateItems[0];
+                month = dateItems[1];
+                day = dateItems[2];
+            }
+        }
+        else if (stringDate.length === 4) {
+            year = stringDate;
+        }
+        else {
+            return new Date(stringDate);
+        }
+        return new Date(`${year}-${month}-${day} 00:00:00`);
+    }
+    resetFilter() {
+        let filterOriginConfig = this.datasource.options.ogcFilters.filters;
+        let minDefaultDate;
+        let maxDefaultDate;
+        let minDefaultISOString;
+        let maxDefaultISOString;
+        if (this.calendarTypeYear) {
+            if (filterOriginConfig.end === 'today') {
+                let todayDateStringNoTime = new Date().toLocaleDateString('en-CA'); // '2022-02-13'
+                maxDefaultISOString = `${todayDateStringNoTime.substring(0, 4)}-01-01`;
+            }
+            else {
+                maxDefaultISOString = `${filterOriginConfig.end.substring(0, 4)}-01-01`;
+            }
+            minDefaultISOString = `${filterOriginConfig.begin.substring(0, 4)}-01-01`;
+            minDefaultDate = this.getDateFromStringWithoutTime(minDefaultISOString);
+            maxDefaultDate = this.getDateFromStringWithoutTime(maxDefaultISOString);
+        }
+        else {
+            minDefaultDate = this.parseFilter(filterOriginConfig.begin);
+            maxDefaultDate = this.parseFilter(filterOriginConfig.end);
+            minDefaultISOString = minDefaultDate.toISOString();
+            maxDefaultISOString = maxDefaultDate.toISOString();
+        }
+        if ((this.currentFilter.begin !== minDefaultISOString) ||
+            (this.currentFilter.end !== maxDefaultISOString)) {
+            this.beginValue = minDefaultDate;
+            this.endValue = maxDefaultDate;
+            this.updateValues();
+        }
+    }
+    toggleFilterState() {
+        if (this.currentFilter.active === true) {
+            this.currentFilter.active = false;
+        }
+        else {
+            this.currentFilter.active = true;
+        }
+        this.setFilterStateDisable();
+        this.updateValues();
+    }
 }
 OgcFilterTimeComponent.ɵfac = function OgcFilterTimeComponent_Factory(t) { return new (t || OgcFilterTimeComponent)(i0.ɵɵdirectiveInject(OGCFilterTimeService)); };
 OgcFilterTimeComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: OgcFilterTimeComponent, selectors: [["igo-ogc-filter-time"]], viewQuery: function OgcFilterTimeComponent_Query(rf, ctx) { if (rf & 1) {
@@ -26990,11 +27434,11 @@ OgcFilterTimeComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: OgcF
         i0.ɵɵqueryRefresh(_t = i0.ɵɵloadQuery()) && (ctx.beginDatepickerTime = _t.first);
         i0.ɵɵqueryRefresh(_t = i0.ɵɵloadQuery()) && (ctx.beginTime = _t.first);
         i0.ɵɵqueryRefresh(_t = i0.ɵɵloadQuery()) && (ctx.endTime = _t.first);
-    } }, inputs: { datasource: "datasource", currentFilter: "currentFilter" }, outputs: { changeProperty: "changeProperty" }, decls: 4, vars: 3, consts: [[1, "datetime-container"], [3, "ngModel", "ngModelChange", "change", 4, "ngIf"], ["class", "slider-container", 4, "ngIf"], [4, "ngIf"], [3, "ngModel", "ngModelChange", "change"], [1, "slider-container"], [3, "begin", "max", "currentFilter", "datasource", "changeProperty"], ["class", "year-input-container", 4, "ngIf"], ["class", "datetime-input", 4, "ngIf"], [1, "year-input-container"], [1, "year-input"], ["matInput", "", 1, "year-input-only-year", 3, "value", "change"], ["matSuffix", "", 3, "for"], ["panelClass", "datepicker-year", 3, "startView", "startAt", "yearSelected"], ["beginDatepicker", ""], ["matInput", "", "enabled", "false", "readonly", "true", 1, "year-input-hide", 3, "matDatepicker", "value", "min", "max"], ["beginYear", ""], ["matInput", "", 1, "year-input-only-year", 3, "value"], ["endDatepicker", ""], ["endYear", ""], [1, "datetime-input"], [1, "date-input"], ["matInput", "", 3, "matDatepicker", "placeholder", "matDatepickerFilter", "value", "min", "max", "dateChange"], ["begin", ""], [1, "filler"], [3, "startView", "startAt", "yearSelected", "monthSelected"], [1, "time-input"], ["class", "hour-input", 4, "ngIf"], ["class", "minute-input", 4, "ngIf"], [1, "hour-input"], [3, "formControl", "selectionChange"], [3, "value", 4, "ngFor", "ngForOf"], [3, "value"], [1, "minute-input"], ["end", ""]], template: function OgcFilterTimeComponent_Template(rf, ctx) { if (rf & 1) {
+    } }, inputs: { datasource: "datasource", currentFilter: "currentFilter" }, outputs: { changeProperty: "changeProperty" }, decls: 4, vars: 3, consts: [[1, "datetime-container"], [3, "ngModel", "ngModelChange", "change", 4, "ngIf"], ["class", "slider-container", 4, "ngIf"], [4, "ngIf"], [3, "ngModel", "ngModelChange", "change"], [1, "slider-container"], [3, "begin", "max", "currentFilter", "datasource", "changeProperty"], ["class", "year-input-container", 4, "ngIf"], ["class", "datetime-input-container", 4, "ngIf"], [1, "year-input-container"], [1, "year-input"], ["matInput", "", 1, "year-input-only-year", 3, "value", "disabled", "change"], ["matSuffix", "", 3, "for", "disabled"], ["panelClass", "datepicker-year", 3, "startView", "startAt", "yearSelected"], ["beginDatepicker", ""], ["matInput", "", "enabled", "false", "readonly", "true", 1, "year-input-hide", 3, "matDatepicker", "value", "min", "max"], ["beginYear", ""], ["endDatepicker", ""], ["endYear", ""], ["mat-icon-button", "", "color", "primary", 1, "reset-button", 3, "matTooltip", "disabled", "click"], [3, "svgIcon"], ["tooltip-position", "below", "matTooltipShowDelay", "500", 1, "toggle-filter-state", 3, "matTooltip", "checked", "change"], [1, "datetime-input-container"], [1, "datetime-input"], [1, "date-input"], ["matInput", "", 3, "matDatepicker", "placeholder", "matDatepickerFilter", "value", "min", "max", "disabled", "dateChange"], ["begin", ""], [1, "filler"], [3, "startView", "startAt", "yearSelected", "monthSelected"], [1, "time-input"], ["class", "hour-input", 4, "ngIf"], ["class", "minute-input", 4, "ngIf"], ["class", "datetime-input", 4, "ngIf"], [1, "hour-input"], [3, "formControl", "selectionChange"], [3, "value", 4, "ngFor", "ngForOf"], [3, "value"], [1, "minute-input"], ["end", ""]], template: function OgcFilterTimeComponent_Template(rf, ctx) { if (rf & 1) {
         i0.ɵɵelementStart(0, "div", 0);
         i0.ɵɵtemplate(1, OgcFilterTimeComponent_mat_slide_toggle_1_Template, 3, 4, "mat-slide-toggle", 1);
         i0.ɵɵtemplate(2, OgcFilterTimeComponent_div_2_Template, 2, 4, "div", 2);
-        i0.ɵɵtemplate(3, OgcFilterTimeComponent_div_3_Template, 4, 3, "div", 3);
+        i0.ɵɵtemplate(3, OgcFilterTimeComponent_div_3_Template, 3, 2, "div", 3);
         i0.ɵɵelementEnd();
     } if (rf & 2) {
         i0.ɵɵadvance(1);
@@ -27003,7 +27447,7 @@ OgcFilterTimeComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: OgcF
         i0.ɵɵproperty("ngIf", ctx.sliderMode);
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("ngIf", !ctx.sliderMode);
-    } }, styles: ["input{text-align:center!important;margin:auto 5px!important}.slider-container[_ngcontent-%COMP%]{text-align:center}.datetime-input[_ngcontent-%COMP%]{display:inline-block;margin:5px 25px}.year-input-container[_ngcontent-%COMP%]{display:inline-block;margin:5px 25px}.date-input[_ngcontent-%COMP%]{width:120px;margin-right:25px}.time-input[_ngcontent-%COMP%]{display:inherit;margin-right:25px}.hour-input[_ngcontent-%COMP%], .minute-input[_ngcontent-%COMP%]{width:40px}.minute-input[_ngcontent-%COMP%]{margin-left:10px}.year-input[_ngcontent-%COMP%]{width:120px;margin-right:25px}.year-input-hide[_ngcontent-%COMP%]{width:120px;margin-right:25px;display:none}.year-input-only-year[_ngcontent-%COMP%]{width:120px;margin-right:25px}  .datepicker-year   .mat-calendar-arrow{display:none}  .datepicker-year   .mat-calendar-period-button{pointer-events:none}  .datepicker-year   .mat-calendar-body-cell:not(.mat-calendar-body-disabled):hover{background-color:#0000001f;border-radius:999px}"] });
+    } }, styles: ["input{text-align:center!important;margin:auto 5px!important}.slider-container[_ngcontent-%COMP%]{text-align:center}.datetime-input[_ngcontent-%COMP%]{display:inline-block;width:117px;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[_ngcontent-%COMP%]{width:36%;margin:0}}.date-input[_ngcontent-%COMP%]{width:100px;margin-right:25px}.time-input[_ngcontent-%COMP%]{margin-right:25px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.time-input[_ngcontent-%COMP%]{margin-right:5px}}.hour-input[_ngcontent-%COMP%], .minute-input[_ngcontent-%COMP%]{width:35px;margin-left:7px}.year-input[_ngcontent-%COMP%]{width:98px;margin:10px 18px 5px 12px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.year-input[_ngcontent-%COMP%]{width:33%;margin:0 0 0 10px}}.year-input-hide[_ngcontent-%COMP%]{width:120px;margin-right:25px;display:none}.year-input-only-year[_ngcontent-%COMP%]{width:120px;margin-right:25px}.reset-button[_ngcontent-%COMP%]{width:25px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.reset-button[_ngcontent-%COMP%]{padding-left:6px}}.toggle-filter-state[_ngcontent-%COMP%]{padding-left:15px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.toggle-filter-state[_ngcontent-%COMP%]{padding-left:7px}}  .datepicker-year   .mat-calendar-arrow{display:none}  .datepicker-year   .mat-calendar-period-button{pointer-events:none}  .datepicker-year   .mat-calendar-body-cell:not(.mat-calendar-body-disabled):hover{background-color:#0000001f;border-radius:999px}"] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(OgcFilterTimeComponent, [{
         type: Component,
         args: [{
@@ -27405,18 +27849,18 @@ IgoFilterModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [TimeFi
         SpatialFilterItemComponent,
         OgcFilterTimeComponent,
         OgcFilterTimeSliderComponent] }); })();
-i0.ɵɵsetComponentScope(TimeFilterButtonComponent, [i1$1.NgIf, i2.MatButton, i3.MatTooltip, i4.MatIcon, i9$1.MatBadge, TimeFilterItemComponent, i6$1.ListItemDirective], [i7.TranslatePipe]);
-i0.ɵɵsetComponentScope(TimeFilterItemComponent, [i1$1.NgIf, i1$3.MatListItem, i4.MatIcon, i1$3.MatListAvatarCssMatStyler, i6$1.CollapseDirective, i9.MatLine, i1$1.NgStyle, i2.MatButton, i3.MatTooltip, i1$1.NgClass, LayerLegendComponent, TimeFilterFormComponent], [i7.TranslatePipe, i1$1.AsyncPipe]);
-i0.ɵɵsetComponentScope(TimeFilterListComponent, [i6$1.ListComponent, i1$1.NgForOf, TimeFilterItemComponent, i6$1.ListItemDirective], [FilterableDataSourcePipe]);
-i0.ɵɵsetComponentScope(OgcFilterFormComponent, [i11.MatCheckbox, i3.MatTooltip, i12.MatFormField, i1$1.NgClass, i13.MatSelect, i9.MatOption, i1$1.NgIf, i5.MatInput, i6$2.MatAutocompleteTrigger, i6$2.MatAutocomplete, i1$1.NgForOf, i2.MatButton, i12.MatSuffix, i4.MatIcon, OgcFilterTimeComponent], [i7.TranslatePipe, i1$1.AsyncPipe, i6$1.KeyValuePipe]);
-i0.ɵɵsetComponentScope(OgcFilterButtonComponent, [i1$1.NgIf, i2.MatButton, i3.MatTooltip, i4.MatIcon, i9$1.MatBadge, OgcFilterableItemComponent, i6$1.ListItemDirective], [i7.TranslatePipe]);
+i0.ɵɵsetComponentScope(TimeFilterButtonComponent, [i1$1.NgIf, i2.MatButton, i3.MatTooltip, i4.MatIcon, i9$1.MatBadge, TimeFilterItemComponent, i6.ListItemDirective], [i7.TranslatePipe]);
+i0.ɵɵsetComponentScope(TimeFilterItemComponent, [i1$1.NgIf, i1$3.MatListItem, i4.MatIcon, i1$3.MatListAvatarCssMatStyler, i6.CollapseDirective, i9.MatLine, i1$1.NgStyle, i2.MatButton, i3.MatTooltip, i1$1.NgClass, LayerLegendComponent, TimeFilterFormComponent], [i7.TranslatePipe, i1$1.AsyncPipe]);
+i0.ɵɵsetComponentScope(TimeFilterListComponent, [i6.ListComponent, i1$1.NgForOf, TimeFilterItemComponent, i6.ListItemDirective], [FilterableDataSourcePipe]);
+i0.ɵɵsetComponentScope(OgcFilterFormComponent, [i11.MatCheckbox, i3.MatTooltip, i12.MatFormField, i1$1.NgClass, i13.MatSelect, i9.MatOption, i1$1.NgIf, i5$1.MatInput, i6$1.MatAutocompleteTrigger, i6$1.MatAutocomplete, i1$1.NgForOf, i2.MatButton, i12.MatSuffix, i4.MatIcon, OgcFilterTimeComponent], [i7.TranslatePipe, i1$1.AsyncPipe, i6.KeyValuePipe]);
+i0.ɵɵsetComponentScope(OgcFilterButtonComponent, [i1$1.NgIf, i2.MatButton, i3.MatTooltip, i4.MatIcon, i9$1.MatBadge, OgcFilterableItemComponent, i6.ListItemDirective], [i7.TranslatePipe]);
 i0.ɵɵsetComponentScope(OgcFilterSelectionComponent, [i16.ɵNgNoValidate, i16.NgControlStatusGroup, i16.FormGroupDirective, i1$1.NgForOf, i1$1.NgIf, i10.MatDivider, i12.MatFormField, i13.MatSelect, i16.NgControlStatus, i16.FormControlName, i3.MatTooltip, i9.MatOption, i18.MatButtonToggleGroup, i18.MatButtonToggle, i1$1.NgStyle, i11.MatCheckbox, i19.MatRadioGroup, i19.MatRadioButton, i4.MatIcon, i16.FormControlDirective, i16.NgModel, OgcFilterTimeComponent], [i7.TranslatePipe]);
-i0.ɵɵsetComponentScope(OgcFilterableFormComponent, [i1$1.NgIf, OgcFilterSelectionComponent, i6$1.ListItemDirective, i1$1.NgForOf, OgcFilterFormComponent], []);
-i0.ɵɵsetComponentScope(OgcFilterableItemComponent, [i1$3.MatListItem, i1$1.NgIf, i4.MatIcon, i1$3.MatListAvatarCssMatStyler, i6$1.CollapseDirective, i9.MatLine, i1$1.NgStyle, i3.MatTooltip, i2.MatButton, i1$1.NgClass, LayerLegendComponent, OgcFilterableFormComponent, i10.MatDivider, i11.MatCheckbox, i16.NgControlStatus, i16.NgModel], [i7.TranslatePipe, i1$1.AsyncPipe]);
-i0.ɵɵsetComponentScope(OgcFilterableListComponent, [i6$1.ListComponent, i1$1.NgForOf, OgcFilterableItemComponent, i6$1.ListItemDirective], [FilterableDataSourcePipe]);
+i0.ɵɵsetComponentScope(OgcFilterableFormComponent, [i1$1.NgIf, OgcFilterSelectionComponent, i6.ListItemDirective, i1$1.NgForOf, OgcFilterFormComponent], []);
+i0.ɵɵsetComponentScope(OgcFilterableItemComponent, [i1$3.MatListItem, i1$1.NgIf, i4.MatIcon, i1$3.MatListAvatarCssMatStyler, i6.CollapseDirective, i9.MatLine, i1$1.NgStyle, i3.MatTooltip, i2.MatButton, i1$1.NgClass, LayerLegendComponent, OgcFilterableFormComponent, i10.MatDivider, i11.MatCheckbox, i16.NgControlStatus, i16.NgModel], [i7.TranslatePipe, i1$1.AsyncPipe]);
+i0.ɵɵsetComponentScope(OgcFilterableListComponent, [i6.ListComponent, i1$1.NgForOf, OgcFilterableItemComponent, i6.ListItemDirective], [FilterableDataSourcePipe]);
 i0.ɵɵsetComponentScope(SpatialFilterTypeComponent, [i20.MatTabGroup, i20.MatTab, i12.MatFormField, i12.MatLabel, i13.MatSelect, i1$1.NgForOf, i9.MatOption, SpatialFilterListComponent, i18.MatButtonToggleGroup, i18.MatButtonToggle, i3.MatTooltip, i4.MatIcon], [i7.TranslatePipe]);
-i0.ɵɵsetComponentScope(SpatialFilterItemComponent, [GeometryFormFieldInputComponent, i16.NgControlStatus, i16.FormControlDirective, i1$1.NgIf, i22.MatSlideToggle, i16.ɵNgNoValidate, i16.NgControlStatusGroup, i16.NgForm, i12.MatFormField, i16.NumberValueAccessor, i5.MatInput, i16.DefaultValueAccessor, i13.MatSelect, i1$1.NgForOf, i9.MatOption, i12.MatLabel, i19.MatRadioGroup, i19.MatRadioButton, i23.MatTable, i23.MatColumnDef, i23.MatHeaderCellDef, i23.MatHeaderCell, i11.MatCheckbox, i23.MatHeaderRowDef, i23.MatHeaderRow, i23.MatRowDef, i23.MatRow, i24.MatTree, i24.MatTreeNodeDef, i24.MatTreeNode, i24.MatTreeNodeToggle, i2.MatButton, i24.MatNestedTreeNode, i4.MatIcon, i24.MatTreeNodeOutlet, i3.MatTooltip, i6$1.EntityTableComponent], [i1$1.AsyncPipe, i7.TranslatePipe]);
-i0.ɵɵsetComponentScope(OgcFilterTimeComponent, [i1$1.NgIf, i22.MatSlideToggle, i16.NgControlStatus, i16.NgModel, OgcFilterTimeSliderComponent, i12.MatFormField, i12.MatLabel, i5.MatInput, i25.MatDatepickerToggle, i12.MatSuffix, i25.MatDatepicker, i25.MatDatepickerInput, i13.MatSelect, i16.FormControlDirective, i1$1.NgForOf, i9.MatOption], [i7.TranslatePipe]);
+i0.ɵɵsetComponentScope(SpatialFilterItemComponent, [GeometryFormFieldInputComponent, i16.NgControlStatus, i16.FormControlDirective, i1$1.NgIf, i22.MatSlideToggle, i16.ɵNgNoValidate, i16.NgControlStatusGroup, i16.NgForm, i12.MatFormField, i16.NumberValueAccessor, i5$1.MatInput, i16.DefaultValueAccessor, i13.MatSelect, i1$1.NgForOf, i9.MatOption, i12.MatLabel, i19.MatRadioGroup, i19.MatRadioButton, i23.MatTable, i23.MatColumnDef, i23.MatHeaderCellDef, i23.MatHeaderCell, i11.MatCheckbox, i23.MatHeaderRowDef, i23.MatHeaderRow, i23.MatRowDef, i23.MatRow, i24.MatTree, i24.MatTreeNodeDef, i24.MatTreeNode, i24.MatTreeNodeToggle, i2.MatButton, i24.MatNestedTreeNode, i4.MatIcon, i24.MatTreeNodeOutlet, i3.MatTooltip, i6.EntityTableComponent], [i1$1.AsyncPipe, i7.TranslatePipe]);
+i0.ɵɵsetComponentScope(OgcFilterTimeComponent, [i1$1.NgIf, i22.MatSlideToggle, i16.NgControlStatus, i16.NgModel, OgcFilterTimeSliderComponent, i12.MatFormField, i12.MatLabel, i5$1.MatInput, i25.MatDatepickerToggle, i12.MatSuffix, i25.MatDatepicker, i25.MatDatepickerInput, i2.MatButton, i3.MatTooltip, i4.MatIcon, i13.MatSelect, i16.FormControlDirective, i1$1.NgForOf, i9.MatOption], [i7.TranslatePipe]);
 
 function ExportButtonComponent_button_0_Template(rf, ctx) { if (rf & 1) {
     i0.ɵɵelementStart(0, "button", 1);
@@ -28795,7 +29239,8 @@ class ImportExportComponent {
         return;
     }
     getLayerTitleById(id) {
-        return this.map.getLayerById(id).title;
+        var _a;
+        return (_a = this.map.getLayerById(id)) === null || _a === void 0 ? void 0 : _a.title;
     }
     layerHasSelectedFeatures(layer) {
         const wksFromLayer = this.getWorkspaceByLayerId(layer.id);
@@ -28996,6 +29441,7 @@ class ImportExportComponent {
                                         previousFeature.get('_featureStore').layer.options.title) {
                                         const titleEmptyRows = this.createTitleEmptyRows(previousFeature, currentFeature);
                                         featuresCSV.push(titleEmptyRows[2]);
+                                        featuresCSV.push(titleEmptyRows[0]);
                                         featuresCSV.push(titleEmptyRows[1]);
                                     }
                                 }
@@ -29042,24 +29488,71 @@ class ImportExportComponent {
         }
     }
     createTitleEmptyRows(previousFeature, currentFeature) {
-        const titleRow = previousFeature.clone();
-        const titleRowWithArrow = previousFeature.clone();
-        const emptyRow = previousFeature.clone();
+        const titleRow = currentFeature.clone();
+        const headerRow = currentFeature.clone();
+        const emptyRow = currentFeature.clone();
         const previousFeatureKeys = previousFeature.getKeys();
-        const firstKey = previousFeatureKeys[1];
-        previousFeatureKeys.forEach(key => {
-            if (key === firstKey) {
+        let firstKeyPrevious = '';
+        for (const key in previousFeatureKeys) {
+            if (previousFeatureKeys[key] !== 'geometry') {
+                firstKeyPrevious = previousFeatureKeys[key];
+                break;
+            }
+        }
+        const currentFeatureKeys = currentFeature.getKeys();
+        let firstKeyCurrent = '';
+        for (const key in currentFeatureKeys) {
+            if (currentFeatureKeys[key] !== 'geometry') {
+                firstKeyCurrent = currentFeatureKeys[key];
+                break;
+            }
+        }
+        const allKeys = currentFeature.getKeys();
+        previousFeatureKeys.forEach(previousKey => {
+            if (allKeys.includes(previousKey) && previousKey !== firstKeyPrevious) {
+                allKeys.push(previousKey);
+            }
+        });
+        allKeys.unshift(firstKeyPrevious);
+        let firstKeyAll = '';
+        for (const key in allKeys) {
+            if (allKeys[key] !== 'geometry') {
+                firstKeyAll = allKeys[key];
+                break;
+            }
+        }
+        allKeys.forEach(key => {
+            const sameKeys = previousFeatureKeys.length === currentFeatureKeys.length &&
+                previousFeatureKeys.every((value, index) => value === currentFeatureKeys[index]);
+            if (key === firstKeyAll && !sameKeys) {
+                titleRow.set(key, currentFeature.get('_featureStore').layer.options.title + " ===============>", true);
+                headerRow.set(key, key, true);
+                emptyRow.unset(key, true);
+            }
+            else if (key === firstKeyAll && sameKeys) {
                 titleRow.set(key, currentFeature.get('_featureStore').layer.options.title, true);
-                titleRowWithArrow.set(key, currentFeature.get('_featureStore').layer.options.title + " ===================>", true);
+                headerRow.set(key, key, true);
+                emptyRow.unset(key, true);
+            }
+            else if (key === firstKeyCurrent) {
+                titleRow.set(key, currentFeature.get('_featureStore').layer.options.title, true);
+                headerRow.set(key, key, true);
+                emptyRow.unset(key, true);
+            }
+            else if (key !== 'geometry') {
+                titleRow.unset(key, true);
+                headerRow.set(key, key, true);
                 emptyRow.unset(key, true);
             }
             else {
                 titleRow.unset(key, true);
-                titleRowWithArrow.unset(key, true);
                 emptyRow.unset(key, true);
             }
+            if (!(currentFeatureKeys.includes(key))) {
+                headerRow.unset(key, true);
+            }
         });
-        const titleEmptyRows = [titleRow, titleRowWithArrow, emptyRow];
+        const titleEmptyRows = [titleRow, headerRow, emptyRow];
         return titleEmptyRows;
     }
     circleToPoint(feature) {
@@ -29329,7 +29822,7 @@ ImportExportComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: Impor
         i0.ɵɵproperty("ngIf", i0.ɵɵpipeBind1(11, 13, ctx.exportableLayers$).length === 0 && ctx.selectedMode === "export");
         i0.ɵɵadvance(2);
         i0.ɵɵproperty("ngIf", i0.ɵɵpipeBind1(13, 15, ctx.exportableLayers$).length > 0 && ctx.selectedMode === "export");
-    } }, directives: [i18.MatButtonToggleGroup, i18.MatButtonToggle, i1$1.NgIf, i16.ɵNgNoValidate, i16.NgControlStatusGroup, i16.FormGroupDirective, i12.MatFormField, i12.MatLabel, i13.MatSelect, i1$1.NgForOf, i3.MatTooltip, i2.MatButton, i6$1.SpinnerComponent, i9.MatOption, i13.MatSelectTrigger, i16.NgControlStatus, i16.FormControlName, i1$1.NgClass, i22.MatSlideToggle, i5.MatInput, i16.DefaultValueAccessor], pipes: [i7.TranslatePipe, i1$1.AsyncPipe, i6$1.KeyValuePipe], styles: ["mat-option.igo-export-layer-mat-option[_ngcontent-%COMP%]{height:5em;line-height:1em}.import-export-toggle[_ngcontent-%COMP%]{padding:10px;text-align:center}.import-export-toggle[_ngcontent-%COMP%]   mat-button-toggle-group[_ngcontent-%COMP%]{width:100%}.import-export-toggle[_ngcontent-%COMP%]   mat-button-toggle-group[_ngcontent-%COMP%]   mat-button-toggle[_ngcontent-%COMP%]{width:50%}h4[_ngcontent-%COMP%]{padding:0 5px}.igo-form[_ngcontent-%COMP%]{padding:15px 5px}.igo-input-container[_ngcontent-%COMP%]   mat-form-field[_ngcontent-%COMP%]{width:100%}.igo-form-button-group[_ngcontent-%COMP%]{text-align:center;padding-top:10px}igo-spinner[_ngcontent-%COMP%]{position:absolute;padding-left:10px}.export-options[_ngcontent-%COMP%], .export-combine-layers[_ngcontent-%COMP%], .export-separator[_ngcontent-%COMP%]{overflow-x:hidden}.export-options[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%], .export-combine-layers[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%], .export-separator[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%]{width:100%;margin:10px}.export-options[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%]     .mat-slide-toggle-content, .export-combine-layers[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%]     .mat-slide-toggle-content, .export-separator[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%]     .mat-slide-toggle-content{width:calc(100% - 60px)}.export-select-trigger[_ngcontent-%COMP%]{opacity:.75;font-size:.75em}"] });
+    } }, directives: [i18.MatButtonToggleGroup, i18.MatButtonToggle, i1$1.NgIf, i16.ɵNgNoValidate, i16.NgControlStatusGroup, i16.FormGroupDirective, i12.MatFormField, i12.MatLabel, i13.MatSelect, i1$1.NgForOf, i3.MatTooltip, i2.MatButton, i6.SpinnerComponent, i9.MatOption, i13.MatSelectTrigger, i16.NgControlStatus, i16.FormControlName, i1$1.NgClass, i22.MatSlideToggle, i5$1.MatInput, i16.DefaultValueAccessor], pipes: [i7.TranslatePipe, i1$1.AsyncPipe, i6.KeyValuePipe], styles: ["mat-option.igo-export-layer-mat-option[_ngcontent-%COMP%]{height:5em;line-height:1em}.import-export-toggle[_ngcontent-%COMP%]{padding:10px;text-align:center}.import-export-toggle[_ngcontent-%COMP%]   mat-button-toggle-group[_ngcontent-%COMP%]{width:100%}.import-export-toggle[_ngcontent-%COMP%]   mat-button-toggle-group[_ngcontent-%COMP%]   mat-button-toggle[_ngcontent-%COMP%]{width:50%}h4[_ngcontent-%COMP%]{padding:0 5px}.igo-form[_ngcontent-%COMP%]{padding:15px 5px}.igo-input-container[_ngcontent-%COMP%]   mat-form-field[_ngcontent-%COMP%]{width:100%}.igo-form-button-group[_ngcontent-%COMP%]{text-align:center;padding-top:10px}igo-spinner[_ngcontent-%COMP%]{position:absolute;padding-left:10px}.export-options[_ngcontent-%COMP%], .export-combine-layers[_ngcontent-%COMP%], .export-separator[_ngcontent-%COMP%]{overflow-x:hidden}.export-options[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%], .export-combine-layers[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%], .export-separator[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%]{width:100%;margin:10px}.export-options[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%]     .mat-slide-toggle-content, .export-combine-layers[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%]     .mat-slide-toggle-content, .export-separator[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%]     .mat-slide-toggle-content{width:calc(100% - 60px)}.export-select-trigger[_ngcontent-%COMP%]{opacity:.75;font-size:.75em}"] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(ImportExportComponent, [{
         type: Component,
         args: [{
@@ -29620,7 +30113,9 @@ IgoMapModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [[
                     MapBrowserComponent,
                     ZoomButtonComponent,
                     GeolocateButtonComponent,
+                    HomeExtentButtonComponent,
                     RotationButtonComponent,
+                    InfoSectionComponent,
                     BaseLayersSwitcherComponent,
                     MiniBaseMapComponent,
                     MapOfflineDirective,
@@ -29635,7 +30130,9 @@ IgoMapModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [[
                     MapBrowserComponent,
                     ZoomButtonComponent,
                     GeolocateButtonComponent,
+                    HomeExtentButtonComponent,
                     RotationButtonComponent,
+                    InfoSectionComponent,
                     BaseLayersSwitcherComponent,
                     MiniBaseMapComponent,
                     MapOfflineDirective,
@@ -29651,7 +30148,9 @@ IgoMapModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [[
 (function () { (typeof ngJitMode === "undefined" || ngJitMode) && i0.ɵɵsetNgModuleScope(IgoMapModule, { declarations: [MapBrowserComponent,
         ZoomButtonComponent,
         GeolocateButtonComponent,
+        HomeExtentButtonComponent,
         RotationButtonComponent,
+        InfoSectionComponent,
         BaseLayersSwitcherComponent,
         MiniBaseMapComponent,
         MapOfflineDirective,
@@ -29668,7 +30167,9 @@ IgoMapModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [[
         MatTooltipModule], exports: [MapBrowserComponent,
         ZoomButtonComponent,
         GeolocateButtonComponent,
+        HomeExtentButtonComponent,
         RotationButtonComponent,
+        InfoSectionComponent,
         BaseLayersSwitcherComponent,
         MiniBaseMapComponent,
         MapOfflineDirective,
@@ -29794,7 +30295,7 @@ MeasurerItemComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: Measu
         i0.ɵɵproperty("value", ctx.measureUnit)("disabled", ctx.auto);
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("ngForOf", ctx.measureUnits);
-    } }, directives: [i12.MatFormField, i12.MatLabel, i5.MatInput, i13.MatSelect, i1$1.NgForOf, i9.MatOption], pipes: [MeasureFormatPipe, i1$1.AsyncPipe, i7.TranslatePipe], styles: ["[_nghost-%COMP%]{display:flex;width:100%;padding:5px 10px}.measure-field[_ngcontent-%COMP%]{pointer-events:none;display:flex;flex-flow:column nowrap;width:100%}.unit-field[_ngcontent-%COMP%]{width:50px;margin-left:10px;margin-top:10px}"], changeDetection: 0 });
+    } }, directives: [i12.MatFormField, i12.MatLabel, i5$1.MatInput, i13.MatSelect, i1$1.NgForOf, i9.MatOption], pipes: [MeasureFormatPipe, i1$1.AsyncPipe, i7.TranslatePipe], styles: ["[_nghost-%COMP%]{display:flex;width:100%;padding:5px 10px}.measure-field[_ngcontent-%COMP%]{pointer-events:none;display:flex;flex-flow:column nowrap;width:100%}.unit-field[_ngcontent-%COMP%]{width:50px;margin-left:10px;margin-top:10px}"], changeDetection: 0 });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(MeasurerItemComponent, [{
         type: Component,
         args: [{
@@ -29883,7 +30384,7 @@ IgoMeasurerModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [[
         IgoLanguageModule,
         IgoEntityTableModule], exports: [MeasureFormatPipe,
         MeasurerComponent] }); })();
-i0.ɵɵsetComponentScope(MeasurerComponent, [i18.MatButtonToggleGroup, i18.MatButtonToggle, i22.MatSlideToggle, i1$1.NgIf, i10.MatDivider, MeasurerItemComponent, i2.MatButton, i3.MatTooltip, i4.MatIcon, i6$1.EntityTableComponent], [i7.TranslatePipe, i1$1.AsyncPipe]);
+i0.ɵɵsetComponentScope(MeasurerComponent, [i18.MatButtonToggleGroup, i18.MatButtonToggle, i22.MatSlideToggle, i1$1.NgIf, i10.MatDivider, MeasurerItemComponent, i2.MatButton, i3.MatTooltip, i4.MatIcon, i6.EntityTableComponent], [i7.TranslatePipe, i1$1.AsyncPipe]);
 i0.ɵɵsetComponentScope(MeasurerDialogComponent, [i1$1.NgIf], [i7.TranslatePipe, MeasureFormatPipe]);
 
 class IgoMeasureModule {
@@ -31203,7 +31704,7 @@ PrintFormComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: PrintFor
         i0.ɵɵproperty("disabled", !ctx.form.valid || i0.ɵɵpipeBind1(62, 68, ctx.disabled$));
         i0.ɵɵadvance(2);
         i0.ɵɵtextInterpolate1(" ", i0.ɵɵpipeBind1(64, 70, "igo.geo.printForm.saveBtn"), " ");
-    } }, directives: [i16.ɵNgNoValidate, i16.NgControlStatusGroup, i16.FormGroupDirective, i12.MatFormField, i5.MatInput, i16.DefaultValueAccessor, i16.NgControlStatus, i16.FormControlName, i22.MatSlideToggle, i13.MatSelect, i1$1.NgForOf, i2.MatButton, i9.MatOption], pipes: [i7.TranslatePipe, i6$1.KeyValuePipe, i1$1.AsyncPipe], styles: ["mat-form-field[_ngcontent-%COMP%]{width:100%}.print-slide-toggle-container[_ngcontent-%COMP%]{overflow-x:hidden}.print-slide-toggle-container[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%]{width:100%;margin:10px}.print-slide-toggle-container[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%]     .mat-slide-toggle-content{width:calc(100% - 60px)}.print-option[_ngcontent-%COMP%]{display:block;margin-right:10px;margin-bottom:15px}.print-button-top-padding[_ngcontent-%COMP%]{padding-top:25px}.igo-form[_ngcontent-%COMP%]{padding:10px 5px 5px}.igo-form-button-group[_ngcontent-%COMP%]{text-align:center}"] });
+    } }, directives: [i16.ɵNgNoValidate, i16.NgControlStatusGroup, i16.FormGroupDirective, i12.MatFormField, i5$1.MatInput, i16.DefaultValueAccessor, i16.NgControlStatus, i16.FormControlName, i22.MatSlideToggle, i13.MatSelect, i1$1.NgForOf, i2.MatButton, i9.MatOption], pipes: [i7.TranslatePipe, i6.KeyValuePipe, i1$1.AsyncPipe], styles: ["mat-form-field[_ngcontent-%COMP%]{width:100%}.print-slide-toggle-container[_ngcontent-%COMP%]{overflow-x:hidden}.print-slide-toggle-container[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%]{width:100%;margin:10px}.print-slide-toggle-container[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%]     .mat-slide-toggle-content{width:calc(100% - 60px)}.print-option[_ngcontent-%COMP%]{display:block;margin-right:10px;margin-bottom:15px}.print-button-top-padding[_ngcontent-%COMP%]{padding-top:25px}.igo-form[_ngcontent-%COMP%]{padding:10px 5px 5px}.igo-form-button-group[_ngcontent-%COMP%]{text-align:center}"] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(PrintFormComponent, [{
         type: Component,
         args: [{
@@ -31610,6 +32111,7 @@ function initStopsFeatureStore(stopsFeatureStore, languageService) {
         motion: FeatureMotion.None
     });
     const stopsLayer = new VectorLayer({
+        isIgoInternalLayer: true,
         id: 'igo-direction-stops-layer',
         title: languageService.translate.instant('igo.geo.directionsForm.stopLayer'),
         zIndex: 911,
@@ -31642,6 +32144,7 @@ function initRoutesFeatureStore(routesFeatureStore, languageService) {
         motion: FeatureMotion.None
     });
     const routeLayer = new VectorLayer({
+        isIgoInternalLayer: true,
         id: 'igo-direction-route-layer',
         title: languageService.translate.instant('igo.geo.directionsForm.routeLayer'),
         zIndex: 910,
@@ -31666,6 +32169,7 @@ function initStepFeatureStore(stepFeatureStore) {
         motion: FeatureMotion.None
     });
     const stepLayer = new VectorLayer({
+        isIgoInternalLayer: true,
         id: 'igo-direction-step-layer',
         title: '',
         zIndex: 910,
@@ -32251,7 +32755,7 @@ DirectionsInputsComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: D
     } if (rf & 2) {
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("ngForOf", i0.ɵɵpipeBind1(2, 1, ctx.stopsStore.view.all$()));
-    } }, directives: [i2$2.CdkDropList, i1$1.NgForOf, i2$2.CdkDrag, i1$1.NgClass, i12.MatFormField, i5.MatInput, i16.DefaultValueAccessor, i6$2.MatAutocompleteTrigger, i3.MatTooltip, i16.NgControlStatus, i16.NgModel, i1$1.NgIf, i6$2.MatAutocomplete, i2.MatButton, i12.MatSuffix, i4.MatIcon, i9.MatOptgroup, i9.MatOption, i2$2.CdkDragHandle], pipes: [i1$1.AsyncPipe, i7.TranslatePipe], styles: [".igo-input-container[_ngcontent-%COMP%]{width:100%}.igo-input-container[_ngcontent-%COMP%]   mat-form-field[_ngcontent-%COMP%]{width:100%}.igo-input-container.reduce[_ngcontent-%COMP%]{width:70%}.igo-input-container.reduce[_ngcontent-%COMP%]   mat-form-field[_ngcontent-%COMP%]{width:100%}.stops-list[_ngcontent-%COMP%]{max-width:100%;min-height:60px;display:block;background:white;border-radius:4px;overflow:hidden;padding:20px 10px}.swipe-vertical[_ngcontent-%COMP%]{cursor:move}.stop-box[_ngcontent-%COMP%]{height:60px;padding:20px 10px;color:#000000de;display:flex;flex-direction:row;align-items:center;justify-content:space-between;box-sizing:border-box;background:white}.cdk-drag-preview[_ngcontent-%COMP%]{box-sizing:border-box;border-radius:4px;box-shadow:0 5px 5px -3px #0003,0 8px 10px 1px #00000024,0 3px 14px 2px #0000001f}.cdk-drag-placeholder[_ngcontent-%COMP%]{opacity:0}.cdk-drag-animating[_ngcontent-%COMP%]{transition:transform .25s cubic-bezier(0,0,.2,1)}.stops-list.cdk-drop-list-dragging[_ngcontent-%COMP%]   .stop-box[_ngcontent-%COMP%]:not(.cdk-drag-placeholder){transition:transform .25s cubic-bezier(0,0,.2,1)}"] });
+    } }, directives: [i2$2.CdkDropList, i1$1.NgForOf, i2$2.CdkDrag, i1$1.NgClass, i12.MatFormField, i5$1.MatInput, i16.DefaultValueAccessor, i6$1.MatAutocompleteTrigger, i3.MatTooltip, i16.NgControlStatus, i16.NgModel, i1$1.NgIf, i6$1.MatAutocomplete, i2.MatButton, i12.MatSuffix, i4.MatIcon, i9.MatOptgroup, i9.MatOption, i2$2.CdkDragHandle], pipes: [i1$1.AsyncPipe, i7.TranslatePipe], styles: [".igo-input-container[_ngcontent-%COMP%]{width:100%}.igo-input-container[_ngcontent-%COMP%]   mat-form-field[_ngcontent-%COMP%]{width:100%}.igo-input-container.reduce[_ngcontent-%COMP%]{width:70%}.igo-input-container.reduce[_ngcontent-%COMP%]   mat-form-field[_ngcontent-%COMP%]{width:100%}.stops-list[_ngcontent-%COMP%]{max-width:100%;min-height:60px;display:block;background:white;border-radius:4px;overflow:hidden;padding:20px 10px}.swipe-vertical[_ngcontent-%COMP%]{cursor:move}.stop-box[_ngcontent-%COMP%]{height:60px;padding:20px 10px;color:#000000de;display:flex;flex-direction:row;align-items:center;justify-content:space-between;box-sizing:border-box;background:white}.cdk-drag-preview[_ngcontent-%COMP%]{box-sizing:border-box;border-radius:4px;box-shadow:0 5px 5px -3px #0003,0 8px 10px 1px #00000024,0 3px 14px 2px #0000001f}.cdk-drag-placeholder[_ngcontent-%COMP%]{opacity:0}.cdk-drag-animating[_ngcontent-%COMP%]{transition:transform .25s cubic-bezier(0,0,.2,1)}.stops-list.cdk-drop-list-dragging[_ngcontent-%COMP%]   .stop-box[_ngcontent-%COMP%]:not(.cdk-drag-placeholder){transition:transform .25s cubic-bezier(0,0,.2,1)}"] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(DirectionsInputsComponent, [{
         type: Component,
         args: [{
@@ -32684,6 +33188,10 @@ class DirectionsButtonsComponent {
         if (!this.route) {
             return;
         }
+        let context = '';
+        if (this.contextUri) {
+            context = `context=${this.contextUri}&`;
+        }
         const pos = this.routesFeatureStore.all()
             .map((direction) => direction.properties.id).indexOf(this.activeRoute.properties.id);
         let routingOptions = '';
@@ -32696,13 +33204,13 @@ class DirectionsButtonsComponent {
         let directionsUrl = '';
         if (stopsCoordinates.length >= 2) {
             directionsUrl = `${directionsKey}=${stopsCoordinates.join(';')}`;
-            return `${location.origin}${location.pathname}?tool=directions&sidenav=1&${directionsUrl}${routingOptions}`;
+            return `${location.origin}${location.pathname}?${context}tool=directions&sidenav=1&${directionsUrl}${routingOptions}`;
         }
         return;
     }
 }
 DirectionsButtonsComponent.ɵfac = function DirectionsButtonsComponent_Factory(t) { return new (t || DirectionsButtonsComponent)(i0.ɵɵdirectiveInject(i2$1.LanguageService), i0.ɵɵdirectiveInject(i2$1.MessageService), i0.ɵɵdirectiveInject(i2$1.RouteService, 8)); };
-DirectionsButtonsComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: DirectionsButtonsComponent, selectors: [["igo-directions-buttons"]], inputs: { zoomToActiveRoute$: "zoomToActiveRoute$", stopsStore: "stopsStore", routesFeatureStore: "routesFeatureStore" }, decls: 13, vars: 17, consts: [[1, "igo-form-button-group"], ["mat-icon-button", "", "tooltip-position", "below", "matTooltipShowDelay", "500", "color", "primary", 3, "matTooltip", "click"], ["svgIcon", "map-marker-plus"], ["mat-icon-button", "", "tooltip-position", "below", "matTooltipShowDelay", "500", "color", "warn", 3, "matTooltip", "click", 4, "ngIf"], ["mat-icon-button", "", "tooltip-position", "below", "matTooltipShowDelay", "500", "color", "primary", 3, "matTooltip", "click", 4, "ngIf"], ["mat-icon-button", "", "tooltip-position", "below", "matTooltipShowDelay", "500", "color", "warn", 3, "matTooltip", "click"], ["svgIcon", "file-restore"], ["svgIcon", "magnify-plus-outline"], ["svgIcon", "content-copy"], ["svgIcon", "link"]], template: function DirectionsButtonsComponent_Template(rf, ctx) { if (rf & 1) {
+DirectionsButtonsComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: DirectionsButtonsComponent, selectors: [["igo-directions-buttons"]], inputs: { contextUri: "contextUri", zoomToActiveRoute$: "zoomToActiveRoute$", stopsStore: "stopsStore", routesFeatureStore: "routesFeatureStore" }, decls: 13, vars: 17, consts: [[1, "igo-form-button-group"], ["mat-icon-button", "", "tooltip-position", "below", "matTooltipShowDelay", "500", "color", "primary", 3, "matTooltip", "click"], ["svgIcon", "map-marker-plus"], ["mat-icon-button", "", "tooltip-position", "below", "matTooltipShowDelay", "500", "color", "warn", 3, "matTooltip", "click", 4, "ngIf"], ["mat-icon-button", "", "tooltip-position", "below", "matTooltipShowDelay", "500", "color", "primary", 3, "matTooltip", "click", 4, "ngIf"], ["mat-icon-button", "", "tooltip-position", "below", "matTooltipShowDelay", "500", "color", "warn", 3, "matTooltip", "click"], ["svgIcon", "file-restore"], ["svgIcon", "magnify-plus-outline"], ["svgIcon", "content-copy"], ["svgIcon", "link"]], template: function DirectionsButtonsComponent_Template(rf, ctx) { if (rf & 1) {
         i0.ɵɵelementStart(0, "div", 0);
         i0.ɵɵelementStart(1, "button", 1);
         i0.ɵɵlistener("click", function DirectionsButtonsComponent_Template_button_click_1_listener() { return ctx.addStop(); });
@@ -32740,7 +33248,9 @@ DirectionsButtonsComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type:
             }]
     }], function () { return [{ type: i2$1.LanguageService }, { type: i2$1.MessageService }, { type: i2$1.RouteService, decorators: [{
                 type: Optional
-            }] }]; }, { zoomToActiveRoute$: [{
+            }] }]; }, { contextUri: [{
+            type: Input
+        }], zoomToActiveRoute$: [{
             type: Input
         }], stopsStore: [{
             type: Input
@@ -33188,7 +33698,7 @@ class DirectionsComponent {
     }
 }
 DirectionsComponent.ɵfac = function DirectionsComponent_Factory(t) { return new (t || DirectionsComponent)(i0.ɵɵdirectiveInject(i0.ChangeDetectorRef), i0.ɵɵdirectiveInject(i2$1.LanguageService), i0.ɵɵdirectiveInject(DirectionsService), i0.ɵɵdirectiveInject(SearchService), i0.ɵɵdirectiveInject(QueryService)); };
-DirectionsComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: DirectionsComponent, selectors: [["igo-directions"]], inputs: { stopsStore: "stopsStore", stopsFeatureStore: "stopsFeatureStore", routesFeatureStore: "routesFeatureStore", stepFeatureStore: "stepFeatureStore", debounce: "debounce", length: "length", coordRoundedDecimals: "coordRoundedDecimals", zoomToActiveRoute$: "zoomToActiveRoute$" }, decls: 4, vars: 11, consts: [[3, "zoomToActiveRoute$", "routesFeatureStore", "stopsStore"], [3, "coordRoundedDecimals", "projection", "stopsFeatureStore", "stopsStore", "debounce", "length", "stopInputHasFocus"], [3, "stepFeatureStore", "routesFeatureStore"]], template: function DirectionsComponent_Template(rf, ctx) { if (rf & 1) {
+DirectionsComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: DirectionsComponent, selectors: [["igo-directions"]], inputs: { contextUri: "contextUri", stopsStore: "stopsStore", stopsFeatureStore: "stopsFeatureStore", routesFeatureStore: "routesFeatureStore", stepFeatureStore: "stepFeatureStore", debounce: "debounce", length: "length", coordRoundedDecimals: "coordRoundedDecimals", zoomToActiveRoute$: "zoomToActiveRoute$" }, decls: 4, vars: 12, consts: [[3, "contextUri", "zoomToActiveRoute$", "routesFeatureStore", "stopsStore"], [3, "coordRoundedDecimals", "projection", "stopsFeatureStore", "stopsStore", "debounce", "length", "stopInputHasFocus"], [3, "stepFeatureStore", "routesFeatureStore"]], template: function DirectionsComponent_Template(rf, ctx) { if (rf & 1) {
         i0.ɵɵelement(0, "igo-directions-buttons", 0);
         i0.ɵɵelementStart(1, "igo-directions-inputs", 1);
         i0.ɵɵlistener("stopInputHasFocus", function DirectionsComponent_Template_igo_directions_inputs_stopInputHasFocus_1_listener($event) { return ctx.onStopInputHasFocusChange($event); });
@@ -33196,7 +33706,7 @@ DirectionsComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: Directi
         i0.ɵɵelement(2, "br");
         i0.ɵɵelement(3, "igo-directions-results", 2);
     } if (rf & 2) {
-        i0.ɵɵproperty("zoomToActiveRoute$", ctx.zoomToActiveRoute$)("routesFeatureStore", ctx.routesFeatureStore)("stopsStore", ctx.stopsStore);
+        i0.ɵɵproperty("contextUri", ctx.contextUri)("zoomToActiveRoute$", ctx.zoomToActiveRoute$)("routesFeatureStore", ctx.routesFeatureStore)("stopsStore", ctx.stopsStore);
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("coordRoundedDecimals", ctx.coordRoundedDecimals)("projection", ctx.projection)("stopsFeatureStore", ctx.stopsFeatureStore)("stopsStore", ctx.stopsStore)("debounce", ctx.debounce)("length", ctx.length);
         i0.ɵɵadvance(2);
@@ -33209,7 +33719,9 @@ DirectionsComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: Directi
                 templateUrl: './directions.component.html',
                 styleUrls: ['./directions.component.scss']
             }]
-    }], function () { return [{ type: i0.ChangeDetectorRef }, { type: i2$1.LanguageService }, { type: DirectionsService }, { type: SearchService }, { type: QueryService }]; }, { stopsStore: [{
+    }], function () { return [{ type: i0.ChangeDetectorRef }, { type: i2$1.LanguageService }, { type: DirectionsService }, { type: SearchService }, { type: QueryService }]; }, { contextUri: [{
+            type: Input
+        }], stopsStore: [{
             type: Input
         }], stopsFeatureStore: [{
             type: Input
@@ -34742,7 +35254,7 @@ SearchSelectorComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: Sea
         i0.ɵɵproperty("value", i0.ɵɵpipeBind1(7, 6, ctx.searchType$));
         i0.ɵɵadvance(2);
         i0.ɵɵproperty("ngForOf", ctx.searchTypes);
-    } }, directives: [i2.MatButton, i3.MatTooltip, i5$1.MatMenuTrigger, i4.MatIcon, i5$1.MatMenu, i19.MatRadioGroup, i1$1.NgForOf, i19.MatRadioButton], pipes: [i7.TranslatePipe, i1$1.AsyncPipe], styles: [".igo-search-selector-button[_ngcontent-%COMP%]     div.mat-button-ripple-round{border-radius:0}.igo-search-selector-radio-group[_ngcontent-%COMP%]{display:inline-flex;flex-direction:column}.igo-search-selector-radio-group[_ngcontent-%COMP%]   mat-radio-button[_ngcontent-%COMP%]{margin:5px}"], changeDetection: 0 });
+    } }, directives: [i2.MatButton, i3.MatTooltip, i5$2.MatMenuTrigger, i4.MatIcon, i5$2.MatMenu, i19.MatRadioGroup, i1$1.NgForOf, i19.MatRadioButton], pipes: [i7.TranslatePipe, i1$1.AsyncPipe], styles: [".igo-search-selector-button[_ngcontent-%COMP%]     div.mat-button-ripple-round{border-radius:0}.igo-search-selector-radio-group[_ngcontent-%COMP%]{display:inline-flex;flex-direction:column}.igo-search-selector-radio-group[_ngcontent-%COMP%]   mat-radio-button[_ngcontent-%COMP%]{margin:5px}"], changeDetection: 0 });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(SearchSelectorComponent, [{
         type: Component,
         args: [{
@@ -35201,7 +35713,7 @@ SearchSettingsComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: Sea
         i0.ɵɵproperty("ngForOf", ctx.getSearchSources());
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("ngIf", ctx.hasPointerReverseSearchSource && !ctx.isTouchScreen);
-    } }, directives: [i2.MatButton, i3.MatTooltip, i5$1.MatMenuTrigger, i4.MatIcon, i5$1.MatMenu, i1$1.NgIf, i1$1.NgForOf, i11.MatCheckbox, i5$1.MatMenuItem, i1$1.NgSwitch, i1$1.NgSwitchCase, i19.MatRadioGroup, i19.MatRadioButton, i10.MatDivider, i22.MatSlideToggle], pipes: [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 });
+    } }, directives: [i2.MatButton, i3.MatTooltip, i5$2.MatMenuTrigger, i4.MatIcon, i5$2.MatMenu, i1$1.NgIf, i1$1.NgForOf, i11.MatCheckbox, i5$2.MatMenuItem, i1$1.NgSwitch, i1$1.NgSwitchCase, i19.MatRadioGroup, i19.MatRadioButton, i10.MatDivider, i22.MatSlideToggle], pipes: [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,
         args: [{
@@ -35590,7 +36102,9 @@ class SearchBarComponent {
         let terms;
         if (this.termSplitter && rawTerm.match(new RegExp(this.termSplitter, 'g'))) {
             terms = rawTerm.split(this.termSplitter).filter((t) => t.length >= this.minLength);
-            this.store.clear();
+            if (this.store) {
+                this.store.clear();
+            }
         }
         else {
             terms = [rawTerm];
@@ -35686,7 +36200,7 @@ SearchBarComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: SearchBa
         i0.ɵɵproperty("ngIf", ctx.searchSelector);
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("ngIf", ctx.searchSettings);
-    } }, directives: [i1$1.NgClass, i12.MatFormField, i1$1.NgIf, i5.MatInput, i12.MatLabel, i2.MatButton, i4.MatIcon, SearchSelectorComponent, SearchSettingsComponent], pipes: [i1$1.AsyncPipe, i7.TranslatePipe], styles: ["[_nghost-%COMP%]     .mat-form-field{padding:0 5px}[_nghost-%COMP%]     .mat-form-field-wrapper{margin-bottom:-1.5em}[_nghost-%COMP%]     span.mat-form-field-label-wrapper{top:-20px}[_nghost-%COMP%]     div.mat-form-field-infix{left:5px;right:5px;padding:0 0 12px!important}[_nghost-%COMP%]     div.mat-form-field-underline{display:none}.igo-search-bar-container[_ngcontent-%COMP%]{position:relative;width:100%;display:inline-flex;overflow:hidden}.igo-search-bar-container[_ngcontent-%COMP%] > mat-form-field[_ngcontent-%COMP%]{width:calc(100% - (2 * 40px))}.igo-search-bar-container.empty[_ngcontent-%COMP%] > mat-form-field[_ngcontent-%COMP%]{width:calc(100% - 40px)}.search-bar-buttons[_ngcontent-%COMP%]{position:relative;right:0px;display:inline-flex;top:0}.search-bar-buttons[_ngcontent-%COMP%] > button[_ngcontent-%COMP%]:nth-child(2):before{content:\"\";left:0px;top:5px;border-right:1px solid #ddd;height:28px}igo-search-selector[_ngcontent-%COMP%]{background-color:#fff;top:0;border-radius:0}igo-search-settings[_ngcontent-%COMP%]{background-color:#fff;top:0;border-radius:0}"], changeDetection: 0 });
+    } }, directives: [i1$1.NgClass, i12.MatFormField, i1$1.NgIf, i5$1.MatInput, i12.MatLabel, i2.MatButton, i4.MatIcon, SearchSelectorComponent, SearchSettingsComponent], pipes: [i1$1.AsyncPipe, i7.TranslatePipe], styles: ["[_nghost-%COMP%]     .mat-form-field{padding:0 5px}[_nghost-%COMP%]     .mat-form-field-wrapper{margin-bottom:-1.5em}[_nghost-%COMP%]     span.mat-form-field-label-wrapper{top:-20px}[_nghost-%COMP%]     div.mat-form-field-infix{left:5px;right:5px;padding:0 0 12px!important}[_nghost-%COMP%]     div.mat-form-field-underline{display:none}.igo-search-bar-container[_ngcontent-%COMP%]{position:relative;width:100%;display:inline-flex;overflow:hidden}.igo-search-bar-container[_ngcontent-%COMP%] > mat-form-field[_ngcontent-%COMP%]{width:calc(100% - (2 * 40px))}.igo-search-bar-container.empty[_ngcontent-%COMP%] > mat-form-field[_ngcontent-%COMP%]{width:calc(100% - 40px)}.search-bar-buttons[_ngcontent-%COMP%]{position:relative;right:0px;display:inline-flex;top:0}.search-bar-buttons[_ngcontent-%COMP%] > button[_ngcontent-%COMP%]:nth-child(2):before{content:\"\";left:0px;top:5px;border-right:1px solid #ddd;height:28px}igo-search-selector[_ngcontent-%COMP%]{background-color:#fff;top:0;border-radius:0}igo-search-settings[_ngcontent-%COMP%]{background-color:#fff;top:0;border-radius:0}"], changeDetection: 0 });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(SearchBarComponent, [{
         type: Component,
         args: [{
@@ -35940,7 +36454,7 @@ SearchResultsItemComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type:
         i0.ɵɵproperty("ngIf", !ctx.titleHtml);
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("ngIf", ctx.withZoomButton);
-    } }, directives: [i1$3.MatListItem, i1$1.NgIf, i4.MatIcon, i1$3.MatListAvatarCssMatStyler, i9.MatLine, i3.MatTooltip, i2.MatButton, i6$1.StopPropagationDirective], styles: ["[_nghost-%COMP%]     small{color:#8c8c8c}  .search-result-tooltip{white-space:pre-line}"], changeDetection: 0 });
+    } }, directives: [i1$3.MatListItem, i1$1.NgIf, i4.MatIcon, i1$3.MatListAvatarCssMatStyler, i9.MatLine, i3.MatTooltip, i2.MatButton, i6.StopPropagationDirective], styles: ["[_nghost-%COMP%]     small{color:#8c8c8c}  .search-result-tooltip{white-space:pre-line}"], changeDetection: 0 });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(SearchResultsItemComponent, [{
         type: Component,
         args: [{
@@ -36246,7 +36760,7 @@ SearchResultsComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: Sear
         i0.ɵɵproperty("navigation", true);
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("ngForOf", i0.ɵɵpipeBind1(3, 2, ctx.results$));
-    } }, directives: [i6$1.ListComponent, i1$1.NgForOf, i1$1.NgIf, i6$1.CollapsibleComponent, i1$1.NgTemplateOutlet, SearchResultsItemComponent, i6$1.ListItemDirective], pipes: [i1$1.AsyncPipe, i7.TranslatePipe], styles: [".moreResults[_ngcontent-%COMP%]{cursor:pointer;color:#00f;float:right;margin-right:10px;margin-top:5px}igo-list[_ngcontent-%COMP%]     mat-list{height:100%}"], changeDetection: 0 });
+    } }, directives: [i6.ListComponent, i1$1.NgForOf, i1$1.NgIf, i6.CollapsibleComponent, i1$1.NgTemplateOutlet, SearchResultsItemComponent, i6.ListItemDirective], pipes: [i1$1.AsyncPipe, i7.TranslatePipe], styles: [".moreResults[_ngcontent-%COMP%]{cursor:pointer;color:#00f;float:right;margin-right:10px;margin-top:5px}igo-list[_ngcontent-%COMP%]     mat-list{height:100%}"], changeDetection: 0 });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(SearchResultsComponent, [{
         type: Component,
         args: [{
@@ -36451,11 +36965,11 @@ class SearchResultAddButtonComponent {
     }
 }
 SearchResultAddButtonComponent.ɵfac = function SearchResultAddButtonComponent_Factory(t) { return new (t || SearchResultAddButtonComponent)(i0.ɵɵdirectiveInject(LayerService)); };
-SearchResultAddButtonComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: SearchResultAddButtonComponent, selectors: [["igo-search-add-button"]], inputs: { layer: "layer", added: "added", map: "map", color: "color" }, decls: 1, vars: 1, consts: [["mat-icon-button", "", "tooltip-position", "below", "matTooltipShowDelay", "500", 3, "matTooltip", "color", "mouseenter", "mouseleave", "click", 4, "ngIf"], ["mat-icon-button", "", "tooltip-position", "below", "matTooltipShowDelay", "500", 3, "matTooltip", "color", "mouseenter", "mouseleave", "click"], ["matBadge", "icon", "igoMatBadgeIcon", "eye-off", "igoMatBadgeInverseColor", "true", "matBadgeDisabled", "true", "matBadgeSize", "small", "matBadgePosition", "after", 3, "matBadgeHidden", "svgIcon"]], template: function SearchResultAddButtonComponent_Template(rf, ctx) { if (rf & 1) {
+SearchResultAddButtonComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: SearchResultAddButtonComponent, selectors: [["igo-search-add-button"]], inputs: { layer: "layer", added: "added", map: "map", color: "color" }, decls: 1, vars: 1, consts: [["igoStopPropagation", "", "mat-icon-button", "", "tooltip-position", "below", "matTooltipShowDelay", "500", 3, "matTooltip", "color", "mouseenter", "mouseleave", "click", 4, "ngIf"], ["igoStopPropagation", "", "mat-icon-button", "", "tooltip-position", "below", "matTooltipShowDelay", "500", 3, "matTooltip", "color", "mouseenter", "mouseleave", "click"], ["matBadge", "icon", "igoMatBadgeIcon", "eye-off", "igoMatBadgeInverseColor", "true", "matBadgeDisabled", "true", "matBadgeSize", "small", "matBadgePosition", "after", 3, "matBadgeHidden", "svgIcon"]], template: function SearchResultAddButtonComponent_Template(rf, ctx) { if (rf & 1) {
         i0.ɵɵtemplate(0, SearchResultAddButtonComponent_button_0_Template, 7, 14, "button", 0);
     } if (rf & 2) {
         i0.ɵɵproperty("ngIf", ctx.layer.meta.dataType === "Layer");
-    } }, directives: [i1$1.NgIf, i2.MatButton, i3.MatTooltip, i4.MatIcon, i9$1.MatBadge, i6$1.IgoBadgeIconDirective], pipes: [i7.TranslatePipe, i1$1.AsyncPipe], styles: [""], changeDetection: 0 });
+    } }, directives: [i1$1.NgIf, i2.MatButton, i6.StopPropagationDirective, i3.MatTooltip, i4.MatIcon, i9$1.MatBadge, i6.IgoBadgeIconDirective], pipes: [i7.TranslatePipe, i1$1.AsyncPipe], styles: [""], changeDetection: 0 });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(SearchResultAddButtonComponent, [{
         type: Component,
         args: [{
@@ -36599,6 +37113,7 @@ class SearchPointerSummaryDirective {
     initStore() {
         const store = this.store;
         const layer = new VectorLayer({
+            isIgoInternalLayer: true,
             id: 'searchPointerSummaryId',
             title: 'searchPointerSummary',
             zIndex: 900,
@@ -36986,7 +37501,7 @@ ToastComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: ToastCompone
         i0.ɵɵproperty("ngIf", ctx.feature.geometry);
         i0.ɵɵadvance(1);
         i0.ɵɵproperty("feature", ctx.feature);
-    } }, directives: [i6$1.FlexibleComponent, i6$1.PanelComponent, i2.MatButton, i4.MatIcon, i1$1.NgIf, FeatureDetailsComponent], styles: ["[_nghost-%COMP%]{position:absolute;bottom:0px;width:100%;max-height:calc(100% - 50px);background-color:#fff}igo-feature-details[_ngcontent-%COMP%]     table{width:100%}"] });
+    } }, directives: [i6.FlexibleComponent, i6.PanelComponent, i2.MatButton, i4.MatIcon, i1$1.NgIf, FeatureDetailsComponent], styles: ["[_nghost-%COMP%]{position:absolute;bottom:0px;width:100%;max-height:calc(100% - 50px);background-color:#fff}igo-feature-details[_ngcontent-%COMP%]     table{width:100%}"] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(ToastComponent, [{
         type: Component,
         args: [{
@@ -37151,24 +37666,42 @@ class WfsWorkspace extends Workspace {
     }
     get layer() { return this.options.layer; }
     get map() { return this.options.map; }
+    getLayerWksOptionTabQuery() {
+        var _a;
+        if (((_a = this.layer.options.workspace.queryOptions) === null || _a === void 0 ? void 0 : _a.tabQuery) !== undefined) {
+            return this.layer.options.workspace.queryOptions.tabQuery;
+        }
+        return true;
+    }
+    getLayerWksOptionMapQuery() {
+        var _a;
+        if (((_a = this.layer.options.workspace.queryOptions) === null || _a === void 0 ? void 0 : _a.mapQueryOnOpenTab) !== undefined) {
+            return this.layer.options.workspace.queryOptions.mapQueryOnOpenTab;
+        }
+        return true;
+    }
+    getInResolutionRange() {
+        return this.inResolutionRange$.value;
+    }
 }
 
 class WfsWorkspaceService {
     constructor(storageService) {
         this.storageService = storageService;
+        this.ws$ = new BehaviorSubject(undefined);
     }
     get zoomAuto() {
         return this.storageService.get('zoomAuto');
     }
     createWorkspace(layer, map) {
         var _a;
-        if (((_a = layer.options.workspace) === null || _a === void 0 ? void 0 : _a.enabled) === false) {
+        if (((_a = layer.options.workspace) === null || _a === void 0 ? void 0 : _a.enabled) === false || layer.dataSource.options.edition) {
             return;
         }
         layer.options.workspace = Object.assign({}, layer.options.workspace, {
-            enabled: true,
             srcId: layer.id,
-            workspaceId: layer.id
+            workspaceId: layer.id,
+            enabled: true
         });
         const wks = new WfsWorkspace({
             id: layer.id,
@@ -37216,6 +37749,7 @@ class WfsWorkspaceService {
     }
     createTableTemplate(workspace, layer) {
         const fields = layer.dataSource.options.sourceFields || [];
+        const relations = layer.dataSource.options.relations || [];
         if (fields.length === 0) {
             workspace.entityStore.entities$.pipe(skipWhile(val => val.length === 0), take(1)).subscribe(entities => {
                 const ol = entities[0].ol;
@@ -37243,9 +37777,28 @@ class WfsWorkspaceService {
             return {
                 name: `properties.${field.name}`,
                 title: field.alias ? field.alias : field.name,
-                renderer: EntityTableColumnRenderer.UnsanitizedHTML
+                renderer: EntityTableColumnRenderer.UnsanitizedHTML,
+                tooltip: field.tooltip
+            };
+        });
+        const relationsColumn = relations.map((relation) => {
+            return {
+                name: `properties.${relation.name}`,
+                title: relation.alias ? relation.alias : relation.name,
+                renderer: EntityTableColumnRenderer.Icon,
+                icon: relation.icon,
+                parent: relation.parent,
+                type: 'relation',
+                tooltip: relation.tooltip,
+                onClick: () => {
+                    this.ws$.next(relation.title);
+                },
+                cellClassFunc: () => {
+                    return { 'class_icon': true };
+                }
             };
         });
+        columns.push(...relationsColumn);
         workspace.meta.tableTemplate = {
             selection: true,
             sort: true,
@@ -37272,13 +37825,16 @@ class WmsWorkspaceService {
     constructor(layerService, storageService) {
         this.layerService = layerService;
         this.storageService = storageService;
+        this.ws$ = new BehaviorSubject(undefined);
     }
     get zoomAuto() {
         return this.storageService.get('zoomAuto');
     }
     createWorkspace(layer, map) {
-        var _a, _b, _c, _d, _e, _f;
-        if (((_a = layer.options.workspace) === null || _a === void 0 ? void 0 : _a.enabled) !== true) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        if (!layer.options.workspace ||
+            map.layers.find(lay => lay.id === layer.id + '.WfsWorkspaceTableDest') ||
+            layer.dataSource.options.edition) {
             return;
         }
         const dataSource = layer.dataSource;
@@ -37296,15 +37852,15 @@ class WmsWorkspaceService {
                 LinkedProperties.VISIBLE
             ]
         };
-        if (!((_b = layer.options.workspace) === null || _b === void 0 ? void 0 : _b.minResolution)) {
+        if (!((_a = layer.options.workspace) === null || _a === void 0 ? void 0 : _a.minResolution)) {
             linkProperties.properties.push(LinkedProperties.MINRESOLUTION);
         }
         let hasOgcFilters = false;
-        if ((_c = dataSource.options.ogcFilters) === null || _c === void 0 ? void 0 : _c.enabled) {
+        if ((_b = dataSource.options.ogcFilters) === null || _b === void 0 ? void 0 : _b.enabled) {
             linkProperties.properties.push(LinkedProperties.OGCFILTERS);
             hasOgcFilters = true;
         }
-        if (!((_d = layer.options.workspace) === null || _d === void 0 ? void 0 : _d.maxResolution)) {
+        if (!((_c = layer.options.workspace) === null || _c === void 0 ? void 0 : _c.maxResolution)) {
             linkProperties.properties.push(LinkedProperties.MAXRESOLUTION);
         }
         let clonedLinks = [];
@@ -37315,37 +37871,51 @@ class WmsWorkspaceService {
         layer.options.linkedLayers.linkId = layer.options.linkedLayers.linkId ? layer.options.linkedLayers.linkId : wmsLinkId,
             layer.options.linkedLayers.links = clonedLinks;
         let wks;
+        let wksLayerOption = {
+            srcId: layer.id,
+            workspaceId: undefined,
+            enabled: false,
+            queryOptions: {
+                mapQueryOnOpenTab: (_e = (_d = layer.options.workspace) === null || _d === void 0 ? void 0 : _d.queryOptions) === null || _e === void 0 ? void 0 : _e.mapQueryOnOpenTab,
+                tabQuery: (_g = (_f = layer.options.workspace) === null || _f === void 0 ? void 0 : _f.queryOptions) === null || _g === void 0 ? void 0 : _g.tabQuery
+            },
+            pageSize: (_h = layer.options.workspace) === null || _h === void 0 ? void 0 : _h.pageSize,
+            pageSizeOptions: (_j = layer.options.workspace) === null || _j === void 0 ? void 0 : _j.pageSizeOptions
+        };
         this.layerService
             .createAsyncLayer({
+            isIgoInternalLayer: true,
             id: wfsLinkId,
             linkedLayers: {
                 linkId: wfsLinkId
             },
-            workspace: {
-                srcId: layer.id,
-                workspaceId: undefined,
-                enabled: false,
-            },
+            workspace: wksLayerOption,
             showInLayerList: false,
             opacity: 0,
             title: layer.title,
-            minResolution: ((_e = layer.options.workspace) === null || _e === void 0 ? void 0 : _e.minResolution) || layer.minResolution || 0,
-            maxResolution: ((_f = layer.options.workspace) === null || _f === void 0 ? void 0 : _f.maxResolution) || layer.maxResolution || Infinity,
+            minResolution: ((_k = layer.options.workspace) === null || _k === void 0 ? void 0 : _k.minResolution) || layer.minResolution || 0,
+            maxResolution: ((_l = layer.options.workspace) === null || _l === void 0 ? void 0 : _l.maxResolution) || layer.maxResolution || Infinity,
             sourceOptions: {
                 download: dataSource.options.download,
                 type: 'wfs',
                 url: dataSource.options.urlWfs || dataSource.options.url,
                 queryable: true,
+                relations: dataSource.options.relations,
                 queryTitle: dataSource.options.queryTitle,
+                queryFormatAsWms: dataSource.options.queryFormatAsWms,
                 params: dataSource.options.paramsWFS,
                 ogcFilters: Object.assign({}, dataSource.ogcFilters$.value, { enabled: hasOgcFilters }),
                 sourceFields: dataSource.options.sourceFields || undefined
             }
         })
             .subscribe((workspaceLayer) => {
+            var _a, _b, _c, _d, _e, _f, _g;
             map.addLayer(workspaceLayer);
             layer.ol.setProperties({ linkedLayers: { linkId: layer.options.linkedLayers.linkId, links: clonedLinks } }, false);
             workspaceLayer.dataSource.ol.refresh();
+            if (!((_a = layer.options.workspace) === null || _a === void 0 ? void 0 : _a.enabled)) {
+                return;
+            }
             wks = new WfsWorkspace({
                 id: layer.id,
                 title: layer.title,
@@ -37362,7 +37932,13 @@ class WmsWorkspaceService {
             layer.options.workspace = Object.assign({}, layer.options.workspace, {
                 enabled: true,
                 srcId: layer.id,
-                workspaceId: workspaceLayer.id
+                workspaceId: workspaceLayer.id,
+                queryOptions: {
+                    mapQueryOnOpenTab: (_c = (_b = layer.options.workspace) === null || _b === void 0 ? void 0 : _b.queryOptions) === null || _c === void 0 ? void 0 : _c.mapQueryOnOpenTab,
+                    tabQuery: (_e = (_d = layer.options.workspace) === null || _d === void 0 ? void 0 : _d.queryOptions) === null || _e === void 0 ? void 0 : _e.tabQuery
+                },
+                pageSize: (_f = layer.options.workspace) === null || _f === void 0 ? void 0 : _f.pageSize,
+                pageSizeOptions: (_g = layer.options.workspace) === null || _g === void 0 ? void 0 : _g.pageSizeOptions
             });
             delete dataSource.options.download;
             return wks;
@@ -37401,6 +37977,7 @@ class WmsWorkspaceService {
     }
     createTableTemplate(workspace, layer) {
         const fields = layer.dataSource.options.sourceFields || [];
+        const relations = layer.dataSource.options.relations || [];
         if (fields.length === 0) {
             workspace.entityStore.entities$.pipe(skipWhile(val => val.length === 0), take(1)).subscribe(entities => {
                 const ol = entities[0].ol;
@@ -37428,9 +38005,28 @@ class WmsWorkspaceService {
             return {
                 name: `properties.${field.name}`,
                 title: field.alias ? field.alias : field.name,
-                renderer: EntityTableColumnRenderer.UnsanitizedHTML
+                renderer: EntityTableColumnRenderer.UnsanitizedHTML,
+                tooltip: field.tooltip
             };
         });
+        const relationsColumn = relations.map((relation) => {
+            return {
+                name: `properties.${relation.name}`,
+                title: relation.alias ? relation.alias : relation.name,
+                renderer: EntityTableColumnRenderer.Icon,
+                icon: relation.icon,
+                parent: relation.parent,
+                type: 'relation',
+                tooltip: relation.tooltip,
+                onClick: () => {
+                    this.ws$.next(relation.title);
+                },
+                cellClassFunc: () => {
+                    return { 'class_icon': true };
+                }
+            };
+        });
+        columns.push(...relationsColumn);
         workspace.meta.tableTemplate = {
             selection: true,
             sort: true,
@@ -37453,6 +38049,918 @@ WmsWorkspaceService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: WmsW
             }]
     }], function () { return [{ type: LayerService }, { type: i2$1.StorageService }]; }, null); })();
 
+class ConfirmationPopupComponent {
+    constructor(dialogRef, languageService, data) {
+        this.dialogRef = dialogRef;
+        this.languageService = languageService;
+        this.data = data;
+    }
+    cancelAction() {
+        this.data.cancel = true;
+        this.dialogRef.close(this.data.cancel);
+    }
+    confirmedAction() {
+        this.data.cancel = false;
+        this.dialogRef.close(this.data.cancel);
+    }
+}
+ConfirmationPopupComponent.ɵfac = function ConfirmationPopupComponent_Factory(t) { return new (t || ConfirmationPopupComponent)(i0.ɵɵdirectiveInject(i1.MatDialogRef), i0.ɵɵdirectiveInject(i2$1.LanguageService), i0.ɵɵdirectiveInject(MAT_DIALOG_DATA)); };
+ConfirmationPopupComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: ConfirmationPopupComponent, selectors: [["igo-confirmation-popup-component"]], decls: 8, vars: 2, consts: [["mat-dialog-content", ""], [1, "mat-typography"], ["mat-dialog-actions", ""], ["mat-raised-button", "", "color", "primary", 3, "click"], ["mat-raised-button", "", 3, "click"]], template: function ConfirmationPopupComponent_Template(rf, ctx) { if (rf & 1) {
+        i0.ɵɵelementStart(0, "div", 0);
+        i0.ɵɵelementStart(1, "p", 1);
+        i0.ɵɵtext(2);
+        i0.ɵɵelementEnd();
+        i0.ɵɵelementEnd();
+        i0.ɵɵelementStart(3, "div", 2);
+        i0.ɵɵelementStart(4, "button", 3);
+        i0.ɵɵlistener("click", function ConfirmationPopupComponent_Template_button_click_4_listener() { return ctx.confirmedAction(); });
+        i0.ɵɵtext(5, "Ok ");
+        i0.ɵɵelementEnd();
+        i0.ɵɵelementStart(6, "button", 4);
+        i0.ɵɵlistener("click", function ConfirmationPopupComponent_Template_button_click_6_listener() { return ctx.cancelAction(); });
+        i0.ɵɵtext(7);
+        i0.ɵɵelementEnd();
+        i0.ɵɵelementEnd();
+    } if (rf & 2) {
+        i0.ɵɵadvance(2);
+        i0.ɵɵtextInterpolate(ctx.data.type === "add" ? ctx.languageService.translate.instant("igo.geo.workspace.addConfirmation") : ctx.languageService.translate.instant("igo.geo.workspace.deleteConfirmation"));
+        i0.ɵɵadvance(5);
+        i0.ɵɵtextInterpolate1("", ctx.languageService.translate.instant("igo.geo.workspace.cancel"), " ");
+    } }, directives: [i1.MatDialogContent, i1.MatDialogActions, i2.MatButton], styles: ["div.mat-dialog-actions[_ngcontent-%COMP%]{justify-content:center}"] });
+(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(ConfirmationPopupComponent, [{
+        type: Component,
+        args: [{
+                selector: 'igo-confirmation-popup-component',
+                templateUrl: './confirmation-popup.component.html',
+                styleUrls: ['./confirmation-popup.component.scss']
+            }]
+    }], function () { return [{ type: i1.MatDialogRef }, { type: i2$1.LanguageService }, { type: undefined, decorators: [{
+                type: Inject,
+                args: [MAT_DIALOG_DATA]
+            }] }]; }, null); })();
+
+class EditionWorkspace extends Workspace {
+    constructor(options, editionWorkspaceService, dialog, configService) {
+        super(options);
+        this.options = options;
+        this.editionWorkspaceService = editionWorkspaceService;
+        this.dialog = dialog;
+        this.configService = configService;
+        this.inResolutionRange$ = new BehaviorSubject(true);
+        this.olDrawingLayerSource = new OlVectorSource();
+        this.geometryType = GeometryType; // Reference to the GeometryType enum
+        this.modifyStyle = new olstyle.Style({
+            stroke: new olstyle.Stroke({
+                color: 'rgba(255,255,255,1)',
+                width: 1
+            }),
+            fill: new olstyle.Fill({
+                color: 'rgba(0,161,222,1)'
+            }),
+            image: new olstyle.Circle({
+                radius: 7,
+                stroke: new olstyle.Stroke({
+                    color: 'rgba(255,255,255,1)',
+                    width: 1
+                }),
+                fill: new olstyle.Fill({
+                    color: 'rgba(0,161,222,1)'
+                })
+            })
+        });
+        this.filterClauseFunc = (record) => {
+            return record.state.newFeature === true;
+        };
+        this.map.viewController.resolution$.subscribe((mapResolution) => {
+            if (mapResolution > this.layer.minResolution && mapResolution < this.layer.maxResolution) {
+                this.inResolutionRange$.next(true);
+            }
+            else {
+                this.inResolutionRange$.next(false);
+            }
+        });
+        this.drawControl = this.createDrawControl();
+        this.drawControl.setGeometryType(this.geometryType.Point);
+        this.map.removeLayer(this.olDrawingLayer);
+        this.olDrawingLayer = new VectorLayer({
+            id: 'igo-draw-layer',
+            title: 'edition',
+            zIndex: 300,
+            source: new FeatureDataSource(),
+            showInLayerList: false,
+            exportable: false,
+            browsable: false,
+            workspace: {
+                enabled: false
+            },
+        });
+    }
+    get layer() { return this.options.layer; }
+    get map() { return this.options.map; }
+    getInResolutionRange() {
+        return this.inResolutionRange$.value;
+    }
+    deleteFeature(feature, workspace) {
+        setTimeout(() => {
+            const dialogRef = this.dialog.open(ConfirmationPopupComponent, {
+                disableClose: false,
+                data: { type: 'delete' }
+            });
+            dialogRef.afterClosed().subscribe(result => {
+                if (result === false) {
+                    const baseUrl = workspace.layer.dataSource.options.edition.baseUrl;
+                    const deleteUrl = workspace.layer.dataSource.options.edition.deleteUrl;
+                    let id;
+                    let url;
+                    if (baseUrl) {
+                        url = this.configService.getConfig('edition.url') + baseUrl + '?' + deleteUrl;
+                    }
+                    else {
+                        url = this.configService.getConfig('edition.url') + deleteUrl;
+                    }
+                    for (const column of workspace.meta.tableTemplate.columns) {
+                        for (const property in feature.properties) {
+                            let columnName = column.name;
+                            if (columnName.includes('properties.')) {
+                                columnName = columnName.split('.')[1];
+                            }
+                            if (columnName === property && column.primary === true) {
+                                id = feature.properties[property];
+                            }
+                        }
+                    }
+                    if (url) {
+                        url += id;
+                        this.editionWorkspaceService.deleteFeature(workspace, url);
+                    }
+                }
+            });
+        }, 250);
+    }
+    editFeature(feature, workspace) {
+        feature.edition = true;
+        let id;
+        let find = false;
+        const editionOpt = workspace.layer.dataSource.options.edition;
+        for (const column of workspace.meta.tableTemplate.columns) {
+            // Update domain list
+            if (column.type === 'list' || column.type === 'autocomplete') {
+                this.editionWorkspaceService.getDomainValues(column.relation.table).subscribe(result => {
+                    column.domainValues = result;
+                });
+            }
+            if (find === false) {
+                for (const property in feature.properties) {
+                    let columnName = column.name;
+                    if (columnName.includes('properties.')) {
+                        columnName = columnName.split('.')[1];
+                    }
+                    if (columnName === property && column.primary === true) {
+                        id = feature.properties[property];
+                        find = true;
+                        break;
+                    }
+                }
+            }
+        }
+        if (id) {
+            feature.original_properties = JSON.parse(JSON.stringify(feature.properties));
+            feature.original_geometry = feature.geometry;
+            feature.idkey = id;
+            this.addFeatureToStore(feature, workspace);
+        }
+        else {
+            // Only for edition with it's own geometry
+            if (!feature.newFeature && editionOpt.geomType) {
+                feature.newFeature = true;
+                this.editionWorkspaceService.adding$.next(true);
+                workspace.entityStore.state.updateAll({ newFeature: false });
+                workspace.entityStore.stateView.filter(this.filterClauseFunc);
+                if (editionOpt.addWithDraw) {
+                    const geometryType = editionOpt.geomType;
+                    this.onGeometryTypeChange(geometryType, feature, workspace);
+                }
+                else {
+                    workspace.entityStore.insert(feature);
+                    workspace.entityStore.state.update(feature, { newFeature: true }, true);
+                }
+            }
+        }
+    }
+    /**
+     * Create a Draw Control
+     * @param fillColor the fill color
+     * @param strokeColor the stroke color
+     * @param strokeWidth the stroke width
+     * @returns a Draw Control
+     */
+    createDrawControl(fillColor, strokeColor, strokeWidth) {
+        const drawControl = new DrawControl({
+            geometryType: undefined,
+            drawingLayerSource: this.olDrawingLayerSource,
+            drawingLayerStyle: new olstyle.Style({}),
+            interactionStyle: createInteractionStyle(fillColor, strokeColor, strokeWidth),
+        });
+        return drawControl;
+    }
+    /**
+     * Called when the user selects a new geometry type
+     * @param geometryType the geometry type selected by the user
+     */
+    onGeometryTypeChange(geometryType, feature, workspace) {
+        this.drawControl.setGeometryType(geometryType);
+        this.toggleDrawControl(feature, workspace);
+    }
+    /**
+     * Activate the correct control
+     */
+    toggleDrawControl(feature, workspace) {
+        this.deactivateDrawControl();
+        this.activateDrawControl(feature, workspace);
+    }
+    /**
+     * Deactivate the active draw control
+     */
+    deactivateDrawControl() {
+        if (!this.drawControl) {
+            return;
+        }
+        if (this.drawEnd$$) {
+            this.drawEnd$$.unsubscribe();
+        }
+        this.drawControl.setOlMap(undefined);
+    }
+    /**
+     * Activate a given control
+     */
+    activateDrawControl(feature, workspace) {
+        this.drawEnd$$ = this.drawControl.end$.subscribe((olGeometry) => {
+            this.addFeatureToStore(feature, workspace, olGeometry);
+        });
+        this.drawControl.setOlMap(this.map.ol, true);
+    }
+    /**
+     * Add a feature to layer. The loading strategy of the layer
+     * will trigger and add the feature to the workspace store.
+     * @internal
+     */
+    addFeatureToStore(feature, workspace, olGeometry) {
+        const projection = this.map.ol.getView().getProjection();
+        let geometry = feature.geometry;
+        // If an olGeometry is passed, it means that it is a new feature
+        if (olGeometry) {
+            workspace.entityStore.insert(feature);
+            workspace.entityStore.state.update(feature, { newFeature: true }, true);
+            geometry = new OlGeoJSON().writeGeometryObject(olGeometry, {
+                featureProjection: projection,
+                dataProjection: 'EPSG:4326'
+            });
+            feature.geometry = geometry;
+        }
+        feature.projection = 'EPSG:4326';
+        const featureOl = featureToOl(feature, projection.getCode());
+        this.olDrawingLayer.dataSource.ol.clear();
+        this.olDrawingLayer.dataSource.ol.addFeature(featureOl);
+        this.map.addLayer(this.olDrawingLayer);
+        this.deactivateDrawControl();
+        this.createModifyInteraction(featureOl, feature, workspace);
+    }
+    /**
+     * Delete drawings layer and source from the map AND feature from the entity store.
+     * Layer refresh will automatically add the new feature into the store.
+     */
+    deleteDrawings() {
+        this.map.removeLayer(this.olDrawingLayer);
+        this.olDrawingLayerSource.clear();
+        this.map.ol.removeInteraction(this.modify);
+    }
+    /**
+     * Create a modify interaction to allow a geometry change one feature at the time (drag and drop)
+     */
+    createModifyInteraction(olFeature, feature, workspace) {
+        this.map.ol.removeInteraction(this.modify);
+        const olCollection = new Collection([olFeature], { unique: true });
+        this.modify = new OlModify({
+            features: olCollection
+        });
+        this.map.ol.addInteraction(this.modify);
+        olCollection.forEach(feature => {
+            feature.setStyle(this.modifyStyle);
+        });
+        this.modify.on('modifyend', (event) => {
+            var _a;
+            const olGeometry = (_a = event.features.getArray()[0]) === null || _a === void 0 ? void 0 : _a.getGeometry();
+            if (olGeometry) {
+                this.addFeatureToStore(feature, workspace, olGeometry);
+            }
+        });
+    }
+}
+
+class EditionWorkspaceService {
+    constructor(layerService, storageService, configService, messageService, languageService, http, dialog, authInterceptor) {
+        this.layerService = layerService;
+        this.storageService = storageService;
+        this.configService = configService;
+        this.messageService = messageService;
+        this.languageService = languageService;
+        this.http = http;
+        this.dialog = dialog;
+        this.authInterceptor = authInterceptor;
+        this.ws$ = new BehaviorSubject(undefined);
+        this.adding$ = new BehaviorSubject(false);
+        this.relationLayers$ = new BehaviorSubject(undefined);
+        this.rowsInMapExtentCheckCondition$ = new BehaviorSubject(true);
+        this.loading = false;
+    }
+    get zoomAuto() {
+        return this.storageService.get('zoomAuto');
+    }
+    createWorkspace(layer, map) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        if (((_a = layer.options.workspace) === null || _a === void 0 ? void 0 : _a.enabled) !== true || layer.dataSource.options.edition.enabled !== true) {
+            return;
+        }
+        let wksConfig;
+        if (layer.options.workspace) {
+            wksConfig = layer.options.workspace;
+        }
+        else {
+            wksConfig = {};
+        }
+        wksConfig.srcId = layer.id;
+        wksConfig.workspaceId = layer.id;
+        wksConfig.enabled = true;
+        wksConfig.pageSize = (_b = layer.options.workspace) === null || _b === void 0 ? void 0 : _b.pageSize;
+        wksConfig.pageSizeOptions = (_c = layer.options.workspace) === null || _c === void 0 ? void 0 : _c.pageSizeOptions;
+        const dataSource = layer.dataSource;
+        const wmsLinkId = layer.id + '.WmsWorkspaceTableSrc';
+        const wfsLinkId = layer.id + '.WfsWorkspaceTableDest';
+        if (!layer.options.linkedLayers) {
+            layer.options.linkedLayers = { linkId: wmsLinkId, links: [] };
+        }
+        const linkProperties = {
+            bidirectionnal: true,
+            syncedDelete: true,
+            linkedIds: [wfsLinkId],
+            properties: [
+                LinkedProperties.ZINDEX,
+                LinkedProperties.VISIBLE
+            ]
+        };
+        if (!((_d = layer.options.workspace) === null || _d === void 0 ? void 0 : _d.minResolution)) {
+            linkProperties.properties.push(LinkedProperties.MINRESOLUTION);
+        }
+        let hasOgcFilters = false;
+        if ((_e = dataSource.options.ogcFilters) === null || _e === void 0 ? void 0 : _e.enabled) {
+            linkProperties.properties.push(LinkedProperties.OGCFILTERS);
+            hasOgcFilters = true;
+        }
+        if (!((_f = layer.options.workspace) === null || _f === void 0 ? void 0 : _f.maxResolution)) {
+            linkProperties.properties.push(LinkedProperties.MAXRESOLUTION);
+        }
+        let clonedLinks = [];
+        if (layer.options.linkedLayers.links) {
+            clonedLinks = JSON.parse(JSON.stringify(layer.options.linkedLayers.links));
+        }
+        clonedLinks.push(linkProperties);
+        layer.options.linkedLayers.linkId = layer.options.linkedLayers.linkId ? layer.options.linkedLayers.linkId : wmsLinkId,
+            layer.options.linkedLayers.links = clonedLinks;
+        let wks;
+        this.layerService
+            .createAsyncLayer({
+            id: wfsLinkId,
+            linkedLayers: {
+                linkId: wfsLinkId
+            },
+            workspace: {
+                srcId: layer.id,
+                workspaceId: undefined,
+                enabled: false,
+                queryOptions: {
+                    mapQueryOnOpenTab: (_h = (_g = layer.options.workspace) === null || _g === void 0 ? void 0 : _g.queryOptions) === null || _h === void 0 ? void 0 : _h.mapQueryOnOpenTab,
+                    tabQuery: false
+                },
+                pageSize: (_j = layer.options.workspace) === null || _j === void 0 ? void 0 : _j.pageSize,
+                pageSizeOptions: (_k = layer.options.workspace) === null || _k === void 0 ? void 0 : _k.pageSizeOptions
+            },
+            showInLayerList: false,
+            opacity: 0,
+            title: layer.title,
+            minResolution: ((_l = layer.options.workspace) === null || _l === void 0 ? void 0 : _l.minResolution) || layer.minResolution || 0,
+            maxResolution: ((_m = layer.options.workspace) === null || _m === void 0 ? void 0 : _m.maxResolution) || layer.maxResolution || Infinity,
+            sourceOptions: {
+                download: dataSource.options.download,
+                type: 'wfs',
+                url: dataSource.options.urlWfs || dataSource.options.url,
+                queryable: true,
+                relations: dataSource.options.relations,
+                queryTitle: dataSource.options.queryTitle,
+                params: dataSource.options.paramsWFS,
+                ogcFilters: Object.assign({}, dataSource.ogcFilters$.value, { enabled: hasOgcFilters }),
+                sourceFields: dataSource.options.sourceFields || undefined,
+                edition: dataSource.options.edition
+            }
+        })
+            .subscribe((workspaceLayer) => {
+            map.addLayer(workspaceLayer);
+            layer.ol.setProperties({ linkedLayers: { linkId: layer.options.linkedLayers.linkId, links: clonedLinks } }, false);
+            workspaceLayer.dataSource.ol.refresh();
+            wks = new EditionWorkspace({
+                id: layer.id,
+                title: layer.title,
+                layer: workspaceLayer,
+                map,
+                entityStore: this.createFeatureStore(workspaceLayer, map),
+                actionStore: new ActionStore([]),
+                meta: {
+                    tableTemplate: undefined
+                }
+            }, this, this.dialog, this.configService);
+            this.createTableTemplate(wks, workspaceLayer);
+            workspaceLayer.options.workspace.workspaceId = workspaceLayer.id;
+            layer.options.workspace = Object.assign({}, layer.options.workspace, {
+                wksConfig
+            });
+            delete dataSource.options.download;
+            return wks;
+        });
+        return wks;
+    }
+    createFeatureStore(layer, map) {
+        const store = new FeatureStore([], { map });
+        store.bindLayer(layer);
+        const loadingStrategy = new FeatureStoreLoadingLayerStrategy({});
+        const inMapExtentStrategy = new FeatureStoreInMapExtentStrategy({});
+        const inMapResolutionStrategy = new FeatureStoreInMapResolutionStrategy({});
+        const selectedRecordStrategy = new EntityStoreFilterSelectionStrategy({});
+        const selectionStrategy = new FeatureStoreSelectionStrategy({
+            layer: new VectorLayer({
+                zIndex: 300,
+                source: new FeatureDataSource(),
+                style: undefined,
+                showInLayerList: false,
+                exportable: false,
+                browsable: false
+            }),
+            map,
+            hitTolerance: 15,
+            motion: this.zoomAuto ? FeatureMotion.Default : FeatureMotion.None,
+            many: true,
+            dragBox: true
+        });
+        store.addStrategy(loadingStrategy, true);
+        store.addStrategy(inMapExtentStrategy, true);
+        store.addStrategy(inMapResolutionStrategy, true);
+        store.addStrategy(selectionStrategy, true);
+        store.addStrategy(selectedRecordStrategy, false);
+        store.addStrategy(this.createFilterInMapExtentOrResolutionStrategy(), true);
+        return store;
+    }
+    createTableTemplate(workspace, layer) {
+        const fields = layer.dataSource.options.sourceFields || [];
+        const relations = layer.dataSource.options.relations || [];
+        let rendererType = EntityTableColumnRenderer.UnsanitizedHTML;
+        let buttons = [];
+        let columns = [];
+        let relationsColumn = [];
+        buttons = [{
+                name: 'edition',
+                title: undefined,
+                renderer: EntityTableColumnRenderer.ButtonGroup,
+                primary: false,
+                valueAccessor: () => {
+                    return [{
+                            editMode: false,
+                            icon: 'pencil',
+                            color: 'primary',
+                            click: (feature) => { workspace.editFeature(feature, workspace); }
+                        },
+                        {
+                            editMode: false,
+                            icon: 'delete',
+                            color: 'warn',
+                            click: (feature) => { workspace.deleteFeature(feature, workspace); }
+                        },
+                        {
+                            editMode: true,
+                            icon: 'check',
+                            color: 'primary',
+                            disabled: this.loading,
+                            click: (feature) => { this.saveFeature(feature, workspace); }
+                        },
+                        {
+                            editMode: true,
+                            icon: 'alpha-x',
+                            color: 'primary',
+                            disabled: this.loading,
+                            click: (feature) => { this.cancelEdit(workspace, feature); }
+                        }];
+                }
+            }];
+        if (fields.length === 0) {
+            workspace.entityStore.entities$.pipe(skipWhile(val => val.length === 0), take(1)).subscribe(entities => {
+                const ol = entities[0].ol;
+                const columnsFromFeatures = ol.getKeys()
+                    .filter(col => !col.startsWith('_') &&
+                    col !== 'geometry' &&
+                    col !== ol.getGeometryName() &&
+                    !col.match(/boundedby/gi))
+                    .map(key => {
+                    return {
+                        name: `properties.${key}`,
+                        title: key,
+                        renderer: rendererType,
+                    };
+                });
+                workspace.meta.tableTemplate = {
+                    selection: false,
+                    sort: true,
+                    columns: columnsFromFeatures
+                };
+            });
+            return;
+        }
+        columns = fields.map((field) => {
+            let column = {
+                name: `properties.${field.name}`,
+                title: field.alias ? field.alias : field.name,
+                renderer: rendererType,
+                valueAccessor: undefined,
+                cellClassFunc: () => {
+                    const cellClass = {};
+                    if (field.type) {
+                        cellClass[`class_${field.type}`] = true;
+                        return cellClass;
+                    }
+                },
+                primary: field.primary === true ? true : false,
+                visible: field.visible,
+                validation: field.validation,
+                type: field.type,
+                domainValues: undefined,
+                relation: undefined,
+                multiple: field.multiple,
+                step: field.step,
+                tooltip: field.tooltip
+            };
+            if (field.type === 'list' || field.type === 'autocomplete') {
+                this.getDomainValues(field.relation.table).subscribe(result => {
+                    column.domainValues = result;
+                    column.relation = field.relation;
+                });
+            }
+            return column;
+        });
+        relationsColumn = relations.map((relation) => {
+            return {
+                name: `properties.${relation.name}`,
+                title: relation.alias ? relation.alias : relation.name,
+                renderer: EntityTableColumnRenderer.Icon,
+                icon: relation.icon,
+                parent: relation.parent,
+                type: 'relation',
+                tooltip: relation.tooltip,
+                onClick: () => {
+                    if (this.adding$.getValue() === false) {
+                        this.ws$.next(relation.title);
+                    }
+                },
+                cellClassFunc: () => {
+                    return { 'class_icon': true };
+                }
+            };
+        });
+        columns.push(...relationsColumn);
+        columns.push(...buttons);
+        workspace.meta.tableTemplate = {
+            selection: false,
+            sort: true,
+            columns
+        };
+    }
+    createFilterInMapExtentOrResolutionStrategy() {
+        const filterClauseFunc = (record) => {
+            return record.state.inMapExtent === true && record.state.inMapResolution === true;
+        };
+        return new EntityStoreFilterCustomFuncStrategy({ filterClauseFunc });
+    }
+    saveFeature(feature, workspace) {
+        if (!this.validateFeature(feature, workspace)) {
+            return false;
+        }
+        this.sanitizeParameter(feature, workspace);
+        let url = this.configService.getConfig('edition.url');
+        if (workspace.layer.dataSource.options.edition.baseUrl) {
+            url += workspace.layer.dataSource.options.edition.baseUrl;
+        }
+        if (feature.newFeature) {
+            url += workspace.layer.dataSource.options.edition.addUrl;
+            const addHeaders = workspace.layer.dataSource.options.edition.addHeaders;
+            const headers = new HttpHeaders(addHeaders);
+            this.addFeature(feature, workspace, url, headers);
+        }
+        else {
+            if (workspace.layer.dataSource.options.edition.modifyProtocol !== "post") {
+                url += '?' + workspace.layer.dataSource.options.edition.modifyUrl + feature.idkey;
+            }
+            else {
+                url += workspace.layer.dataSource.options.edition.modifyUrl;
+            }
+            const protocole = workspace.layer.dataSource.options.edition.modifyProtocol;
+            const modifyHeaders = workspace.layer.dataSource.options.edition.modifyHeaders;
+            const headers = new HttpHeaders(modifyHeaders);
+            this.modifyFeature(feature, workspace, url, headers, protocole);
+        }
+    }
+    addFeature(feature, workspace, url, headers) {
+        var _a;
+        // 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];
+        }
+        for (const property in feature.properties) {
+            for (const sf of workspace.layer.dataSource.options.sourceFields) {
+                if (sf.name === property && ((_a = sf.validation) === null || _a === void 0 ? void 0 : _a.readonly)) {
+                    delete feature.properties[property];
+                }
+            }
+        }
+        this.loading = true;
+        this.http.post(`${url}`, feature.properties, { headers: headers }).subscribe(() => {
+            this.loading = false;
+            workspace.entityStore.stateView.clear();
+            workspace.deleteDrawings();
+            workspace.entityStore.delete(feature);
+            const message = this.languageService.translate.instant('igo.geo.workspace.addSuccess');
+            this.messageService.success(message);
+            this.refreshMap(workspace.layer, workspace.layer.map);
+            this.adding$.next(false);
+            this.rowsInMapExtentCheckCondition$.next(true);
+        }, error => {
+            this.loading = false;
+            error.error.caught = true;
+            const genericErrorMessage = this.languageService.translate.instant('igo.geo.workspace.addError');
+            const messages = workspace.layer.dataSource.options.edition.messages;
+            if (messages) {
+                let text;
+                messages.forEach(message => {
+                    const key = Object.keys(message)[0];
+                    if (error.error.message.includes(key)) {
+                        text = message[key];
+                        this.messageService.error(text);
+                    }
+                });
+                if (!text) {
+                    this.messageService.error(genericErrorMessage);
+                }
+            }
+            else {
+                this.messageService.error(genericErrorMessage);
+            }
+        });
+    }
+    deleteFeature(workspace, url) {
+        this.loading = true;
+        this.http.delete(`${url}`, {}).subscribe(() => {
+            this.loading = false;
+            const message = this.languageService.translate.instant('igo.geo.workspace.deleteSuccess');
+            this.messageService.success(message);
+            this.refreshMap(workspace.layer, workspace.layer.map);
+            for (const relation of workspace.layer.options.sourceOptions.relations) {
+                workspace.map.layers.forEach((layer) => {
+                    if (layer.title === relation.title) {
+                        layer.dataSource.ol.refresh();
+                    }
+                });
+            }
+        }, error => {
+            this.loading = false;
+            error.error.caught = true;
+            const genericErrorMessage = this.languageService.translate.instant('igo.geo.workspace.addError');
+            const messages = workspace.layer.dataSource.options.edition.messages;
+            if (messages) {
+                let text;
+                messages.forEach(message => {
+                    const key = Object.keys(message)[0];
+                    if (error.error.message.includes(key)) {
+                        text = message[key];
+                        this.messageService.error(text);
+                    }
+                });
+                if (!text) {
+                    this.messageService.error(genericErrorMessage);
+                }
+            }
+            else {
+                this.messageService.error(genericErrorMessage);
+            }
+        });
+    }
+    modifyFeature(feature, workspace, url, headers, protocole = 'patch') {
+        var _a;
+        //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];
+        }
+        for (const property in feature.properties) {
+            for (const sf of workspace.layer.dataSource.options.sourceFields) {
+                if ((sf.name === property && ((_a = sf.validation) === null || _a === void 0 ? void 0 : _a.readonly)) || property === 'boundedBy') {
+                    delete feature.properties[property];
+                }
+            }
+        }
+        this.loading = true;
+        this.http[protocole](`${url}`, feature.properties, { headers: headers }).subscribe(() => {
+            this.loading = false;
+            this.cancelEdit(workspace, feature, true);
+            const message = this.languageService.translate.instant('igo.geo.workspace.modifySuccess');
+            this.messageService.success(message);
+            this.refreshMap(workspace.layer, workspace.layer.map);
+            let relationLayers = [];
+            for (const relation of workspace.layer.options.sourceOptions.relations) {
+                workspace.map.layers.forEach((layer) => {
+                    if (layer.title === relation.title) {
+                        relationLayers.push(layer);
+                        layer.dataSource.ol.refresh();
+                    }
+                });
+            }
+            this.relationLayers$.next(relationLayers);
+        }, error => {
+            this.loading = false;
+            error.error.caught = true;
+            const genericErrorMessage = this.languageService.translate.instant('igo.geo.workspace.addError');
+            const messages = workspace.layer.dataSource.options.edition.messages;
+            if (messages) {
+                let text;
+                messages.forEach(message => {
+                    const key = Object.keys(message)[0];
+                    if (error.error.message.includes(key)) {
+                        text = message[key];
+                        this.messageService.error(text);
+                    }
+                });
+                if (!text) {
+                    this.messageService.error(genericErrorMessage);
+                }
+            }
+            else {
+                this.messageService.error(genericErrorMessage);
+            }
+        });
+    }
+    cancelEdit(workspace, feature, fromSave = false) {
+        feature.edition = false;
+        this.adding$.next(false);
+        workspace.deleteDrawings();
+        if (feature.newFeature) {
+            workspace.entityStore.stateView.clear();
+            workspace.entityStore.delete(feature);
+            workspace.deactivateDrawControl();
+            this.rowsInMapExtentCheckCondition$.next(true);
+        }
+        else {
+            if (!fromSave) {
+                feature.properties = feature.original_properties;
+                feature.geometry = feature.original_geometry;
+            }
+            delete feature.original_properties;
+            delete feature.original_geometry;
+        }
+    }
+    getDomainValues(table) {
+        let url = this.configService.getConfig('edition.url') + table;
+        return this.http.get(url).pipe(map(result => {
+            return result;
+        }), catchError((err) => {
+            return throwError(err);
+        }));
+    }
+    /*
+     * Refresh both wms and wfs layer
+     * A new wfs loader is used to ensure cache is not retrieving old data
+     * WMS params are updated to ensure layer is correctly refreshed
+     */
+    refreshMap(layer, map) {
+        var _a, _b;
+        const wfsOlLayer = layer.dataSource.ol;
+        const loader = (extent, resolution, proj, success, failure) => {
+            layer.customWFSLoader(layer.ol.getSource(), layer.options.sourceOptions, this.authInterceptor, extent, resolution, proj, success, failure, true);
+        };
+        wfsOlLayer.setLoader(loader);
+        wfsOlLayer.refresh();
+        for (const lay of map.layers) {
+            if (lay.id !== layer.id &&
+                ((_a = lay.options.linkedLayers) === null || _a === void 0 ? void 0 : _a.linkId.includes(layer.id.substr(0, layer.id.indexOf('.') - 1))) &&
+                ((_b = lay.options.linkedLayers) === null || _b === void 0 ? void 0 : _b.linkId.includes('WmsWorkspaceTableSrc'))) {
+                const wmsOlLayer = lay.dataSource.ol;
+                let params = wmsOlLayer.getParams();
+                params._t = new Date().getTime();
+                wmsOlLayer.updateParams(params);
+            }
+        }
+    }
+    validateFeature(feature, workspace) {
+        const translate = this.languageService.translate;
+        let message;
+        let key;
+        let valid = true;
+        workspace.meta.tableTemplate.columns.forEach(column => {
+            if (column.hasOwnProperty('validation') && column.validation) {
+                key = getColumnKeyWithoutPropertiesTag(column.name);
+                Object.keys(column.validation).forEach((type) => {
+                    switch (type) {
+                        case 'mandatory': {
+                            if (column.validation[type] && (!feature.properties.hasOwnProperty(key) || !feature.properties[key])) {
+                                valid = false;
+                                message = translate.instant('igo.geo.formValidation.mandatory', {
+                                    column: column.title
+                                });
+                                this.messageService.error(message);
+                            }
+                            break;
+                        }
+                        case 'minValue': {
+                            if (feature.properties.hasOwnProperty(key) && feature.properties[key] && feature.properties[key] < column.validation[type]) {
+                                valid = false;
+                                message = translate.instant('igo.geo.formValidation.minValue', {
+                                    column: column.title,
+                                    value: column.validation[type]
+                                });
+                                this.messageService.error(message);
+                            }
+                            break;
+                        }
+                        case 'maxValue': {
+                            if (feature.properties.hasOwnProperty(key) && feature.properties[key] && feature.properties[key] > column.validation[type]) {
+                                valid = false;
+                                message = translate.instant('igo.geo.formValidation.maxValue', {
+                                    column: column.title,
+                                    value: column.validation[type]
+                                });
+                                this.messageService.error(message);
+                            }
+                            break;
+                        }
+                        case 'minLength': {
+                            if (feature.properties.hasOwnProperty(key) && feature.properties[key] &&
+                                feature.properties[key].length < column.validation[type]) {
+                                valid = false;
+                                message = translate.instant('igo.geo.formValidation.minLength', {
+                                    column: column.title,
+                                    value: column.validation[type]
+                                });
+                                this.messageService.error(message);
+                            }
+                            break;
+                        }
+                        case 'maxLength': {
+                            if (feature.properties.hasOwnProperty(key) && feature.properties[key] &&
+                                feature.properties[key].length > column.validation[type]) {
+                                valid = false;
+                                message = translate.instant('igo.geo.formValidation.maxLength', {
+                                    column: column.title,
+                                    value: column.validation[type]
+                                });
+                                this.messageService.error(message);
+                            }
+                            break;
+                        }
+                    }
+                });
+            }
+        });
+        return valid;
+    }
+    sanitizeParameter(feature, workspace) {
+        workspace.meta.tableTemplate.columns.forEach(column => {
+            if (column.type === 'list' && feature.properties[getColumnKeyWithoutPropertiesTag(column.name)]) {
+                feature.properties[getColumnKeyWithoutPropertiesTag(column.name)] =
+                    feature.properties[getColumnKeyWithoutPropertiesTag(column.name)].toString();
+            }
+        });
+    }
+}
+EditionWorkspaceService.ɵfac = function EditionWorkspaceService_Factory(t) { return new (t || EditionWorkspaceService)(i0.ɵɵinject(LayerService), i0.ɵɵinject(i2$1.StorageService), i0.ɵɵinject(i2$1.ConfigService), i0.ɵɵinject(i2$1.MessageService), i0.ɵɵinject(i2$1.LanguageService), i0.ɵɵinject(i1$2.HttpClient), i0.ɵɵinject(i1.MatDialog), i0.ɵɵinject(i5.AuthInterceptor)); };
+EditionWorkspaceService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: EditionWorkspaceService, factory: EditionWorkspaceService.ɵfac, providedIn: 'root' });
+(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(EditionWorkspaceService, [{
+        type: Injectable,
+        args: [{
+                providedIn: 'root'
+            }]
+    }], function () { return [{ type: LayerService }, { type: i2$1.StorageService }, { type: i2$1.ConfigService }, { type: i2$1.MessageService }, { type: i2$1.LanguageService }, { type: i1$2.HttpClient }, { type: i1.MatDialog }, { type: i5.AuthInterceptor }]; }, null); })();
+function getColumnKeyWithoutPropertiesTag(column) {
+    if (column.includes('properties.')) {
+        return column.split('.')[1];
+    }
+    return column;
+}
+
 class FeatureWorkspace extends Workspace {
     constructor(options) {
         super(options);
@@ -37469,25 +38977,42 @@ class FeatureWorkspace extends Workspace {
     }
     get layer() { return this.options.layer; }
     get map() { return this.options.map; }
+    getLayerWksOptionTabQuery() {
+        var _a;
+        if (((_a = this.layer.options.workspace.queryOptions) === null || _a === void 0 ? void 0 : _a.tabQuery) !== undefined) {
+            return this.layer.options.workspace.queryOptions.tabQuery;
+        }
+        return true;
+    }
+    getLayerWksOptionMapQuery() {
+        var _a;
+        if (((_a = this.layer.options.workspace.queryOptions) === null || _a === void 0 ? void 0 : _a.mapQueryOnOpenTab) !== undefined) {
+            return this.layer.options.workspace.queryOptions.mapQueryOnOpenTab;
+        }
+        return true;
+    }
+    getInResolutionRange() {
+        return this.inResolutionRange$.value;
+    }
 }
 
 class FeatureWorkspaceService {
     constructor(storageService) {
         this.storageService = storageService;
+        this.ws$ = new BehaviorSubject(undefined);
     }
     get zoomAuto() {
         return this.storageService.get('zoomAuto');
     }
     createWorkspace(layer, map) {
         var _a;
-        if (((_a = layer.options.workspace) === null || _a === void 0 ? void 0 : _a.enabled) === false) {
+        if (((_a = layer.options.workspace) === null || _a === void 0 ? void 0 : _a.enabled) === false || layer.dataSource.options.edition) {
             return;
         }
-        layer.options.workspace = Object.assign({}, layer.options.workspace, { enabled: true });
         layer.options.workspace = Object.assign({}, layer.options.workspace, {
-            enabled: true,
             srcId: layer.id,
-            workspaceId: layer.id
+            workspaceId: layer.id,
+            enabled: true
         });
         const wks = new FeatureWorkspace({
             id: layer.id,
@@ -37535,6 +39060,7 @@ class FeatureWorkspaceService {
     }
     createTableTemplate(workspace, layer) {
         const fields = layer.dataSource.options.sourceFields || [];
+        const relations = layer.dataSource.options.relations || [];
         if (fields.length === 0) {
             workspace.entityStore.entities$.pipe(skipWhile(val => val.length === 0), take(1)).subscribe(entities => {
                 const ol = entities[0].ol;
@@ -37562,9 +39088,28 @@ class FeatureWorkspaceService {
             return {
                 name: `properties.${field.name}`,
                 title: field.alias ? field.alias : field.name,
-                renderer: EntityTableColumnRenderer.UnsanitizedHTML
+                renderer: EntityTableColumnRenderer.UnsanitizedHTML,
+                tooltip: field.tooltip
             };
         });
+        const relationsColumn = relations.map((relation) => {
+            return {
+                name: `properties.${relation.name}`,
+                title: relation.alias ? relation.alias : relation.name,
+                renderer: EntityTableColumnRenderer.Icon,
+                icon: relation.icon,
+                parent: relation.parent,
+                type: 'relation',
+                tooltip: relation.tooltip,
+                onClick: () => {
+                    this.ws$.next(relation.title);
+                },
+                cellClassFunc: () => {
+                    return { 'class_icon': true };
+                }
+            };
+        });
+        columns.push(...relationsColumn);
         workspace.meta.tableTemplate = {
             selection: true,
             sort: true,
@@ -37588,12 +39133,17 @@ FeatureWorkspaceService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token:
     }], function () { return [{ type: i2$1.StorageService }]; }, null); })();
 
 class WorkspaceSelectorDirective {
-    constructor(component, wfsWorkspaceService, wmsWorkspaceService, featureWorkspaceService) {
+    constructor(component, wfsWorkspaceService, wmsWorkspaceService, editionWorkspaceService, featureWorkspaceService) {
         this.component = component;
         this.wfsWorkspaceService = wfsWorkspaceService;
         this.wmsWorkspaceService = wmsWorkspaceService;
+        this.editionWorkspaceService = editionWorkspaceService;
         this.featureWorkspaceService = featureWorkspaceService;
         this.entities$$ = [];
+        this.changeWorkspace = new EventEmitter();
+        this.disableSwitch = new EventEmitter();
+        this.relationLayers = new EventEmitter();
+        this.rowsInMapExtentCheckCondition = new EventEmitter();
     }
     get workspaceStore() {
         return this.component.store;
@@ -37602,6 +39152,15 @@ class WorkspaceSelectorDirective {
         this.layers$$ = this.map.layers$
             .pipe(debounceTime(50))
             .subscribe((layers) => this.onLayersChange(layers));
+        this.featureWorkspaceService.ws$.subscribe((ws) => { this.changeWorkspace.emit(ws); });
+        this.wmsWorkspaceService.ws$.subscribe((ws) => { this.changeWorkspace.emit(ws); });
+        this.wfsWorkspaceService.ws$.subscribe((ws) => { this.changeWorkspace.emit(ws); });
+        this.editionWorkspaceService.ws$.subscribe((ws) => { this.changeWorkspace.emit(ws); });
+        this.editionWorkspaceService.adding$.subscribe((adding) => { this.disableSwitch.emit(adding); });
+        this.editionWorkspaceService.relationLayers$.subscribe((layers) => { this.relationLayers.emit(layers); });
+        this.editionWorkspaceService.rowsInMapExtentCheckCondition$.subscribe((condition) => {
+            this.rowsInMapExtentCheckCondition.emit(condition);
+        });
     }
     ngOnDestroy() {
         this.layers$$.unsubscribe();
@@ -37630,15 +39189,16 @@ class WorkspaceSelectorDirective {
         }
     }
     getOrCreateWorkspace(layer) {
+        var _a, _b, _c, _d;
         const workspace = this.workspaceStore.get(layer.id);
         if (workspace !== undefined) {
             return;
         }
-        if (layer.dataSource instanceof WFSDataSource) {
+        if (layer.dataSource instanceof WFSDataSource && ((_a = layer.dataSource.options.edition) === null || _a === void 0 ? void 0 : _a.enabled) !== true) {
             const wfsWks = this.wfsWorkspaceService.createWorkspace(layer, this.map);
             return wfsWks;
         }
-        else if (layer.dataSource instanceof WMSDataSource) {
+        else if (layer.dataSource instanceof WMSDataSource && ((_b = layer.dataSource.options.edition) === null || _b === void 0 ? void 0 : _b.enabled) !== true) {
             if (!layer.dataSource.options.paramsWFS) {
                 return;
             }
@@ -37649,10 +39209,16 @@ class WorkspaceSelectorDirective {
             });
             return wmsWks;
         }
-        else if (layer.dataSource instanceof FeatureDataSource && layer.exportable === true) {
+        else if (layer.dataSource instanceof FeatureDataSource &&
+            layer.exportable === true &&
+            ((_c = layer.dataSource.options.edition) === null || _c === void 0 ? void 0 : _c.enabled) !== true) {
             const featureWks = this.featureWorkspaceService.createWorkspace(layer, this.map);
             return featureWks;
         }
+        else if (layer.dataSource instanceof WMSDataSource && ((_d = layer.dataSource.options.edition) === null || _d === void 0 ? void 0 : _d.enabled) === true) {
+            const editionWks = this.editionWorkspaceService.createWorkspace(layer, this.map);
+            return editionWks;
+        }
         return;
     }
     layerIsEditable(layer) {
@@ -37672,15 +39238,23 @@ class WorkspaceSelectorDirective {
         return false;
     }
 }
-WorkspaceSelectorDirective.ɵfac = function WorkspaceSelectorDirective_Factory(t) { return new (t || WorkspaceSelectorDirective)(i0.ɵɵdirectiveInject(i6$1.WorkspaceSelectorComponent), i0.ɵɵdirectiveInject(WfsWorkspaceService), i0.ɵɵdirectiveInject(WmsWorkspaceService), i0.ɵɵdirectiveInject(FeatureWorkspaceService)); };
-WorkspaceSelectorDirective.ɵdir = /*@__PURE__*/ i0.ɵɵdefineDirective({ type: WorkspaceSelectorDirective, selectors: [["", "igoWorkspaceSelector", ""]], inputs: { map: "map" } });
+WorkspaceSelectorDirective.ɵfac = function WorkspaceSelectorDirective_Factory(t) { return new (t || WorkspaceSelectorDirective)(i0.ɵɵdirectiveInject(i6.WorkspaceSelectorComponent), i0.ɵɵdirectiveInject(WfsWorkspaceService), i0.ɵɵdirectiveInject(WmsWorkspaceService), i0.ɵɵdirectiveInject(EditionWorkspaceService), i0.ɵɵdirectiveInject(FeatureWorkspaceService)); };
+WorkspaceSelectorDirective.ɵdir = /*@__PURE__*/ i0.ɵɵdefineDirective({ type: WorkspaceSelectorDirective, selectors: [["", "igoWorkspaceSelector", ""]], inputs: { map: "map" }, outputs: { changeWorkspace: "changeWorkspace", disableSwitch: "disableSwitch", relationLayers: "relationLayers", rowsInMapExtentCheckCondition: "rowsInMapExtentCheckCondition" } });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(WorkspaceSelectorDirective, [{
         type: Directive,
         args: [{
                 selector: '[igoWorkspaceSelector]'
             }]
-    }], function () { return [{ type: i6$1.WorkspaceSelectorComponent }, { type: WfsWorkspaceService }, { type: WmsWorkspaceService }, { type: FeatureWorkspaceService }]; }, { map: [{
+    }], function () { return [{ type: i6.WorkspaceSelectorComponent }, { type: WfsWorkspaceService }, { type: WmsWorkspaceService }, { type: EditionWorkspaceService }, { type: FeatureWorkspaceService }]; }, { map: [{
             type: Input
+        }], changeWorkspace: [{
+            type: Output
+        }], disableSwitch: [{
+            type: Output
+        }], relationLayers: [{
+            type: Output
+        }], rowsInMapExtentCheckCondition: [{
+            type: Output
         }] }); })();
 
 /**
@@ -37710,9 +39284,10 @@ IgoWorkspaceSelectorModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports
 (function () { (typeof ngJitMode === "undefined" || ngJitMode) && i0.ɵɵsetNgModuleScope(IgoWorkspaceSelectorModule, { declarations: [WorkspaceSelectorDirective], imports: [CommonModule], exports: [WorkspaceSelectorDirective] }); })();
 
 class WorkspaceUpdatorDirective {
-    constructor(wfsWorkspaceService, wmsWorkspaceService, featureWorkspaceService) {
+    constructor(wfsWorkspaceService, wmsWorkspaceService, editionWorkspaceService, featureWorkspaceService) {
         this.wfsWorkspaceService = wfsWorkspaceService;
         this.wmsWorkspaceService = wmsWorkspaceService;
+        this.editionWorkspaceService = editionWorkspaceService;
         this.featureWorkspaceService = featureWorkspaceService;
         this.entities$$ = [];
     }
@@ -37748,29 +39323,41 @@ class WorkspaceUpdatorDirective {
         }
     }
     getOrCreateWorkspace(layer) {
+        var _a, _b, _c, _d;
         const workspace = this.workspaceStore.get(layer.id);
         if (workspace !== undefined) {
             return;
         }
-        if (layer.dataSource instanceof WFSDataSource) {
+        if (layer.dataSource instanceof WFSDataSource && ((_a = layer.dataSource.options.edition) === null || _a === void 0 ? void 0 : _a.enabled) !== true) {
             const wfsWks = this.wfsWorkspaceService.createWorkspace(layer, this.map);
             return wfsWks;
         }
-        else if (layer.dataSource instanceof WMSDataSource) {
+        else if (layer.dataSource instanceof WMSDataSource && ((_b = layer.dataSource.options.edition) === null || _b === void 0 ? void 0 : _b.enabled) !== true) {
             if (!layer.dataSource.options.paramsWFS) {
                 return;
             }
             const wmsWks = this.wmsWorkspaceService.createWorkspace(layer, this.map);
             wmsWks === null || wmsWks === void 0 ? void 0 : wmsWks.inResolutionRange$.subscribe((inResolutionRange) => {
+                var _a;
+                if ((_a = layer.dataSource.options) === null || _a === void 0 ? void 0 : _a.queryFormatAsWms) {
+                    wmsWks.layer.dataSource.options.queryable = true;
+                    return wmsWks;
+                }
                 layer.dataSource.options.queryable = !inResolutionRange;
                 wmsWks.layer.dataSource.options.queryable = inResolutionRange;
             });
             return wmsWks;
         }
-        else if (layer.dataSource instanceof FeatureDataSource && layer.exportable === true) {
+        else if (layer.dataSource instanceof FeatureDataSource &&
+            layer.exportable === true &&
+            ((_c = layer.dataSource.options.edition) === null || _c === void 0 ? void 0 : _c.enabled) !== true) {
             const featureWks = this.featureWorkspaceService.createWorkspace(layer, this.map);
             return featureWks;
         }
+        else if (layer.dataSource instanceof WMSDataSource && ((_d = layer.dataSource.options.edition) === null || _d === void 0 ? void 0 : _d.enabled) === true) {
+            const editionWks = this.editionWorkspaceService.createWorkspace(layer, this.map);
+            return editionWks;
+        }
         return;
     }
     layerIsEditable(layer) {
@@ -37790,14 +39377,14 @@ class WorkspaceUpdatorDirective {
         return false;
     }
 }
-WorkspaceUpdatorDirective.ɵfac = function WorkspaceUpdatorDirective_Factory(t) { return new (t || WorkspaceUpdatorDirective)(i0.ɵɵdirectiveInject(WfsWorkspaceService), i0.ɵɵdirectiveInject(WmsWorkspaceService), i0.ɵɵdirectiveInject(FeatureWorkspaceService)); };
+WorkspaceUpdatorDirective.ɵfac = function WorkspaceUpdatorDirective_Factory(t) { return new (t || WorkspaceUpdatorDirective)(i0.ɵɵdirectiveInject(WfsWorkspaceService), i0.ɵɵdirectiveInject(WmsWorkspaceService), i0.ɵɵdirectiveInject(EditionWorkspaceService), i0.ɵɵdirectiveInject(FeatureWorkspaceService)); };
 WorkspaceUpdatorDirective.ɵdir = /*@__PURE__*/ i0.ɵɵdefineDirective({ type: WorkspaceUpdatorDirective, selectors: [["", "igoWorkspaceUpdator", ""]], inputs: { map: "map", workspaceStore: "workspaceStore" } });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(WorkspaceUpdatorDirective, [{
         type: Directive,
         args: [{
                 selector: '[igoWorkspaceUpdator]'
             }]
-    }], function () { return [{ type: WfsWorkspaceService }, { type: WmsWorkspaceService }, { type: FeatureWorkspaceService }]; }, { map: [{
+    }], function () { return [{ type: WfsWorkspaceService }, { type: WmsWorkspaceService }, { type: EditionWorkspaceService }, { type: FeatureWorkspaceService }]; }, { map: [{
             type: Input
         }], workspaceStore: [{
             type: Input
@@ -37829,6 +39416,37 @@ IgoWorkspaceUpdatorModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports:
     }], null, null); })();
 (function () { (typeof ngJitMode === "undefined" || ngJitMode) && i0.ɵɵsetNgModuleScope(IgoWorkspaceUpdatorModule, { declarations: [WorkspaceUpdatorDirective], imports: [CommonModule], exports: [WorkspaceUpdatorDirective] }); })();
 
+/**
+ * @ignore
+ */
+class IgoConfirmationPopupModule {
+}
+IgoConfirmationPopupModule.ɵfac = function IgoConfirmationPopupModule_Factory(t) { return new (t || IgoConfirmationPopupModule)(); };
+IgoConfirmationPopupModule.ɵmod = /*@__PURE__*/ i0.ɵɵdefineNgModule({ type: IgoConfirmationPopupModule });
+IgoConfirmationPopupModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [[
+            CommonModule,
+            MatButtonModule,
+            MatDialogModule,
+            MatButtonToggleModule
+        ]] });
+(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(IgoConfirmationPopupModule, [{
+        type: NgModule,
+        args: [{
+                imports: [
+                    CommonModule,
+                    MatButtonModule,
+                    MatDialogModule,
+                    MatButtonToggleModule
+                ],
+                exports: [ConfirmationPopupComponent],
+                declarations: [ConfirmationPopupComponent]
+            }]
+    }], null, null); })();
+(function () { (typeof ngJitMode === "undefined" || ngJitMode) && i0.ɵɵsetNgModuleScope(IgoConfirmationPopupModule, { declarations: [ConfirmationPopupComponent], imports: [CommonModule,
+        MatButtonModule,
+        MatDialogModule,
+        MatButtonToggleModule], exports: [ConfirmationPopupComponent] }); })();
+
 class IgoGeoWorkspaceModule {
 }
 IgoGeoWorkspaceModule.ɵfac = function IgoGeoWorkspaceModule_Factory(t) { return new (t || IgoGeoWorkspaceModule)(); };
@@ -37837,27 +39455,33 @@ IgoGeoWorkspaceModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [
         provideOgcFilterWidget()
     ], imports: [[
             CommonModule,
+            IgoLanguageModule,
             IgoWidgetModule,
             IgoWorkspaceSelectorModule,
             IgoWorkspaceUpdatorModule,
-            IgoOgcFilterModule
+            IgoOgcFilterModule,
+            MatDialogModule
         ], IgoWorkspaceSelectorModule,
         IgoWorkspaceUpdatorModule,
-        IgoOgcFilterModule] });
+        IgoOgcFilterModule,
+        IgoConfirmationPopupModule] });
 (function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(IgoGeoWorkspaceModule, [{
         type: NgModule,
         args: [{
                 imports: [
                     CommonModule,
+                    IgoLanguageModule,
                     IgoWidgetModule,
                     IgoWorkspaceSelectorModule,
                     IgoWorkspaceUpdatorModule,
-                    IgoOgcFilterModule
+                    IgoOgcFilterModule,
+                    MatDialogModule
                 ],
                 exports: [
                     IgoWorkspaceSelectorModule,
                     IgoWorkspaceUpdatorModule,
-                    IgoOgcFilterModule
+                    IgoOgcFilterModule,
+                    IgoConfirmationPopupModule
                 ],
                 declarations: [],
                 providers: [
@@ -37866,12 +39490,15 @@ IgoGeoWorkspaceModule.ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ providers: [
             }]
     }], null, null); })();
 (function () { (typeof ngJitMode === "undefined" || ngJitMode) && i0.ɵɵsetNgModuleScope(IgoGeoWorkspaceModule, { imports: [CommonModule,
+        IgoLanguageModule,
         IgoWidgetModule,
         IgoWorkspaceSelectorModule,
         IgoWorkspaceUpdatorModule,
-        IgoOgcFilterModule], exports: [IgoWorkspaceSelectorModule,
+        IgoOgcFilterModule,
+        MatDialogModule], exports: [IgoWorkspaceSelectorModule,
         IgoWorkspaceUpdatorModule,
-        IgoOgcFilterModule] }); })();
+        IgoOgcFilterModule,
+        IgoConfirmationPopupModule] }); })();
 
 class IgoWktModule {
     static forRoot() {
@@ -38265,7 +39892,7 @@ class NominatimSearchSource extends SearchSource {
                         },
                         {
                             title: 'igo.geo.search.nominatim.type.entertainment',
-                            value: 'arts_centre,brothel,casino,cinema,community_center_fountain,gambling,nightclub,planetarium \
+                            value: 'arts_centre,brothel,casino,cinema,community_center_fountain,gambling,nightclub,planetarium \
                           ,public_bookcase,social_centre,stripclub,studio,swingerclub,theatre,internet_cafe',
                             enabled: false
                         },
@@ -38582,7 +40209,7 @@ class StoredQueriesSearchSource extends SearchSource {
         const storedqueriesParams = this.termSplitter(term, this.storedQueriesOptions.fields);
         const params = this.computeRequestParams(options || {}, storedqueriesParams);
         this.options.params = this.options.params ? this.options.params : {};
-        this.options.params.page = !options.page ? String(options.page) : '1';
+        this.options.params.page = options.page ? String(options.page) : '1';
         if (new RegExp('.*?gml.*?', 'i').test(this.storedQueriesOptions.outputformat)) {
             return this.http
                 .get(this.searchUrl, { params, responseType: 'text' })
@@ -38964,5 +40591,5 @@ function noElementSelected(ws) {
  * Generated bundle index. Do not edit.
  */
 
-export { AddCatalogDialogComponent, ArcGISRestDataSource, BaseLayersSwitcherComponent, CadastreSearchSource, CapabilitiesService, CartoDataSource, Catalog, CatalogBrowserComponent, CatalogFactory, CatalogItemType, CatalogLibaryComponent, CatalogService, ClusterDataSource, CompositeCatalog, CoordinatesReverseSearchSource, CoordinatesReverseSearchSourceFactory, CoordinatesSearchResultFormatter, DataService, DataSource, DataSourceService, DirectionRelativePositionType, DirectionType, DirectionsButtonsComponent, DirectionsComponent, DirectionsFormat, DirectionsInputsComponent, DirectionsResultsComponent, DirectionsService, DirectionsSource, DownloadButtonComponent, DownloadService, DrawComponent, DrawControl, DrawIconService, DrawStyleService, DropGeoFileDirective, EncodingFormat, EsriStyleGenerator, ExportButtonComponent, ExportError, ExportFormat, ExportInvalidFileError, ExportNothingToExportError, ExportService, FEATURE, FeatureDataSource, FeatureDetailsComponent, FeatureDetailsDirective, FeatureFormComponent, FeatureMotion, FeatureStore, FeatureStoreInMapExtentStrategy, FeatureStoreInMapResolutionStrategy, FeatureStoreLoadingLayerStrategy, FeatureStoreLoadingStrategy, FeatureStoreSelectionStrategy, FeatureWorkspace, FeatureWorkspaceService, FilterableDataSourcePipe, GeolocateButtonComponent, GeometryFormFieldComponent, GeometryFormFieldInputComponent, GeometrySliceError, GeometrySliceLineStringError, GeometrySliceMultiPolygonError, GeometrySliceTooManyIntersectionError, GeometryType, GoogleLinks, HoverFeatureDirective, IChercheReverseSearchSource, IChercheSearchResultFormatter, IChercheSearchSource, ILayerSearchResultFormatter, ILayerSearchSource, IgoCatalogBrowserModule, IgoCatalogLibraryModule, IgoCatalogModule, 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, LAYER, Layer, LayerItemComponent, LayerLegendComponent, LayerLegendItemComponent, LayerLegendListBindingDirective, LayerLegendListComponent, LayerListBindingDirective, LayerListComponent, LayerListControlsEnum, LayerListDisplacement, LayerListSelectVisibleEnum, LayerListToolComponent, LayerListToolControlsEnum, LayerListToolService, LayerService, LayerSyncWatcher, LinkedProperties, MEASURE_UNIT_AUTO, MVTDataSource, MapBrowserComponent, MapCenterComponent, MapController, 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, 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, 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, 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, getCommonVectorSelectedStyle, getCommonVectorStyle, getFileExtension, getFormatFromOptions, getLayersLegends, getMousePositionFromOlGeometryEvent, getOlTooltipAtCenter, getOlTooltipsAtMidpoints, getResolutionFromScale, getRowsInMapExtent, getScaleFromResolution, getSelectedOnly, getTooltipsOfOlGeometry, gmlRegex, handleFileExportError, handleFileExportSuccess, handleFileImportError, handleFileImportSuccess, handleInvalidFileImportError, handleNothingToExportError, handleNothingToImportError, handleOgreServerImportError, handleSRSImportError, handleSizeFileImportError, handleUnreadbleFileImportError, hideOlFeature, hoverFeatureMarker, ichercheReverseSearchSourceFactory, ichercheSearchSourceFactory, ilayerSearchResultFormatterFactory, ilayerSearchSourceFactory, initRoutesFeatureStore, initStepFeatureStore, initStopsFeatureStore, jsonRegex, layerFeatureIsQueryable, 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, CadastreSearchSource, CapabilitiesService, CartoDataSource, Catalog, CatalogBrowserComponent, CatalogFactory, CatalogItemType, CatalogLibaryComponent, CatalogService, ClusterDataSource, CompositeCatalog, 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, 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, LAYER, Layer, LayerItemComponent, LayerLegendComponent, LayerLegendItemComponent, LayerLegendListBindingDirective, LayerLegendListComponent, LayerListBindingDirective, LayerListComponent, LayerListControlsEnum, LayerListDisplacement, LayerListSelectVisibleEnum, LayerListToolComponent, LayerListToolControlsEnum, LayerListToolService, LayerService, LayerSyncWatcher, LinkedProperties, MEASURE_UNIT_AUTO, MVTDataSource, MapBrowserComponent, MapCenterComponent, MapController, 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, 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, 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, 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, getCommonVectorSelectedStyle, getCommonVectorStyle, getFileExtension, getFormatFromOptions, getLayersLegends, getMousePositionFromOlGeometryEvent, getOlTooltipAtCenter, getOlTooltipsAtMidpoints, getResolutionFromScale, getRowsInMapExtent, getScaleFromResolution, getSelectedOnly, getTooltipsOfOlGeometry, gmlRegex, handleFileExportError, handleFileExportSuccess, handleFileImportError, handleFileImportSuccess, handleInvalidFileImportError, handleNothingToExportError, handleNothingToImportError, handleOgreServerImportError, handleSRSImportError, handleSizeFileImportError, handleUnreadbleFileImportError, hideOlFeature, hoverFeatureMarker, ichercheReverseSearchSourceFactory, ichercheSearchSourceFactory, ilayerSearchResultFormatterFactory, ilayerSearchSourceFactory, initRoutesFeatureStore, initStepFeatureStore, initStopsFeatureStore, jsonRegex, layerFeatureIsQueryable, 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 };
 //# sourceMappingURL=igo2-geo.js.map