@igo2/geo 1.9.4 → 1.10.0

package/bundles/igo2-geo.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@angular/material/badge'), require('@angular/material/icon'), require('@angular/material/list'), require('@angular/material/tooltip'), require('@igo2/common'), require('@angular/material/button'), require('@igo2/core'), require('@angular/material/dialog'), require('@ngx-translate/core'), require('rxjs'), require('rxjs/operators'), require('@igo2/utils'), require('ol/Map'), require('ol/View'), require('ol/Feature'), require('ol/Geolocation'), require('ol/control/Attribution'), require('ol/control/ScaleLine'), require('ol/proj'), require('ol/proj/proj4'), require('ol/geom/Point'), require('ol/interaction'), require('ol/geom/Circle'), require('ol/style'), require('proj4'), require('ol/extent'), require('ol/geom/GeometryLayout'), require('ol/geom/Polygon'), require('ol/geom/LineString'), require('ol/format/GeoJSON'), require('ol/layer/Vector'), require('ol/Observable'), require('ol/easing'), require('ol/color'), require('ol/render'), require('ol/format/FormatType'), require('ol/proj/Projection'), require('ol/source/ImageWMS'), require('ts-md5'), require('ol/format/filter'), require('ol/format/WKT'), require('ol/format/WFS'), require('moment'), require('ol/format'), require('ol/format/GML2'), require('ol/format/GML3'), require('ol/format/GML32'), require('ol/format/OSMXML'), require('ol/source/Cluster'), require('ol/source/Vector'), require('ol/has'), require('ol/source/OSM'), require('ol/source/XYZ'), require('ol/loadingstrategy'), require('@angular/common/http'), require('ol/source/WMTS'), require('ol/tilegrid/WMTS'), require('ol/extent.js'), require('ol/source/CartoDB'), require('ol/format/EsriJSON'), require('ol/source/ImageArcGISRest'), require('ol/source/TileArcGISRest'), require('ol/source/TileDebug'), require('ol/tilegrid/TileGrid'), require('ol/source/VectorTile'), require('ol/format/MVT'), require('ts-cacheable'), require('ol/source/WMTS.js'), require('@igo2/auth'), require('ol/interaction/DragBox'), require('ol/geom'), require('ol/layer'), require('ol/layer/Image'), require('ol/layer/Tile'), require('ol/layer/VectorTile'), require('@angular/animations'), require('ol-mapbox-style/dist/stylefunction'), require('striptags'), require('ol/render/Feature'), require('@angular/material/core'), require('@angular/material/form-field'), require('@angular/material/select'), require('@angular/forms'), require('@angular/material/checkbox'), require('@angular/material/divider'), require('@angular/material/input'), require('@angular/material/menu'), require('@angular/material/slide-toggle'), require('@angular/material/slider'), require('@angular/material/autocomplete'), require('@angular/material/button-toggle'), require('ngx-color-picker'), require('@angular/platform-browser'), require('ol/interaction/Draw'), require('ol/interaction/Modify'), require('ol/interaction/Select'), require('ol/events/condition'), require('@turf/line-intersect'), require('@turf/helpers'), require('ol/sphere'), require('ol/Overlay'), require('@turf/point-on-feature'), require('@angular/material/datepicker'), require('@angular/material/radio'), require('@angular/material/table'), require('@angular/material/tabs'), require('@angular/material/tree'), require('@mat-datetimepicker/core'), require('ol/style/Style'), require('ol/interaction/Translate'), require('ol/geom/LinearRing'), require('@angular/cdk/collections'), require('@angular/cdk/tree'), require('file-saver'), require('jspdf'), require('html2canvas'), require('jszip'), require('@angular/cdk/drag-drop')) :
-    typeof define === 'function' && define.amd ? define('@igo2/geo', ['exports', '@angular/core', '@angular/common', '@angular/material/badge', '@angular/material/icon', '@angular/material/list', '@angular/material/tooltip', '@igo2/common', '@angular/material/button', '@igo2/core', '@angular/material/dialog', '@ngx-translate/core', 'rxjs', 'rxjs/operators', '@igo2/utils', 'ol/Map', 'ol/View', 'ol/Feature', 'ol/Geolocation', 'ol/control/Attribution', 'ol/control/ScaleLine', 'ol/proj', 'ol/proj/proj4', 'ol/geom/Point', 'ol/interaction', 'ol/geom/Circle', 'ol/style', 'proj4', 'ol/extent', 'ol/geom/GeometryLayout', 'ol/geom/Polygon', 'ol/geom/LineString', 'ol/format/GeoJSON', 'ol/layer/Vector', 'ol/Observable', 'ol/easing', 'ol/color', 'ol/render', 'ol/format/FormatType', 'ol/proj/Projection', 'ol/source/ImageWMS', 'ts-md5', 'ol/format/filter', 'ol/format/WKT', 'ol/format/WFS', 'moment', 'ol/format', 'ol/format/GML2', 'ol/format/GML3', 'ol/format/GML32', 'ol/format/OSMXML', 'ol/source/Cluster', 'ol/source/Vector', 'ol/has', 'ol/source/OSM', 'ol/source/XYZ', 'ol/loadingstrategy', '@angular/common/http', 'ol/source/WMTS', 'ol/tilegrid/WMTS', 'ol/extent.js', 'ol/source/CartoDB', 'ol/format/EsriJSON', 'ol/source/ImageArcGISRest', 'ol/source/TileArcGISRest', 'ol/source/TileDebug', 'ol/tilegrid/TileGrid', 'ol/source/VectorTile', 'ol/format/MVT', 'ts-cacheable', 'ol/source/WMTS.js', '@igo2/auth', 'ol/interaction/DragBox', 'ol/geom', 'ol/layer', 'ol/layer/Image', 'ol/layer/Tile', 'ol/layer/VectorTile', '@angular/animations', 'ol-mapbox-style/dist/stylefunction', 'striptags', 'ol/render/Feature', '@angular/material/core', '@angular/material/form-field', '@angular/material/select', '@angular/forms', '@angular/material/checkbox', '@angular/material/divider', '@angular/material/input', '@angular/material/menu', '@angular/material/slide-toggle', '@angular/material/slider', '@angular/material/autocomplete', '@angular/material/button-toggle', 'ngx-color-picker', '@angular/platform-browser', 'ol/interaction/Draw', 'ol/interaction/Modify', 'ol/interaction/Select', 'ol/events/condition', '@turf/line-intersect', '@turf/helpers', 'ol/sphere', 'ol/Overlay', '@turf/point-on-feature', '@angular/material/datepicker', '@angular/material/radio', '@angular/material/table', '@angular/material/tabs', '@angular/material/tree', '@mat-datetimepicker/core', 'ol/style/Style', 'ol/interaction/Translate', 'ol/geom/LinearRing', '@angular/cdk/collections', '@angular/cdk/tree', 'file-saver', 'jspdf', 'html2canvas', 'jszip', '@angular/cdk/drag-drop'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.igo2 = global.igo2 || {}, global.igo2.geo = {}), global.ng.core, global.ng.common, global.ng.material.badge, global.ng.material.icon, global.ng.material.list, global.ng.material.tooltip, global.common, global.ng.material.button, global.core, global.ng.material.dialog, global["ngxt-core"], global.rxjs, global.rxjs.operators, global.utils, global.olMap, global.olView, global.olFeature, global.olGeolocation, global.olAttribution, global.olControlScaleLine, global.olproj, global.olproj4, global.OlPoint, global.olinteraction, global.olCircle, global.olstyle, global.proj4, global.olextent, global.olGeometryLayout, global.OlPolygon, global.OlLineString, global.OlGeoJSON, global.OlVectorLayer, global.olobservable, global.oleasing, global.color, global.olRender, global.FormatType, global.olProjection, global.olSourceImageWMS, global.tsMd5, global.olfilter, global.olWKT, global.olFormatWFS, global.moment, global.olformat, global.olFormatGML2, global.olFormatGML3, global.olFormatGML32, global.olFormatOSMXML, global.olSourceCluster, global.OlVectorSource, global.has, global.olSourceOSM, global.olSourceXYZ, global.OlLoadingStrategy, global.ng.common.http, global.olSourceWMTS, global.olTileGridWMTS, global.extent_js, global.olSourceCarto, global.olFormatEsriJSON, global.olSourceImageArcGISRest, global.olSourceTileArcGISRest, global.TileDebug, global.olTileGrid, global.olSourceVectorTile, global.olFormatMVT, global.tsCacheable, global.WMTS_js, global.auth, global.OlDragBoxInteraction, global.olgeom, global.olLayer, global.olLayerImage, global.olLayerTile, global.olLayerVectorTile, global.ng.animations, global.stylefunction, global.striptags, global.OlRenderFeature, global.ng.material.core, global.ng.material.formField, global.ng.material.select, global.ng.forms, global.ng.material.checkbox, global.ng.material.divider, global.ng.material.input, global.ng.material.menu, global.ng.material.slideToggle, global.ng.material.slider, global.ng.material.autocomplete, global.ng.material.buttonToggle, global.ngxColorPicker, global.ng.platformBrowser, global.OlDraw, global.OlModify, global.olInteractionSelect, global.olcondition, global.lineIntersect, global.helpers, global.sphere, global.OlOverlay, global.pointOnFeature, global.ng.material.datepicker, global.ng.material.radio, global.ng.material.table, global.ng.material.tabs, global.ng.material.tree, global.datepickercore, global.OlStyle, global.OlTranslate, global.OlLinearRing, global.ng.cdk.collections, global.ng.cdk.tree, global.fileSaver, global.jsPDF, global._html2canvas, global.JSZip, global.ng.cdk.dragDrop));
-})(this, (function (exports, i0, i1$1, i9$1, i4, i1$3, i3, i6$1, i2, i2$1, i1, i7, rxjs, operators, utils, olMap, olView, olFeature, olGeolocation, olAttribution, olControlScaleLine, olproj, olproj4, OlPoint, olInteraction, OlCircle, olstyle, proj4, olextent, OlGeometryLayout, OlPolygon, OlLineString, OlGeoJSON, OlVectorLayer, olObservable, oleasing, color, render, FormatType, olProjection, olSourceImageWMS, tsMd5, olfilter, olWKT, olFormatWFS, moment_, olformat, olFormatGML2, olFormatGML3, olFormatGML32, olFormatOSMXML, olSourceCluster, OlVectorSource, has, olSourceOSM, olSourceXYZ, OlLoadingStrategy, i1$2, olSourceWMTS, olTileGridWMTS, extent_js, olSourceCarto, olFormatEsriJSON, ImageArcGISRest, olSourceTileArcGISRest, TileDebug, TileGrid, olSourceVectorTile, olFormatMVT, tsCacheable, WMTS_js, i6, OlDragBoxInteraction, olgeom, olLayer, olLayerImage, olLayerTile, olLayerVectorTile, animations, stylefunction, striptags_, OlRenderFeature, i9, i12, i13, i16, i11, i10, i5, i5$1, i22, i13$1, i6$2, i18, i12$1, i1$4, OlDraw, OlModify, OlSelect, olCondition, lineIntersect, helpers, sphere, OlOverlay, pointOnFeature, i25, i19, i23, i20, i24, i4$1, OlStyle, OlTranslate, OlLinearRing, collections, tree, fileSaver, jspdf, html2canvas, JSZip, i2$2) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@angular/material/badge'), require('@angular/material/icon'), require('@angular/material/list'), require('@angular/material/tooltip'), require('@igo2/common'), require('@angular/material/button'), require('@igo2/core'), require('@angular/material/dialog'), require('@ngx-translate/core'), require('rxjs'), require('rxjs/operators'), require('@igo2/utils'), require('ol/Map'), require('ol/View'), require('ol/Feature'), require('ol/Geolocation'), require('ol/control/Attribution'), require('ol/control/ScaleLine'), require('ol/proj'), require('ol/proj/proj4'), require('ol/geom/Point'), require('ol/interaction'), require('ol/geom/Circle'), require('ol/style'), require('proj4'), require('ol/extent'), require('ol/geom/GeometryLayout'), require('ol/geom/Polygon'), require('ol/geom/LineString'), require('ol/format/GeoJSON'), require('ol/layer/Vector'), require('ol/Observable'), require('ol/easing'), require('ol/color'), require('ol/render'), require('ol/format/FormatType'), require('ol/proj/Projection'), require('ol/source/ImageWMS'), require('ts-md5'), require('ol/format/filter'), require('ol/format/WKT'), require('ol/format/WFS'), require('moment'), require('ol/format'), require('ol/format/GML2'), require('ol/format/GML3'), require('ol/format/GML32'), require('ol/format/OSMXML'), require('ol/source/Cluster'), require('ol/source/Vector'), require('ol/has'), require('ol/source/OSM'), require('ol/source/XYZ'), require('ol/loadingstrategy'), require('@angular/common/http'), require('ol/source/WMTS'), require('ol/tilegrid/WMTS'), require('ol/extent.js'), require('ol/source/CartoDB'), require('ol/format/EsriJSON'), require('ol/source/ImageArcGISRest'), require('ol/source/TileArcGISRest'), require('ol/source/TileDebug'), require('ol/tilegrid/TileGrid'), require('ol/source/VectorTile'), require('ol/format/MVT'), require('ts-cacheable'), require('ol/source/WMTS.js'), require('@igo2/auth'), require('ol/interaction/DragBox'), require('ol/layer/VectorTile'), require('ol/geom'), require('ol/layer/Image'), require('ol/layer/Tile'), require('ol/render/Feature'), require('@angular/animations'), require('ol-mapbox-style/dist/stylefunction'), require('striptags'), require('@angular/material/core'), require('@angular/material/form-field'), require('@angular/material/select'), require('@angular/forms'), require('@angular/material/checkbox'), require('@angular/material/divider'), require('@angular/material/input'), require('@angular/material/menu'), require('@angular/material/slide-toggle'), require('@angular/material/slider'), require('@angular/material/autocomplete'), require('@angular/material/button-toggle'), require('ngx-color-picker'), require('@angular/platform-browser'), require('ol/interaction/Draw'), require('ol/interaction/Modify'), require('ol/interaction/Select'), require('ol/events/condition'), require('@turf/line-intersect'), require('@turf/helpers'), require('ol/sphere'), require('ol/Overlay'), require('@turf/point-on-feature'), require('@angular/material/datepicker'), require('@angular/material/radio'), require('@angular/material/table'), require('@angular/material/tabs'), require('@angular/material/tree'), require('@mat-datetimepicker/core'), require('ol/style/Style'), require('ol/interaction/Translate'), require('ol/geom/LinearRing'), require('@angular/cdk/collections'), require('@angular/cdk/tree'), require('file-saver'), require('jspdf'), require('html2canvas'), require('jszip'), require('@angular/cdk/drag-drop')) :
+    typeof define === 'function' && define.amd ? define('@igo2/geo', ['exports', '@angular/core', '@angular/common', '@angular/material/badge', '@angular/material/icon', '@angular/material/list', '@angular/material/tooltip', '@igo2/common', '@angular/material/button', '@igo2/core', '@angular/material/dialog', '@ngx-translate/core', 'rxjs', 'rxjs/operators', '@igo2/utils', 'ol/Map', 'ol/View', 'ol/Feature', 'ol/Geolocation', 'ol/control/Attribution', 'ol/control/ScaleLine', 'ol/proj', 'ol/proj/proj4', 'ol/geom/Point', 'ol/interaction', 'ol/geom/Circle', 'ol/style', 'proj4', 'ol/extent', 'ol/geom/GeometryLayout', 'ol/geom/Polygon', 'ol/geom/LineString', 'ol/format/GeoJSON', 'ol/layer/Vector', 'ol/Observable', 'ol/easing', 'ol/color', 'ol/render', 'ol/format/FormatType', 'ol/proj/Projection', 'ol/source/ImageWMS', 'ts-md5', 'ol/format/filter', 'ol/format/WKT', 'ol/format/WFS', 'moment', 'ol/format', 'ol/format/GML2', 'ol/format/GML3', 'ol/format/GML32', 'ol/format/OSMXML', 'ol/source/Cluster', 'ol/source/Vector', 'ol/has', 'ol/source/OSM', 'ol/source/XYZ', 'ol/loadingstrategy', '@angular/common/http', 'ol/source/WMTS', 'ol/tilegrid/WMTS', 'ol/extent.js', 'ol/source/CartoDB', 'ol/format/EsriJSON', 'ol/source/ImageArcGISRest', 'ol/source/TileArcGISRest', 'ol/source/TileDebug', 'ol/tilegrid/TileGrid', 'ol/source/VectorTile', 'ol/format/MVT', 'ts-cacheable', 'ol/source/WMTS.js', '@igo2/auth', 'ol/interaction/DragBox', 'ol/layer/VectorTile', 'ol/geom', 'ol/layer/Image', 'ol/layer/Tile', 'ol/render/Feature', '@angular/animations', 'ol-mapbox-style/dist/stylefunction', 'striptags', '@angular/material/core', '@angular/material/form-field', '@angular/material/select', '@angular/forms', '@angular/material/checkbox', '@angular/material/divider', '@angular/material/input', '@angular/material/menu', '@angular/material/slide-toggle', '@angular/material/slider', '@angular/material/autocomplete', '@angular/material/button-toggle', 'ngx-color-picker', '@angular/platform-browser', 'ol/interaction/Draw', 'ol/interaction/Modify', 'ol/interaction/Select', 'ol/events/condition', '@turf/line-intersect', '@turf/helpers', 'ol/sphere', 'ol/Overlay', '@turf/point-on-feature', '@angular/material/datepicker', '@angular/material/radio', '@angular/material/table', '@angular/material/tabs', '@angular/material/tree', '@mat-datetimepicker/core', 'ol/style/Style', 'ol/interaction/Translate', 'ol/geom/LinearRing', '@angular/cdk/collections', '@angular/cdk/tree', 'file-saver', 'jspdf', 'html2canvas', 'jszip', '@angular/cdk/drag-drop'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.igo2 = global.igo2 || {}, global.igo2.geo = {}), global.ng.core, global.ng.common, global.ng.material.badge, global.ng.material.icon, global.ng.material.list, global.ng.material.tooltip, global.common, global.ng.material.button, global.core, global.ng.material.dialog, global["ngxt-core"], global.rxjs, global.rxjs.operators, global.utils, global.olMap, global.olView, global.olFeature, global.olGeolocation, global.olAttribution, global.olControlScaleLine, global.olproj, global.olproj4, global.OlPoint, global.olinteraction, global.olCircle, global.olstyle, global.proj4, global.olextent, global.olGeometryLayout, global.OlPolygon, global.OlLineString, global.OlGeoJSON, global.OlVectorLayer, global.olobservable, global.oleasing, global.color, global.olRender, global.FormatType, global.olProjection, global.olSourceImageWMS, global.tsMd5, global.olfilter, global.olWKT, global.olFormatWFS, global.moment, global.olformat, global.olFormatGML2, global.olFormatGML3, global.olFormatGML32, global.olFormatOSMXML, global.olSourceCluster, global.OlVectorSource, global.has, global.olSourceOSM, global.olSourceXYZ, global.OlLoadingStrategy, global.ng.common.http, global.olSourceWMTS, global.olTileGridWMTS, global.extent_js, global.olSourceCarto, global.olFormatEsriJSON, global.olSourceImageArcGISRest, global.olSourceTileArcGISRest, global.TileDebug, global.olTileGrid, global.olSourceVectorTile, global.olFormatMVT, global.tsCacheable, global.WMTS_js, global.auth, global.OlDragBoxInteraction, global.olLayerVectorTile, global.olgeom, global.olLayerImage, global.olLayerTile, global.OlRenderFeature, global.ng.animations, global.stylefunction, global.striptags, global.ng.material.core, global.ng.material.formField, global.ng.material.select, global.ng.forms, global.ng.material.checkbox, global.ng.material.divider, global.ng.material.input, global.ng.material.menu, global.ng.material.slideToggle, global.ng.material.slider, global.ng.material.autocomplete, global.ng.material.buttonToggle, global.ngxColorPicker, global.ng.platformBrowser, global.OlDraw, global.OlModify, global.olInteractionSelect, global.olcondition, global.lineIntersect, global.helpers, global.sphere, global.OlOverlay, global.pointOnFeature, global.ng.material.datepicker, global.ng.material.radio, global.ng.material.table, global.ng.material.tabs, global.ng.material.tree, global.datepickercore, global.OlStyle, global.OlTranslate, global.OlLinearRing, global.ng.cdk.collections, global.ng.cdk.tree, global.fileSaver, global.jsPDF, global._html2canvas, global.JSZip, global.ng.cdk.dragDrop));
+})(this, (function (exports, i0, i1$1, i9$1, i4, i1$3, i3, i6$1, i2, i2$1, i1, i7, rxjs, operators, utils, olMap, olView, OlFeature, olGeolocation, olAttribution, olControlScaleLine, olproj, olproj4, OlPoint, olInteraction, OlCircle, olstyle, proj4, olextent, OlGeometryLayout, OlPolygon, OlLineString, OlGeoJSON, OlVectorLayer, olObservable, oleasing, color, render, FormatType, olProjection, olSourceImageWMS, tsMd5, olfilter, olWKT, olFormatWFS, moment_, olformat, olFormatGML2, olFormatGML3, olFormatGML32, olFormatOSMXML, olSourceCluster, OlVectorSource, has, olSourceOSM, olSourceXYZ, OlLoadingStrategy, i1$2, olSourceWMTS, olTileGridWMTS, extent_js, olSourceCarto, olFormatEsriJSON, ImageArcGISRest, olSourceTileArcGISRest, TileDebug, TileGrid, olSourceVectorTile, olFormatMVT, tsCacheable, WMTS_js, i6, OlDragBoxInteraction, olLayerVectorTile, olgeom, olLayerImage, olLayerTile, RenderFeature, animations, stylefunction, striptags_, i9, i12, i13, i16, i11, i10, i5, i5$1, i22, i13$1, i6$2, i18, i12$1, i1$4, OlDraw, OlModify, OlSelect, olCondition, lineIntersect, helpers, sphere, OlOverlay, pointOnFeature, i25, i19, i23, i20, i24, i4$1, OlStyle, OlTranslate, OlLinearRing, collections, tree, fileSaver, jspdf, html2canvas, JSZip, i2$2) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -37,7 +37,7 @@
     var i7__namespace = /*#__PURE__*/_interopNamespace(i7);
     var olMap__default = /*#__PURE__*/_interopDefaultLegacy(olMap);
     var olView__default = /*#__PURE__*/_interopDefaultLegacy(olView);
-    var olFeature__default = /*#__PURE__*/_interopDefaultLegacy(olFeature);
+    var OlFeature__default = /*#__PURE__*/_interopDefaultLegacy(OlFeature);
     var olGeolocation__default = /*#__PURE__*/_interopDefaultLegacy(olGeolocation);
     var olAttribution__default = /*#__PURE__*/_interopDefaultLegacy(olAttribution);
     var olControlScaleLine__default = /*#__PURE__*/_interopDefaultLegacy(olControlScaleLine);
@@ -86,14 +86,13 @@
     var olFormatMVT__default = /*#__PURE__*/_interopDefaultLegacy(olFormatMVT);
     var i6__namespace = /*#__PURE__*/_interopNamespace(i6);
     var OlDragBoxInteraction__default = /*#__PURE__*/_interopDefaultLegacy(OlDragBoxInteraction);
+    var olLayerVectorTile__default = /*#__PURE__*/_interopDefaultLegacy(olLayerVectorTile);
     var olgeom__namespace = /*#__PURE__*/_interopNamespace(olgeom);
-    var olLayer__namespace = /*#__PURE__*/_interopNamespace(olLayer);
     var olLayerImage__default = /*#__PURE__*/_interopDefaultLegacy(olLayerImage);
     var olLayerTile__default = /*#__PURE__*/_interopDefaultLegacy(olLayerTile);
-    var olLayerVectorTile__default = /*#__PURE__*/_interopDefaultLegacy(olLayerVectorTile);
+    var RenderFeature__default = /*#__PURE__*/_interopDefaultLegacy(RenderFeature);
     var stylefunction__default = /*#__PURE__*/_interopDefaultLegacy(stylefunction);
     var striptags___namespace = /*#__PURE__*/_interopNamespace(striptags_);
-    var OlRenderFeature__default = /*#__PURE__*/_interopDefaultLegacy(OlRenderFeature);
     var i9__namespace = /*#__PURE__*/_interopNamespace(i9);
     var i12__namespace = /*#__PURE__*/_interopNamespace(i12);
     var i13__namespace = /*#__PURE__*/_interopNamespace(i13);
@@ -758,6 +757,17 @@
         return ImageWatcher;
     }(utils.Watcher));
 
+    function computeMVTOptionsOnHover(layerOptions) {
+        var _a, _b;
+        var vectorTileLayerOptions = layerOptions;
+        if (((_a = vectorTileLayerOptions.sourceOptions) === null || _a === void 0 ? void 0 : _a.type) === 'mvt' &&
+            (((_b = vectorTileLayerOptions.styleByAttribute) === null || _b === void 0 ? void 0 : _b.hoverStyle) || vectorTileLayerOptions.hoverStyle)) {
+            var fc = vectorTileLayerOptions.sourceOptions.featureClass;
+            vectorTileLayerOptions.sourceOptions.featureClass = fc ? fc : 'feature';
+        }
+        return layerOptions;
+    }
+
     exports.LinkedProperties = void 0;
     (function (LinkedProperties) {
         LinkedProperties["OPACITY"] = "opacity";
@@ -3119,11 +3129,16 @@
                 return this.visible$.value;
             },
             set: function (value) {
+                var _this = this;
+                var _a, _b;
                 this.ol.setVisible(value);
                 this.visible$.next(value);
-                if (!this.hasBeenVisible$.value && value && this.messageService) {
+                if (!this.hasBeenVisible$.value && value) {
                     this.hasBeenVisible$.next(value);
                 }
+                if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.messages) && value) {
+                    (_b = this.options) === null || _b === void 0 ? void 0 : _b.messages.filter(function (m) { var _a; return (_a = m.options) === null || _a === void 0 ? void 0 : _a.showOnEachLayerVisibility; }).map(function (message) { return _this.showMessage(message); });
+                }
             },
             enumerable: false,
             configurable: true
@@ -3153,9 +3168,7 @@
                 this.hasBeenVisible$$ = this.hasBeenVisible$.subscribe(function () {
                     if (_this.options.messages && _this.visible) {
                         _this.options.messages.map(function (message) {
-                            message.title = message.title;
-                            message.text = message.text;
-                            _this.messageService.message(message);
+                            _this.showMessage(message);
                         });
                     }
                 });
@@ -3164,6 +3177,14 @@
                 this.layerSyncWatcher.unsubscribe();
             }
         };
+        Layer.prototype.showMessage = function (message) {
+            if (!this.messageService) {
+                return;
+            }
+            message.title = message.title;
+            message.text = message.text;
+            this.messageService.message(message);
+        };
         Layer.prototype.observeResolution = function () {
             var _this = this;
             this.resolution$$ = this.map.viewController.resolution$.subscribe(function () { return _this.updateInResolutionsRange(); });
@@ -4277,9 +4298,9 @@
         MVTDataSource.prototype.createOlSource = function () {
             var mvtFormat;
             if (this.options.featureClass === 'feature') {
-                mvtFormat = new olFormatMVT__default["default"]({ featureClass: olFeature__default["default"] });
+                mvtFormat = new olFormatMVT__default["default"]({ featureClass: OlFeature__default["default"] });
             }
-            else if (this.options.featureClass === undefined) {
+            else {
                 mvtFormat = new olFormatMVT__default["default"]();
             }
             this.options.format = mvtFormat;
@@ -4983,8 +5004,7 @@
                 legendInfo: legendInfo,
                 style: style,
                 timeFilter: timeFilter,
-                timeExtent: timeExtent,
-                attributions: attributions
+                timeExtent: timeExtent
             });
             var options = utils.ObjectUtils.removeUndefined({
                 params: params,
@@ -5000,6 +5020,7 @@
                 sourceFields: arcgisOptions.fields,
                 queryTitle: arcgisOptions.displayField
             });
+            options.params.attributions = attributions;
             return utils.ObjectUtils.mergeDeep(options, baseOptions);
         };
         CapabilitiesService.prototype.parseTileOrImageArcgisOptions = function (baseOptions, arcgisOptions, legend, serviceCapabilities) {
@@ -5042,10 +5063,10 @@
                 },
                 legendInfo: legendInfo,
                 timeFilter: timeFilter,
-                attributions: attributions,
                 sourceFields: arcgisOptions.fields,
                 queryTitle: arcgisOptions.displayField
             });
+            options.attributions = attributions;
             return utils.ObjectUtils.mergeDeep(options, baseOptions);
         };
         CapabilitiesService.prototype.findDataSourceInCapabilities = function (layerArray, name) {
@@ -6966,6 +6987,7 @@
             return olCls;
         };
         StyleService.prototype.createStyleByAttribute = function (feature, styleByAttribute) {
+            var _a;
             var style;
             var type = styleByAttribute.type ? styleByAttribute.type : this.guessTypeFeature(feature);
             var attribute = styleByAttribute.attribute;
@@ -6973,35 +6995,36 @@
             var stroke = styleByAttribute.stroke;
             var width = styleByAttribute.width;
             var fill = styleByAttribute.fill;
+            var anchor = styleByAttribute.anchor;
             var radius = styleByAttribute.radius;
             var icon = styleByAttribute.icon;
             var scale = styleByAttribute.scale;
             var size = data ? data.length : 0;
-            var label = styleByAttribute.label;
-            var labelStyle = label instanceof olstyle__namespace.Style ?
-                this.parseStyle('text', styleByAttribute.label) ||
-                    new olstyle__namespace.Text() : undefined;
+            var label = styleByAttribute.label ? styleByAttribute.label.attribute : undefined;
+            var labelStyle = ((_a = styleByAttribute.label) === null || _a === void 0 ? void 0 : _a.style) ? this.parseStyle('text', styleByAttribute.label.style) : undefined;
+            if (!labelStyle && label) {
+                labelStyle = new olstyle__namespace.Text();
+            }
             var baseStyle = styleByAttribute.baseStyle;
             if (labelStyle) {
-                var options = {
-                    text: this.getLabel(feature, label)
-                };
-                labelStyle instanceof olstyle__namespace.Style ? labelStyle.setText(new olstyle__namespace.Text(options)) :
-                    labelStyle.setText(this.getLabel(feature, label));
+                labelStyle.setText(this.getLabel(feature, label));
             }
             if (type === 'circle') {
                 for (var i = 0; i < size; i++) {
-                    var val = typeof feature.get(attribute) !== 'undefined'
+                    var val = typeof feature.get(attribute) !== 'undefined' && feature.get(attribute) !== null
                         ? feature.get(attribute)
                         : '';
-                    if (val === data[i] || val.toString().match(data[i])) {
+                    if (val === data[i] || val.toString().match(new RegExp(data[i], 'gmi'))) {
                         if (icon) {
                             style = [
                                 new olstyle__namespace.Style({
                                     image: new olstyle__namespace.Icon({
+                                        color: fill ? fill[i] : undefined,
                                         src: icon[i],
-                                        scale: scale ? scale[i] : 1
-                                    })
+                                        scale: scale ? scale[i] : 1,
+                                        anchor: anchor ? anchor[i] : [0.5, 0.5]
+                                    }),
+                                    text: labelStyle instanceof olstyle__namespace.Text ? labelStyle : undefined
                                 })
                             ];
                             return style;
@@ -7050,10 +7073,10 @@
             }
             else if (type === 'regular') {
                 for (var i = 0; i < size; i++) {
-                    var val = typeof feature.get(attribute) !== 'undefined'
+                    var val = typeof feature.get(attribute) !== 'undefined' && feature.get(attribute) !== null
                         ? feature.get(attribute)
                         : '';
-                    if (val === data[i] || val.toString().match(data[i])) {
+                    if (val === data[i] || val.toString().match(new RegExp(data[i], 'gmi'))) {
                         style = [
                             new olstyle__namespace.Style({
                                 stroke: new olstyle__namespace.Stroke({
@@ -7069,7 +7092,7 @@
                         return style;
                     }
                 }
-                if (feature instanceof olFeature__default["default"]) {
+                if (feature instanceof OlFeature__default["default"]) {
                     if (!feature.getStyle()) {
                         if (baseStyle) {
                             style = this.createStyle(baseStyle);
@@ -7094,15 +7117,15 @@
             }
         };
         StyleService.prototype.createClusterStyle = function (feature, clusterParam, layerStyle) {
-            var e_1, _a;
+            var e_1, _b;
             if (clusterParam === void 0) { clusterParam = {}; }
             var style;
             var size = feature.get('features').length;
             if (size !== 1) {
                 if (clusterParam.clusterRanges) {
                     try {
-                        for (var _b = __values(clusterParam.clusterRanges), _c = _b.next(); !_c.done; _c = _b.next()) {
-                            var r = _c.value;
+                        for (var _c = __values(clusterParam.clusterRanges), _d = _c.next(); !_d.done; _d = _c.next()) {
+                            var r = _d.value;
                             if ((!r.minRadius || r.minRadius <= size) &&
                                 (!r.maxRadius || r.maxRadius >= size)) {
                                 style = this.createStyle(r.style);
@@ -7131,7 +7154,7 @@
                     catch (e_1_1) { e_1 = { error: e_1_1 }; }
                     finally {
                         try {
-                            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                            if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
                         }
                         finally { if (e_1) throw e_1.error; }
                     }
@@ -7176,6 +7199,9 @@
         };
         StyleService.prototype.getLabel = function (feature, labelMatch) {
             var label = labelMatch;
+            if (!label) {
+                return;
+            }
             var labelToGet = Array.from(labelMatch.matchAll(/\$\{([^\{\}]+)\}/g));
             labelToGet.forEach(function (v) {
                 label = label.replace(v[0], feature.get(v[1]));
@@ -8379,7 +8405,7 @@
                     if (_this.bufferFeature) {
                         _this.buffer.dataSource.ol.removeFeature(_this.bufferFeature);
                     }
-                    _this.geolocationPositionFeature = new olFeature__default["default"]({ geometry: positionGeometry });
+                    _this.geolocationPositionFeature = new OlFeature__default["default"]({ geometry: positionGeometry });
                     _this.geolocationPositionFeature.setId('geolocationPositionFeature');
                     _this.geolocationPositionFeature.setStyle(new olstyle__namespace.Style({
                         image: new olstyle__namespace.Circle({
@@ -8393,7 +8419,7 @@
                             }),
                         }),
                     }));
-                    _this.geolocationAccuracyFeature = new olFeature__default["default"]({ geometry: accuracyGeometry });
+                    _this.geolocationAccuracyFeature = new OlFeature__default["default"]({ geometry: accuracyGeometry });
                     _this.geolocationAccuracyFeature.setId('geolocationAccuracyFeature');
                     if (_this.alwaysTracking) {
                         [_this.geolocationPositionFeature, _this.geolocationAccuracyFeature].map(function (feature) {
@@ -8417,7 +8443,7 @@
                         else {
                             bufferText = '';
                         }
-                        _this.bufferFeature = new olFeature__default["default"](_this.bufferGeom);
+                        _this.bufferFeature = new OlFeature__default["default"](_this.bufferGeom);
                         _this.bufferFeature.setId('bufferFeature');
                         _this.bufferFeature.set('bufferStroke', bufferStroke);
                         _this.bufferFeature.set('bufferFill', bufferFill);
@@ -9062,6 +9088,7 @@
             this.mediaService = mediaService;
             this.styleService = styleService;
             this.pointerHoverFeatureStore = new i6$1.EntityStore([]);
+            this.selectionMVT = {};
             this.hoverFeatureId = 'hoverFeatureId';
             /**
              * The delay where the mouse must be motionless before trigger the reverse search
@@ -9118,7 +9145,8 @@
          * Initialize the pointer position store
          * @internal
          */
-        HoverFeatureDirective.prototype.initStore = function (layerSource) {
+        HoverFeatureDirective.prototype.initStore = function () {
+            var _this = this;
             var store = this.store;
             var layer = new VectorLayer({
                 id: 'hoverFeatureId',
@@ -9131,6 +9159,64 @@
                 style: hoverFeatureMarker
             });
             tryBindStoreLayer(store, layer);
+            this.selectionLayer = new olLayerVectorTile__default["default"]({
+                map: this.map.ol,
+                zIndex: 901,
+                renderMode: "vector",
+                declutter: true,
+                source: new olSourceVectorTile__default["default"]({}),
+                style: function (feature) {
+                    if (_this.mvtStyleOptions && feature.getId() in _this.selectionMVT) {
+                        return _this.createHoverStyle(feature, _this.mvtStyleOptions);
+                    }
+                }
+            });
+        };
+        HoverFeatureDirective.prototype.createHoverStyle = function (feature, hoverStyle) {
+            var _a;
+            var localHoverStyle = Object.assign({}, hoverStyle);
+            var label = hoverStyle.label ? hoverStyle.label.attribute : undefined;
+            var hasLabelStyle = ((_a = hoverStyle.label) === null || _a === void 0 ? void 0 : _a.style) ? true : false;
+            if (!feature.get('_isLabel')) {
+                localHoverStyle.label = undefined;
+                hasLabelStyle = false;
+                label = undefined;
+            }
+            else {
+                // clear the style for label....
+                var size = localHoverStyle.data ? localHoverStyle.data.length : 0;
+                var radius = [];
+                var stroke = [];
+                var width = [];
+                var fill = [];
+                for (var i = 0; i < size; i++) {
+                    radius.push(0);
+                    stroke.push('rgba(255, 255, 255, 0)');
+                    width.push(0);
+                    fill.push('rgba(255, 255, 255, 0)');
+                }
+                localHoverStyle.radius = radius;
+                localHoverStyle.stroke = stroke;
+                localHoverStyle.width = width;
+                localHoverStyle.fill = fill;
+            }
+            if (!hasLabelStyle && label) {
+                localHoverStyle.label.style =
+                    {
+                        textAlign: 'left',
+                        textBaseline: 'top',
+                        font: '12px Calibri,sans-serif',
+                        fill: { color: '#000' },
+                        backgroundFill: { color: 'rgba(255, 255, 255, 0.5)' },
+                        backgroundStroke: { color: 'rgba(200, 200, 200, 0.75)', width: 2 },
+                        stroke: { color: '#fff', width: 3 },
+                        overflow: true,
+                        offsetX: 10,
+                        offsetY: 20,
+                        padding: [2.5, 2.5, 2.5, 2.5]
+                    };
+            }
+            return this.styleService.createStyleByAttribute(feature, localHoverStyle);
         };
         /**
          * Stop listening to pointermove and reverse search results.
@@ -9217,69 +9303,178 @@
             if (typeof this.lastTimeoutRequest !== 'undefined') { // cancel timeout when the mouse moves
                 clearTimeout(this.lastTimeoutRequest);
             }
+            this.clearLayer();
+            var maximumZindex = -Infinity;
+            var topMostOlLayer;
             var pixel = this.map.ol.getPixelFromCoordinate(event.coordinate);
             this.lastTimeoutRequest = setTimeout(function () {
-                _this.map.ol.forEachFeatureAtPixel(pixel, function (f, l) {
-                    if (f.get('hoverSummary') === undefined) {
-                        var igoLayer = this.map.getLayerByOlUId(l.ol_uid);
-                        this.setLayerStyleFromOptions(igoLayer, f);
-                        this.pointerHoverFeatureStore.load([{ layer: igoLayer, feature: f }]);
+                // retrieve the topmost layer with feature to only apply the hover on this layer.
+                _this.map.ol.forEachFeatureAtPixel(pixel, function (mapFeature, layerOL) {
+                    if (!layerOL) {
+                        return;
+                    }
+                    var igoLayer = _this.map.getLayerByOlUId(layerOL.ol_uid);
+                    if (!_this.canProcessHover(igoLayer)) {
+                        return;
+                    }
+                    if (igoLayer.zIndex <= maximumZindex) {
+                        return;
+                    }
+                    maximumZindex = igoLayer.zIndex;
+                    topMostOlLayer = layerOL;
+                }, {
+                    hitTolerance: 10, layerFilter: function (olLayer) { return olLayer instanceof OlVectorLayer__default["default"] || olLayer instanceof olLayerVectorTile__default["default"]; }
+                });
+                if (!topMostOlLayer) {
+                    return;
+                }
+                _this.clearLayer();
+                _this.map.ol.forEachFeatureAtPixel(pixel, function (mapFeature, layerOL) {
+                    var _a, _b, _c;
+                    if (mapFeature.get('hoverSummary') === undefined) {
+                        var igoLayer_1;
+                        if (layerOL instanceof OlVectorLayer__default["default"]) {
+                            igoLayer_1 = _this.map.getLayerByOlUId(layerOL.ol_uid);
+                            if (!_this.canProcessHover(igoLayer_1)) {
+                                return;
+                            }
+                            var localOlFeature = _this.handleRenderFeature(mapFeature);
+                            _this.setLayerStyleFromOptions(igoLayer_1, localOlFeature);
+                            var featuresToLoad = [localOlFeature];
+                            localOlFeature.set("_isLabel", false);
+                            var myLabelOlFeature = new OlFeature__default["default"]();
+                            myLabelOlFeature.setProperties(localOlFeature.getProperties());
+                            var labelGeom = localOlFeature.getGeometry().getType() === 'Point' ? localOlFeature.getGeometry() : new olgeom__namespace.Point(event.coordinate);
+                            myLabelOlFeature.setGeometry(labelGeom);
+                            myLabelOlFeature.setId(localOlFeature.getId());
+                            myLabelOlFeature.set("_isLabel", true);
+                            _this.setLayerStyleFromOptions(igoLayer_1, myLabelOlFeature);
+                            featuresToLoad.push(myLabelOlFeature);
+                            _this.pointerHoverFeatureStore.load(featuresToLoad);
+                            return true;
+                        }
+                        if (layerOL instanceof olLayerVectorTile__default["default"]) {
+                            igoLayer_1 = _this.map.getLayerByOlUId(layerOL.ol_uid);
+                            if (!_this.canProcessHover(igoLayer_1)) {
+                                return;
+                            }
+                            if ((_b = (_a = igoLayer_1 === null || igoLayer_1 === void 0 ? void 0 : igoLayer_1.options) === null || _a === void 0 ? void 0 : _a.styleByAttribute) === null || _b === void 0 ? void 0 : _b.hoverStyle) {
+                                _this.mvtStyleOptions = igoLayer_1.options.styleByAttribute.hoverStyle;
+                            }
+                            else if ((_c = igoLayer_1 === null || igoLayer_1 === void 0 ? void 0 : igoLayer_1.options) === null || _c === void 0 ? void 0 : _c.hoverStyle) {
+                                _this.mvtStyleOptions = igoLayer_1.options.hoverStyle;
+                            }
+                            _this.selectionLayer.setSource(layerOL.getSource());
+                            layerOL.getFeatures(event.pixel).then(function (mvtFeatures) {
+                                if (!mvtFeatures.length) {
+                                    _this.selectionMVT = {};
+                                    _this.selectionLayer.changed();
+                                    _this.clearLayer();
+                                    return;
+                                }
+                                var feature = mvtFeatures[0];
+                                if (!feature) {
+                                    _this.clearLayer();
+                                    return;
+                                }
+                                var localOlFeature = _this.handleRenderFeature(feature);
+                                localOlFeature.set("_isLabel", false);
+                                var myLabelOlFeature = new OlFeature__default["default"]();
+                                myLabelOlFeature.setProperties(localOlFeature.getProperties());
+                                var labelGeom = localOlFeature.getGeometry().getType() === 'Point' ? localOlFeature.getGeometry() : new olgeom__namespace.Point(event.coordinate);
+                                myLabelOlFeature.setGeometry(labelGeom);
+                                myLabelOlFeature.setId(localOlFeature.getId());
+                                myLabelOlFeature.set("_isLabel", true);
+                                _this.setLayerStyleFromOptions(igoLayer_1, myLabelOlFeature);
+                                _this.pointerHoverFeatureStore.load([myLabelOlFeature]);
+                                _this.selectionMVT[feature.getId()] = localOlFeature;
+                                _this.selectionLayer.changed();
+                            });
+                        }
                     }
                     return true;
-                }.bind(_this));
+                }, {
+                    hitTolerance: 10, layerFilter: function (olLayer) { return olLayer === topMostOlLayer; }
+                });
             }, this.igoHoverFeatureDelay);
         };
+        HoverFeatureDirective.prototype.canProcessHover = function (igoLayer) {
+            if (!igoLayer) {
+                return false;
+            }
+            if (!igoLayer.visible) {
+                return false;
+            }
+            if (!igoLayer.options) {
+                return false;
+            }
+            if (!igoLayer.options.styleByAttribute && !igoLayer.options.hoverStyle) {
+                return false;
+            }
+            if ((igoLayer.options.styleByAttribute && !igoLayer.options.styleByAttribute.hoverStyle) &&
+                !igoLayer.options.hoverStyle) {
+                return false;
+            }
+            return true;
+        };
+        HoverFeatureDirective.prototype.handleRenderFeature = function (feature) {
+            var localFeature;
+            if (feature instanceof RenderFeature__default["default"]) {
+                localFeature = new OlFeature__default["default"]({
+                    geometry: this.getGeometry(feature)
+                });
+                localFeature.setId(feature.getId());
+            }
+            else if (feature instanceof OlFeature__default["default"]) {
+                localFeature = feature;
+            }
+            return localFeature;
+        };
         /**
          * Add a feature to the pointer store
          * @param text string
          */
-        HoverFeatureDirective.prototype.addFeatureOverlay = function (results) {
-            if (results.length > 0) {
-                results = results[0];
+        HoverFeatureDirective.prototype.addFeatureOverlay = function (hoverEntity) {
+            if (hoverEntity.length > 0) {
+                var result = hoverEntity[0];
                 this.clearLayer();
-                var geom_1 = this.getGeometry(results.feature);
-                // si vector tile, merge avec les polygones voisins possiblement meme entité
-                if (results.layer.ol instanceof olLayer__namespace.VectorTile) {
-                    geom_1 = [geom_1];
-                    var neighbourCollection = this.getSameFeatureNeighbour(results.feature, results.layer);
-                    neighbourCollection.forEach(function (n) {
-                        geom_1.push(n.getGeometry());
-                    });
-                }
-                var feature = new olFeature__default["default"]({
-                    geometry: geom_1 instanceof Array ? new olgeom__namespace.GeometryCollection(geom_1) : geom_1,
+                var feature = new OlFeature__default["default"]({
+                    geometry: result.getGeometry(),
                     meta: { id: this.hoverFeatureId },
-                    hoverSummary: this.getHoverSummary(results.feature.getProperties())
+                    hoverSummary: this.getHoverSummary(result.getProperties())
                 });
                 this.store.setLayerOlFeatures([feature], exports.FeatureMotion.None);
             }
         };
-        HoverFeatureDirective.prototype.setLayerStyleFromOptions = function (igoLayer, feat) {
-            var _a, _b;
-            if ((_b = (_a = igoLayer.options) === null || _a === void 0 ? void 0 : _a.styleByAttribute) === null || _b === void 0 ? void 0 : _b.hoverStyle) {
-                this.store.layer.ol.setStyle(this.styleService.createStyleByAttribute(feat, igoLayer.options.styleByAttribute.hoverStyle));
+        HoverFeatureDirective.prototype.setLayerStyleFromOptions = function (igoLayer, feature) {
+            var _a, _b, _c;
+            if ((_b = (_a = igoLayer === null || igoLayer === void 0 ? void 0 : igoLayer.options) === null || _a === void 0 ? void 0 : _a.styleByAttribute) === null || _b === void 0 ? void 0 : _b.hoverStyle) {
+                this.store.layer.ol.setStyle(this.createHoverStyle(feature, igoLayer.options.styleByAttribute.hoverStyle));
+                return;
             }
-            else {
-                this.store.layer.ol.setStyle(hoverFeatureMarker);
+            if ((_c = igoLayer === null || igoLayer === void 0 ? void 0 : igoLayer.options) === null || _c === void 0 ? void 0 : _c.hoverStyle) {
+                this.store.layer.ol.setStyle(this.createHoverStyle(feature, igoLayer.options.hoverStyle));
             }
         };
         HoverFeatureDirective.prototype.getHoverSummary = function (properties) {
-            var e_1, _c;
+            var e_1, _d;
             var summary = '';
             try {
-                for (var _d = __values(Object.entries(properties)), _e = _d.next(); !_e.done; _e = _d.next()) {
-                    var _f = __read(_e.value, 2), key = _f[0], value = _f[1];
-                    summary += key + ": " + value + '\n';
+                for (var _e = __values(Object.entries(properties)), _f = _e.next(); !_f.done; _f = _e.next()) {
+                    var _g = __read(_f.value, 2), key = _g[0], value = _g[1];
+                    if (!key.startsWith('_') && key !== 'geometry') {
+                        summary += key + ": " + value + '\n';
+                    }
                 }
             }
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_e && !_e.done && (_c = _d.return)) _c.call(_d);
+                    if (_f && !_f.done && (_d = _e.return)) _d.call(_e);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
-            return summary;
+            return summary.length >= 2 ? summary.slice(0, -2) : summary;
         };
         HoverFeatureDirective.prototype.getGeometry = function (feature) {
             var geom;
@@ -9309,37 +9504,14 @@
             }
             return geom;
         };
-        HoverFeatureDirective.prototype.getSameFeatureNeighbour = function (feature, layer, neighbourCollection) {
-            var _this = this;
-            if (neighbourCollection === void 0) { neighbourCollection = []; }
-            if (neighbourCollection.length === 0) {
-                neighbourCollection.push(new olFeature__default["default"]({
-                    geometry: this.getGeometry(feature),
-                    meta: { id: this.hoverFeatureId }
-                }));
-            }
-            var toDoNeighbour = [];
-            var neighbourFeatures = layer.ol.getSource().getFeaturesInExtent(feature.getGeometry().getExtent());
-            neighbourFeatures.forEach(function (f) {
-                var checkIf = neighbourCollection.find(function (x) {
-                    return x === f;
-                });
-                if (f.getId() === feature.getId() && !checkIf) {
-                    toDoNeighbour.push(f);
-                    neighbourCollection.push(f);
-                }
-            });
-            return neighbourCollection.map(function (f) {
-                return new olFeature__default["default"]({
-                    geometry: _this.getGeometry(f),
-                    meta: { id: _this.hoverFeatureId }
-                });
-            });
-        };
         /**
          * Clear the pointer store features
          */
         HoverFeatureDirective.prototype.clearLayer = function () {
+            this.selectionMVT = {};
+            if (this.selectionLayer) {
+                this.selectionLayer.changed();
+            }
             if (this.store) {
                 this.store.clearLayer();
             }
@@ -9381,7 +9553,7 @@
             text: new olstyle__namespace.Text({
                 text: feature.get('hoverSummary'),
                 textAlign: 'left',
-                textBaseline: 'bottom',
+                textBaseline: 'top',
                 font: '12px Calibri,sans-serif',
                 fill: new olstyle__namespace.Fill({ color: '#000' }),
                 backgroundFill: new olstyle__namespace.Fill({ color: 'rgba(255, 255, 255, 0.5)' }),
@@ -9389,7 +9561,7 @@
                 stroke: new olstyle__namespace.Stroke({ color: '#fff', width: 3 }),
                 overflow: true,
                 offsetX: 10,
-                offsetY: -10,
+                offsetY: 20,
                 padding: [2.5, 2.5, 2.5, 2.5]
             })
         });
@@ -9945,15 +10117,17 @@
                     layer = this.createImageLayer(layerOptions);
                     break;
                 case MVTDataSource:
-                    layer = this.createVectorTileLayer(layerOptions);
+                    var _layerOptions = computeMVTOptionsOnHover(layerOptions);
+                    layer = this.createVectorTileLayer(_layerOptions);
                     break;
                 default:
                     break;
             }
             return layer;
         };
-        LayerService.prototype.createAsyncLayer = function (layerOptions, detailedContextUri) {
+        LayerService.prototype.createAsyncLayer = function (_layerOptions, detailedContextUri) {
             var _this = this;
+            var layerOptions = computeMVTOptionsOnHover(_layerOptions);
             if (layerOptions.source) {
                 return new rxjs.Observable(function (d) { return d.next(_this.createLayer(layerOptions)); });
             }
@@ -9974,7 +10148,7 @@
         };
         LayerService.prototype.createVectorLayer = function (layerOptions) {
             var style;
-            var olLayer;
+            var igoLayer;
             if (layerOptions.style !== undefined) {
                 style = this.styleService.createStyle(layerOptions.style);
             }
@@ -9987,7 +10161,7 @@
                 layerOptions.style = function (feature) {
                     return serviceStyle_1.createStyleByAttribute(feature, layerOptions.styleByAttribute);
                 };
-                olLayer = new VectorLayer(layerOptions, this.messageService, this.authInterceptor);
+                igoLayer = new VectorLayer(layerOptions, this.messageService, this.authInterceptor);
             }
             if (layerOptions.source instanceof ClusterDataSource) {
                 var serviceStyle_2 = this.styleService;
@@ -9995,20 +10169,20 @@
                 layerOptions.style = function (feature) {
                     return serviceStyle_2.createClusterStyle(feature, layerOptions.clusterParam, baseStyle_1);
                 };
-                olLayer = new VectorLayer(layerOptions, this.messageService, this.authInterceptor);
+                igoLayer = new VectorLayer(layerOptions, this.messageService, this.authInterceptor);
             }
             var layerOptionsOl = Object.assign({}, layerOptions, {
                 style: style
             });
-            if (!olLayer) {
-                olLayer = new VectorLayer(layerOptionsOl, this.messageService, this.authInterceptor);
+            if (!igoLayer) {
+                igoLayer = new VectorLayer(layerOptionsOl, this.messageService, this.authInterceptor);
             }
-            this.applyMapboxStyle(olLayer, layerOptionsOl);
-            return olLayer;
+            this.applyMapboxStyle(igoLayer, layerOptionsOl);
+            return igoLayer;
         };
         LayerService.prototype.createVectorTileLayer = function (layerOptions) {
             var style;
-            var olLayer;
+            var igoLayer;
             if (layerOptions.style !== undefined) {
                 style = this.styleService.createStyle(layerOptions.style);
             }
@@ -10017,16 +10191,16 @@
                 layerOptions.style = function (feature) {
                     return serviceStyle_3.createStyleByAttribute(feature, layerOptions.styleByAttribute);
                 };
-                olLayer = new VectorTileLayer(layerOptions, this.messageService, this.authInterceptor);
+                igoLayer = new VectorTileLayer(layerOptions, this.messageService, this.authInterceptor);
             }
             var layerOptionsOl = Object.assign({}, layerOptions, {
                 style: style
             });
-            if (!olLayer) {
-                olLayer = new VectorTileLayer(layerOptionsOl, this.messageService, this.authInterceptor);
+            if (!igoLayer) {
+                igoLayer = new VectorTileLayer(layerOptionsOl, this.messageService, this.authInterceptor);
             }
-            this.applyMapboxStyle(olLayer, layerOptionsOl);
-            return olLayer;
+            this.applyMapboxStyle(igoLayer, layerOptionsOl);
+            return igoLayer;
         };
         LayerService.prototype.applyMapboxStyle = function (layer, layerOptions) {
             if (layerOptions.mapboxStyle) {
@@ -11355,7 +11529,7 @@
      */
     function layerFeatureIsQueryable(layer) {
         var dataSource = layer.dataSource;
-        return dataSource.options.queryFeature === true;
+        return dataSource.options.queryLayerFeatures !== undefined ? (dataSource.options.queryLayerFeatures === true) : true;
     }
     /**
      * Whether an OL Vector layer is queryable
@@ -11513,7 +11687,7 @@
                                 finally { if (e_1) throw e_1.error; }
                             }
                         }
-                        else if (featureOL instanceof OlRenderFeature__default["default"]) {
+                        else if (featureOL instanceof RenderFeature__default["default"]) {
                             var newFeature = renderFeatureFromOl(featureOL, _this.map.projection, layerOL);
                             newFeature.meta = {
                                 id: layerOL.values_._layer.id + '.' + newFeature.meta.id,
@@ -11946,7 +12120,7 @@
      */
     function getCommonVectorStyle(_a) {
         var feature = _a.feature, _b = _a.markerColor, markerColor = _b === void 0 ? [0, 161, 222] : _b, _c = _a.markerOpacity, markerOpacity = _c === void 0 ? 0.5 : _c, markerOutlineColor = _a.markerOutlineColor, _d = _a.fillColor, fillColor = _d === void 0 ? [0, 161, 222] : _d, _e = _a.fillOpacity, fillOpacity = _e === void 0 ? 0.15 : _e, _f = _a.strokeColor, strokeColor = _f === void 0 ? [0, 161, 222] : _f, _g = _a.strokeOpacity, strokeOpacity = _g === void 0 ? 0.5 : _g, _h = _a.strokeWidth, strokeWidth = _h === void 0 ? 2 : _h;
-        var isOlFeature = feature instanceof olFeature__default["default"];
+        var isOlFeature = feature instanceof OlFeature__default["default"];
         var geometry;
         var text;
         if (isOlFeature) {
@@ -12933,6 +13107,7 @@
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 1, "igo.geo.layer.legend.noLegendScale"), " ");
         }
     }
+    var _c1$c = function (a0) { return [a0]; };
     function LayerLegendComponent_ng_container_0_ng_container_1_ng_container_1_div_2_div_5_div_1_Template(rf, ctx) {
         if (rf & 1) {
             var _r28_1 = i0__namespace.ɵɵgetCurrentView();
@@ -12949,7 +13124,7 @@
             var ctx_r22 = i0__namespace.ɵɵnextContext(3);
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵpropertyInterpolate("id", item_r6.title);
-            i0__namespace.ɵɵpropertyInterpolate("src", ctx_r22.legendGraphic[item_r6.title], i0__namespace.ɵɵsanitizeUrl);
+            i0__namespace.ɵɵpropertyInterpolate("src", i0__namespace.ɵɵpureFunction1(6, _c1$c, item_r6.imgGraphValue), i0__namespace.ɵɵsanitizeUrl);
             i0__namespace.ɵɵpropertyInterpolate("alt", i0__namespace.ɵɵpipeBind1(3, 4, "igo.geo.layer.legend.loadingLegendText"));
             i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵproperty("ngIf", ctx_r22.imagesHeight[item_r6.title] < 16);
@@ -12958,17 +13133,18 @@
     function LayerLegendComponent_ng_container_0_ng_container_1_ng_container_1_div_2_div_5_div_2_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelement(0, "div", 15);
+            i0__namespace.ɵɵpipe(1, "sanitizeHtml");
         }
         if (rf & 2) {
             var item_r6 = i0__namespace.ɵɵnextContext(3).$implicit;
-            i0__namespace.ɵɵproperty("ngStyle", item_r6.style)("innerHTML", item_r6.html, i0__namespace.ɵɵsanitizeHtml);
+            i0__namespace.ɵɵproperty("ngStyle", item_r6.style)("innerHTML", i0__namespace.ɵɵpipeBind1(1, 2, item_r6.html), i0__namespace.ɵɵsanitizeHtml);
         }
     }
     function LayerLegendComponent_ng_container_0_ng_container_1_ng_container_1_div_2_div_5_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div");
-            i0__namespace.ɵɵtemplate(1, LayerLegendComponent_ng_container_0_ng_container_1_ng_container_1_div_2_div_5_div_1_Template, 5, 6, "div", 0);
-            i0__namespace.ɵɵtemplate(2, LayerLegendComponent_ng_container_0_ng_container_1_ng_container_1_div_2_div_5_div_2_Template, 1, 2, "div", 12);
+            i0__namespace.ɵɵtemplate(1, LayerLegendComponent_ng_container_0_ng_container_1_ng_container_1_div_2_div_5_div_1_Template, 5, 8, "div", 0);
+            i0__namespace.ɵɵtemplate(2, LayerLegendComponent_ng_container_0_ng_container_1_ng_container_1_div_2_div_5_div_2_Template, 2, 4, "div", 12);
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
@@ -12979,7 +13155,7 @@
             i0__namespace.ɵɵproperty("ngIf", item_r6.html);
         }
     }
-    var _c1$c = function (a0) { return { "with-title": a0 }; };
+    var _c2$6 = function (a0) { return { "with-title": a0 }; };
     function LayerLegendComponent_ng_container_0_ng_container_1_ng_container_1_div_2_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div");
@@ -12996,7 +13172,7 @@
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("ngIf", item_r6.title);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(4, _c1$c, item_r6.title));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(4, _c2$6, item_r6.title));
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵproperty("ngIf", ctx_r8.currentStyle !== undefined);
             i0__namespace.ɵɵadvance(1);
@@ -13056,6 +13232,9 @@
         }
     }
     var LayerLegendComponent = /** @class */ (function () {
+        /**
+         * activeLegend
+         */
         function LayerLegendComponent(capabilitiesService, languageService, http, cdRef) {
             this.capabilitiesService = capabilitiesService;
             this.languageService = languageService;
@@ -13082,10 +13261,6 @@
              * if getLegendGraphic is authorized
              */
             this.getLegend = true;
-            /**
-             * activeLegend
-             */
-            this.legendGraphic = {};
         }
         /**
          * On init, subscribe to the map's resolution and update the legend accordingly
@@ -13150,7 +13325,6 @@
         LayerLegendComponent.prototype.getLegendGraphic = function (item) {
             var _this = this;
             var secureIMG = new i6$1.SecureImagePipe(this.http);
-            this.currentItemTitle = item.title;
             secureIMG.transform(item.url).pipe(operators.catchError(function (err) {
                 if (err.error) {
                     err.error.caught = true;
@@ -13158,8 +13332,10 @@
                     _this.cdRef.detectChanges();
                     return err;
                 }
-            })).subscribe(function (legend) {
-                _this.legendGraphic[_this.currentItemTitle] = legend;
+            })).subscribe(function (obsLegGraph) {
+                var idx = _this.legendItems$.value.findIndex(function (leg) { return leg.title === item.title; });
+                var legendGraph = obsLegGraph;
+                _this.legendItems$.value[idx].imgGraphValue = legendGraph;
                 _this.cdRef.detectChanges();
             });
         };
@@ -13286,7 +13462,7 @@
             if (rf & 2) {
                 i0__namespace.ɵɵproperty("ngIf", i0__namespace.ɵɵpipeBind1(1, 1, ctx.legendItems$));
             }
-        }, directives: [i1__namespace$1.NgIf, i1__namespace$1.NgForOf, i1__namespace$1.NgClass, i1__namespace$3.MatListItem, i4__namespace.MatIcon, i1__namespace$3.MatListAvatarCssMatStyler, i6__namespace$1.CollapseDirective, i9__namespace.MatLine, i12__namespace.MatFormField, i13__namespace.MatSelect, i3__namespace.MatTooltip, i16__namespace.NgControlStatus, i16__namespace.NgModel, i9__namespace.MatOption, i1__namespace$1.NgStyle], pipes: [i1__namespace$1.AsyncPipe, i7__namespace.TranslatePipe], 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__namespace$1.NgIf, i1__namespace$1.NgForOf, i1__namespace$1.NgClass, i1__namespace$3.MatListItem, i4__namespace.MatIcon, i1__namespace$3.MatListAvatarCssMatStyler, i6__namespace$1.CollapseDirective, i9__namespace.MatLine, i12__namespace.MatFormField, i13__namespace.MatSelect, i3__namespace.MatTooltip, i16__namespace.NgControlStatus, i16__namespace.NgModel, i9__namespace.MatOption, i1__namespace$1.NgStyle], pipes: [i1__namespace$1.AsyncPipe, i7__namespace.TranslatePipe, i6__namespace$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 });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(LayerLegendComponent, [{
                 type: i0.Component,
@@ -16367,7 +16543,8 @@
                 i6$1.IgoCollapsibleModule,
                 i6$1.IgoImageModule,
                 i6$1.IgoPanelModule,
-                i6$1.IgoMatBadgeIconModule
+                i6$1.IgoMatBadgeIconModule,
+                i6$1.IgoCustomHtmlModule
             ]] });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(IgoLayerModule, [{
@@ -16394,7 +16571,8 @@
                             i6$1.IgoCollapsibleModule,
                             i6$1.IgoImageModule,
                             i6$1.IgoPanelModule,
-                            i6$1.IgoMatBadgeIconModule
+                            i6$1.IgoMatBadgeIconModule,
+                            i6$1.IgoCustomHtmlModule
                         ],
                         exports: [
                             LayerItemComponent,
@@ -16450,7 +16628,8 @@
                 i6$1.IgoCollapsibleModule,
                 i6$1.IgoImageModule,
                 i6$1.IgoPanelModule,
-                i6$1.IgoMatBadgeIconModule], exports: [LayerItemComponent,
+                i6$1.IgoMatBadgeIconModule,
+                i6$1.IgoCustomHtmlModule], exports: [LayerItemComponent,
                 LayerLegendItemComponent,
                 LayerLegendComponent,
                 LayerListComponent,
@@ -20881,7 +21060,7 @@
          * @param olGeometry Ol Geometry
          */
         ModifyControl.prototype.setOlGeometry = function (olGeometry) {
-            var olFeature = new olFeature__default["default"]({ geometry: olGeometry });
+            var olFeature = new OlFeature__default["default"]({ geometry: olGeometry });
             this.olOverlaySource.clear();
             this.olOverlaySource.addFeature(olFeature);
         };
@@ -21365,7 +21544,7 @@
          * @param olGeometry Ol Geometry
          */
         SliceControl.prototype.setOlGeometry = function (olGeometry) {
-            var olFeature = new olFeature__default["default"]({ geometry: olGeometry });
+            var olFeature = new OlFeature__default["default"]({ geometry: olGeometry });
             this.olOverlaySource.clear(true);
             this.olOverlaySource.addFeature(olFeature);
         };
@@ -21467,7 +21646,7 @@
                 }
             }
             this.drawLineControl.getSource().clear(true);
-            this.olOverlaySource.addFeatures(olSlicedGeometries.map(function (olGeometry) { return new olFeature__default["default"](olGeometry); }));
+            this.olOverlaySource.addFeatures(olSlicedGeometries.map(function (olGeometry) { return new OlFeature__default["default"](olGeometry); }));
             olFeaturesToRemove.forEach(function (olFeature) {
                 _this.olOverlaySource.removeFeature(olFeature);
             });
@@ -23247,7 +23426,7 @@
                 dataProjection: 'EPSG:4326',
                 featureProjection: this.map.projection
             });
-            var olFeature = new olFeature__default["default"]({
+            var olFeature = new OlFeature__default["default"]({
                 geometry: olGeometry
             });
             olFeature.setStyle(this.overlayStyle);
@@ -28109,9 +28288,9 @@
 
     function SpatialFilterItemComponent_mat_slide_toggle_5_Template(rf, ctx) {
         if (rf & 1) {
-            var _r9_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementStart(0, "mat-slide-toggle", 15);
-            i0__namespace.ɵɵlistener("change", function SpatialFilterItemComponent_mat_slide_toggle_5_Template_mat_slide_toggle_change_0_listener() { i0__namespace.ɵɵrestoreView(_r9_1); var ctx_r8 = i0__namespace.ɵɵnextContext(); return ctx_r8.onDrawControlChange(); });
+            var _r11_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "mat-slide-toggle", 17);
+            i0__namespace.ɵɵlistener("change", function SpatialFilterItemComponent_mat_slide_toggle_5_Template_mat_slide_toggle_change_0_listener() { i0__namespace.ɵɵrestoreView(_r11_1); var ctx_r10 = i0__namespace.ɵɵnextContext(); return ctx_r10.onDrawControlChange(); });
             i0__namespace.ɵɵtext(1);
             i0__namespace.ɵɵpipe(2, "translate");
             i0__namespace.ɵɵelementEnd();
@@ -28125,9 +28304,9 @@
     }
     function SpatialFilterItemComponent_mat_slide_toggle_6_Template(rf, ctx) {
         if (rf & 1) {
-            var _r11_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementStart(0, "mat-slide-toggle", 15);
-            i0__namespace.ɵɵlistener("change", function SpatialFilterItemComponent_mat_slide_toggle_6_Template_mat_slide_toggle_change_0_listener() { i0__namespace.ɵɵrestoreView(_r11_1); var ctx_r10 = i0__namespace.ɵɵnextContext(); return ctx_r10.onfreehandControlChange(); });
+            var _r13_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "mat-slide-toggle", 17);
+            i0__namespace.ɵɵlistener("change", function SpatialFilterItemComponent_mat_slide_toggle_6_Template_mat_slide_toggle_change_0_listener() { i0__namespace.ɵɵrestoreView(_r13_1); var ctx_r12 = i0__namespace.ɵɵnextContext(); return ctx_r12.onfreehandControlChange(); });
             i0__namespace.ɵɵtext(1);
             i0__namespace.ɵɵpipe(2, "translate");
             i0__namespace.ɵɵelementEnd();
@@ -28147,26 +28326,26 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var measureUnit_r13 = ctx.$implicit;
-            i0__namespace.ɵɵproperty("value", measureUnit_r13);
+            var measureUnit_r15 = ctx.$implicit;
+            i0__namespace.ɵɵproperty("value", measureUnit_r15);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 2, "igo.geo.measure." + measureUnit_r13), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 2, "igo.geo.measure." + measureUnit_r15), " ");
         }
     }
     function SpatialFilterItemComponent_div_7_Template(rf, ctx) {
         if (rf & 1) {
-            var _r15_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementStart(0, "div", 16);
-            i0__namespace.ɵɵelementStart(1, "form", 17);
-            i0__namespace.ɵɵelementStart(2, "mat-form-field", 18);
-            i0__namespace.ɵɵelement(3, "input", 19);
+            var _r17_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "div", 18);
+            i0__namespace.ɵɵelementStart(1, "form", 19);
+            i0__namespace.ɵɵelementStart(2, "mat-form-field", 20);
+            i0__namespace.ɵɵelement(3, "input", 21);
             i0__namespace.ɵɵpipe(4, "translate");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(5, "mat-form-field", 20);
-            i0__namespace.ɵɵelementStart(6, "mat-select", 21);
-            i0__namespace.ɵɵlistener("selectionChange", function SpatialFilterItemComponent_div_7_Template_mat_select_selectionChange_6_listener($event) { i0__namespace.ɵɵrestoreView(_r15_1); var ctx_r14 = i0__namespace.ɵɵnextContext(); return ctx_r14.onMeasureUnitChange($event.value); });
-            i0__namespace.ɵɵtemplate(7, SpatialFilterItemComponent_div_7_mat_option_7_Template, 3, 4, "mat-option", 22);
+            i0__namespace.ɵɵelementStart(5, "mat-form-field", 22);
+            i0__namespace.ɵɵelementStart(6, "mat-select", 23);
+            i0__namespace.ɵɵlistener("selectionChange", function SpatialFilterItemComponent_div_7_Template_mat_select_selectionChange_6_listener($event) { i0__namespace.ɵɵrestoreView(_r17_1); var ctx_r16 = i0__namespace.ɵɵnextContext(); return ctx_r16.onMeasureUnitChange($event.value); });
+            i0__namespace.ɵɵtemplate(7, SpatialFilterItemComponent_div_7_mat_option_7_Template, 3, 4, "mat-option", 24);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
@@ -28190,28 +28369,28 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var measureUnit_r17 = ctx.$implicit;
-            i0__namespace.ɵɵproperty("value", measureUnit_r17);
+            var measureUnit_r19 = ctx.$implicit;
+            i0__namespace.ɵɵproperty("value", measureUnit_r19);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 2, "igo.geo.measure." + measureUnit_r17), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 2, "igo.geo.measure." + measureUnit_r19), " ");
         }
     }
     function SpatialFilterItemComponent_div_8_Template(rf, ctx) {
         if (rf & 1) {
-            var _r19_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementStart(0, "div", 23);
-            i0__namespace.ɵɵelementStart(1, "form", 24);
-            i0__namespace.ɵɵelementStart(2, "mat-form-field", 25);
-            i0__namespace.ɵɵelementStart(3, "input", 26);
-            i0__namespace.ɵɵlistener("input", function SpatialFilterItemComponent_div_8_Template_input_input_3_listener() { i0__namespace.ɵɵrestoreView(_r19_1); var ctx_r18 = i0__namespace.ɵɵnextContext(); return ctx_r18.getRadius(); });
+            var _r21_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "div", 25);
+            i0__namespace.ɵɵelementStart(1, "form", 26);
+            i0__namespace.ɵɵelementStart(2, "mat-form-field", 27);
+            i0__namespace.ɵɵelementStart(3, "input", 28);
+            i0__namespace.ɵɵlistener("input", function SpatialFilterItemComponent_div_8_Template_input_input_3_listener() { i0__namespace.ɵɵrestoreView(_r21_1); var ctx_r20 = i0__namespace.ɵɵnextContext(); return ctx_r20.getRadius(); });
             i0__namespace.ɵɵpipe(4, "translate");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(5, "mat-form-field", 20);
-            i0__namespace.ɵɵelementStart(6, "mat-select", 21);
-            i0__namespace.ɵɵlistener("selectionChange", function SpatialFilterItemComponent_div_8_Template_mat_select_selectionChange_6_listener($event) { i0__namespace.ɵɵrestoreView(_r19_1); var ctx_r20 = i0__namespace.ɵɵnextContext(); return ctx_r20.onMeasureUnitChange($event.value); });
-            i0__namespace.ɵɵtemplate(7, SpatialFilterItemComponent_div_8_mat_option_7_Template, 3, 4, "mat-option", 22);
+            i0__namespace.ɵɵelementStart(5, "mat-form-field", 22);
+            i0__namespace.ɵɵelementStart(6, "mat-select", 23);
+            i0__namespace.ɵɵlistener("selectionChange", function SpatialFilterItemComponent_div_8_Template_mat_select_selectionChange_6_listener($event) { i0__namespace.ɵɵrestoreView(_r21_1); var ctx_r22 = i0__namespace.ɵɵnextContext(); return ctx_r22.onMeasureUnitChange($event.value); });
+            i0__namespace.ɵɵtemplate(7, SpatialFilterItemComponent_div_8_mat_option_7_Template, 3, 4, "mat-option", 24);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
@@ -28229,23 +28408,23 @@
     }
     function SpatialFilterItemComponent_mat_radio_button_13_Template(rf, ctx) {
         if (rf & 1) {
-            var _r23_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementStart(0, "mat-radio-button", 27);
-            i0__namespace.ɵɵlistener("change", function SpatialFilterItemComponent_mat_radio_button_13_Template_mat_radio_button_change_0_listener($event) { i0__namespace.ɵɵrestoreView(_r23_1); var ctx_r22 = i0__namespace.ɵɵnextContext(); return ctx_r22.onItemTypeChange($event); });
+            var _r25_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "mat-radio-button", 29);
+            i0__namespace.ɵɵlistener("change", function SpatialFilterItemComponent_mat_radio_button_13_Template_mat_radio_button_change_0_listener($event) { i0__namespace.ɵɵrestoreView(_r25_1); var ctx_r24 = i0__namespace.ɵɵnextContext(); return ctx_r24.onItemTypeChange($event); });
             i0__namespace.ɵɵtext(1);
             i0__namespace.ɵɵpipe(2, "translate");
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var item_r21 = ctx.$implicit;
-            i0__namespace.ɵɵproperty("value", item_r21);
+            var item_r23 = ctx.$implicit;
+            i0__namespace.ɵɵproperty("value", item_r23);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 2, "igo.geo.spatialFilter." + item_r21), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 2, "igo.geo.spatialFilter." + item_r23), " ");
         }
     }
     function SpatialFilterItemComponent_div_14_mat_header_cell_3_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "mat-header-cell", 38);
+            i0__namespace.ɵɵelementStart(0, "mat-header-cell", 40);
             i0__namespace.ɵɵtext(1);
             i0__namespace.ɵɵpipe(2, "translate");
             i0__namespace.ɵɵelementEnd();
@@ -28257,17 +28436,17 @@
     }
     function SpatialFilterItemComponent_div_14_mat_header_cell_5_Template(rf, ctx) {
         if (rf & 1) {
-            var _r31_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementStart(0, "mat-header-cell", 39);
-            i0__namespace.ɵɵelementStart(1, "mat-checkbox", 40);
-            i0__namespace.ɵɵlistener("change", function SpatialFilterItemComponent_div_14_mat_header_cell_5_Template_mat_checkbox_change_1_listener($event) { i0__namespace.ɵɵrestoreView(_r31_1); var ctx_r30 = i0__namespace.ɵɵnextContext(2); return $event ? ctx_r30.masterToggle() : null; });
+            var _r33_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "mat-header-cell", 41);
+            i0__namespace.ɵɵelementStart(1, "mat-checkbox", 42);
+            i0__namespace.ɵɵlistener("change", function SpatialFilterItemComponent_div_14_mat_header_cell_5_Template_mat_checkbox_change_1_listener($event) { i0__namespace.ɵɵrestoreView(_r33_1); var ctx_r32 = i0__namespace.ɵɵnextContext(2); return $event ? ctx_r32.masterToggle() : null; });
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r25 = i0__namespace.ɵɵnextContext(2);
+            var ctx_r27 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("checked", ctx_r25.isAllSelected())("indeterminate", ctx_r25.selectedThematics.hasValue() && !ctx_r25.isAllSelected());
+            i0__namespace.ɵɵproperty("checked", ctx_r27.isAllSelected())("indeterminate", ctx_r27.selectedThematics.hasValue() && !ctx_r27.isAllSelected());
         }
     }
     function SpatialFilterItemComponent_div_14_mat_header_row_6_Template(rf, ctx) {
@@ -28282,74 +28461,74 @@
     }
     function SpatialFilterItemComponent_div_14_mat_tree_node_9_Template(rf, ctx) {
         if (rf & 1) {
-            var _r36_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementStart(0, "mat-tree-node", 41);
-            i0__namespace.ɵɵelementStart(1, "li", 42);
-            i0__namespace.ɵɵelement(2, "button", 43);
+            var _r38_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "mat-tree-node", 43);
+            i0__namespace.ɵɵelementStart(1, "li", 44);
+            i0__namespace.ɵɵelement(2, "button", 45);
             i0__namespace.ɵɵtext(3);
-            i0__namespace.ɵɵelementStart(4, "mat-checkbox", 44);
-            i0__namespace.ɵɵlistener("click", function SpatialFilterItemComponent_div_14_mat_tree_node_9_Template_mat_checkbox_click_4_listener($event) { return $event.stopPropagation(); })("change", function SpatialFilterItemComponent_div_14_mat_tree_node_9_Template_mat_checkbox_change_4_listener($event) { var restoredCtx = i0__namespace.ɵɵrestoreView(_r36_1); var node_r33 = restoredCtx.$implicit; var ctx_r35 = i0__namespace.ɵɵnextContext(2); return $event ? ctx_r35.onToggleChange(node_r33) : null; });
+            i0__namespace.ɵɵelementStart(4, "mat-checkbox", 46);
+            i0__namespace.ɵɵlistener("click", function SpatialFilterItemComponent_div_14_mat_tree_node_9_Template_mat_checkbox_click_4_listener($event) { return $event.stopPropagation(); })("change", function SpatialFilterItemComponent_div_14_mat_tree_node_9_Template_mat_checkbox_change_4_listener($event) { var restoredCtx = i0__namespace.ɵɵrestoreView(_r38_1); var node_r35 = restoredCtx.$implicit; var ctx_r37 = i0__namespace.ɵɵnextContext(2); return $event ? ctx_r37.onToggleChange(node_r35) : null; });
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var node_r33 = ctx.$implicit;
-            var ctx_r28 = i0__namespace.ɵɵnextContext(2);
+            var node_r35 = ctx.$implicit;
+            var ctx_r30 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate1(" ", node_r33.name, " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", node_r35.name, " ");
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("checked", ctx_r28.selectedThematics.isSelected(node_r33));
+            i0__namespace.ɵɵproperty("checked", ctx_r30.selectedThematics.isSelected(node_r35));
         }
     }
     function SpatialFilterItemComponent_div_14_mat_nested_tree_node_10_Template(rf, ctx) {
         if (rf & 1) {
-            var _r39_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r41_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementStart(0, "mat-nested-tree-node");
-            i0__namespace.ɵɵelementStart(1, "div", 42);
-            i0__namespace.ɵɵelementStart(2, "button", 45);
-            i0__namespace.ɵɵlistener("click", function SpatialFilterItemComponent_div_14_mat_nested_tree_node_10_Template_button_click_2_listener() { var restoredCtx = i0__namespace.ɵɵrestoreView(_r39_1); var node_r37 = restoredCtx.$implicit; var ctx_r38 = i0__namespace.ɵɵnextContext(2); return ctx_r38.onToggleClick(node_r37); });
-            i0__namespace.ɵɵelement(3, "mat-icon", 46);
+            i0__namespace.ɵɵelementStart(1, "div", 44);
+            i0__namespace.ɵɵelementStart(2, "button", 47);
+            i0__namespace.ɵɵlistener("click", function SpatialFilterItemComponent_div_14_mat_nested_tree_node_10_Template_button_click_2_listener() { var restoredCtx = i0__namespace.ɵɵrestoreView(_r41_1); var node_r39 = restoredCtx.$implicit; var ctx_r40 = i0__namespace.ɵɵnextContext(2); return ctx_r40.onToggleClick(node_r39); });
+            i0__namespace.ɵɵelement(3, "mat-icon", 48);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵtext(4);
-            i0__namespace.ɵɵelementStart(5, "mat-checkbox", 47);
-            i0__namespace.ɵɵlistener("change", function SpatialFilterItemComponent_div_14_mat_nested_tree_node_10_Template_mat_checkbox_change_5_listener($event) { var restoredCtx = i0__namespace.ɵɵrestoreView(_r39_1); var node_r37 = restoredCtx.$implicit; var ctx_r40 = i0__namespace.ɵɵnextContext(2); return $event ? ctx_r40.childrensToggle(node_r37) : null; });
+            i0__namespace.ɵɵelementStart(5, "mat-checkbox", 49);
+            i0__namespace.ɵɵlistener("change", function SpatialFilterItemComponent_div_14_mat_nested_tree_node_10_Template_mat_checkbox_change_5_listener($event) { var restoredCtx = i0__namespace.ɵɵrestoreView(_r41_1); var node_r39 = restoredCtx.$implicit; var ctx_r42 = i0__namespace.ɵɵnextContext(2); return $event ? ctx_r42.childrensToggle(node_r39) : null; });
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(6, "ul", 48);
-            i0__namespace.ɵɵelementContainer(7, 49);
+            i0__namespace.ɵɵelementStart(6, "ul", 50);
+            i0__namespace.ɵɵelementContainer(7, 51);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var node_r37 = ctx.$implicit;
-            var ctx_r29 = i0__namespace.ɵɵnextContext(2);
+            var node_r39 = ctx.$implicit;
+            var ctx_r31 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵproperty("svgIcon", ctx_r29.treeControl.isExpanded(node_r37) ? "chevron-down" : "chevron-right");
+            i0__namespace.ɵɵproperty("svgIcon", ctx_r31.treeControl.isExpanded(node_r39) ? "chevron-down" : "chevron-right");
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate1(" ", node_r37.name, " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", node_r39.name, " ");
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("checked", ctx_r29.isAllSelected(node_r37))("indeterminate", ctx_r29.hasChildrenSelected(node_r37) && !ctx_r29.isAllSelected(node_r37));
+            i0__namespace.ɵɵproperty("checked", ctx_r31.isAllSelected(node_r39))("indeterminate", ctx_r31.hasChildrenSelected(node_r39) && !ctx_r31.isAllSelected(node_r39));
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵclassProp("example-tree-invisible", !ctx_r29.treeControl.isExpanded(node_r37));
+            i0__namespace.ɵɵclassProp("example-tree-invisible", !ctx_r31.treeControl.isExpanded(node_r39));
         }
     }
     function SpatialFilterItemComponent_div_14_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "div", 28);
+            i0__namespace.ɵɵelementStart(0, "div", 30);
             i0__namespace.ɵɵelementStart(1, "mat-table");
-            i0__namespace.ɵɵelementContainerStart(2, 29);
-            i0__namespace.ɵɵtemplate(3, SpatialFilterItemComponent_div_14_mat_header_cell_3_Template, 3, 3, "mat-header-cell", 30);
+            i0__namespace.ɵɵelementContainerStart(2, 31);
+            i0__namespace.ɵɵtemplate(3, SpatialFilterItemComponent_div_14_mat_header_cell_3_Template, 3, 3, "mat-header-cell", 32);
             i0__namespace.ɵɵelementContainerEnd();
-            i0__namespace.ɵɵelementContainerStart(4, 31);
-            i0__namespace.ɵɵtemplate(5, SpatialFilterItemComponent_div_14_mat_header_cell_5_Template, 2, 2, "mat-header-cell", 32);
+            i0__namespace.ɵɵelementContainerStart(4, 33);
+            i0__namespace.ɵɵtemplate(5, SpatialFilterItemComponent_div_14_mat_header_cell_5_Template, 2, 2, "mat-header-cell", 34);
             i0__namespace.ɵɵelementContainerEnd();
-            i0__namespace.ɵɵtemplate(6, SpatialFilterItemComponent_div_14_mat_header_row_6_Template, 1, 0, "mat-header-row", 33);
-            i0__namespace.ɵɵtemplate(7, SpatialFilterItemComponent_div_14_mat_row_7_Template, 1, 0, "mat-row", 34);
+            i0__namespace.ɵɵtemplate(6, SpatialFilterItemComponent_div_14_mat_header_row_6_Template, 1, 0, "mat-header-row", 35);
+            i0__namespace.ɵɵtemplate(7, SpatialFilterItemComponent_div_14_mat_row_7_Template, 1, 0, "mat-row", 36);
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(8, "mat-tree", 35);
-            i0__namespace.ɵɵtemplate(9, SpatialFilterItemComponent_div_14_mat_tree_node_9_Template, 5, 2, "mat-tree-node", 36);
-            i0__namespace.ɵɵtemplate(10, SpatialFilterItemComponent_div_14_mat_nested_tree_node_10_Template, 8, 6, "mat-nested-tree-node", 37);
+            i0__namespace.ɵɵelementStart(8, "mat-tree", 37);
+            i0__namespace.ɵɵtemplate(9, SpatialFilterItemComponent_div_14_mat_tree_node_9_Template, 5, 2, "mat-tree-node", 38);
+            i0__namespace.ɵɵtemplate(10, SpatialFilterItemComponent_div_14_mat_nested_tree_node_10_Template, 8, 6, "mat-nested-tree-node", 39);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
@@ -28367,9 +28546,9 @@
     }
     function SpatialFilterItemComponent_button_16_Template(rf, ctx) {
         if (rf & 1) {
-            var _r42_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementStart(0, "button", 50);
-            i0__namespace.ɵɵlistener("click", function SpatialFilterItemComponent_button_16_Template_button_click_0_listener() { i0__namespace.ɵɵrestoreView(_r42_1); var ctx_r41 = i0__namespace.ɵɵnextContext(); return ctx_r41.clearSearch(); });
+            var _r44_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "button", 52);
+            i0__namespace.ɵɵlistener("click", function SpatialFilterItemComponent_button_16_Template_button_click_0_listener() { i0__namespace.ɵɵrestoreView(_r44_1); var ctx_r43 = i0__namespace.ɵɵnextContext(); return ctx_r43.clearSearch(); });
             i0__namespace.ɵɵtext(1);
             i0__namespace.ɵɵpipe(2, "translate");
             i0__namespace.ɵɵelementEnd();
@@ -28383,9 +28562,9 @@
     }
     function SpatialFilterItemComponent_button_17_Template(rf, ctx) {
         if (rf & 1) {
-            var _r44_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementStart(0, "button", 51);
-            i0__namespace.ɵɵlistener("click", function SpatialFilterItemComponent_button_17_Template_button_click_0_listener() { i0__namespace.ɵɵrestoreView(_r44_1); var ctx_r43 = i0__namespace.ɵɵnextContext(); return ctx_r43.clearDrawZone(); });
+            var _r46_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "button", 53);
+            i0__namespace.ɵɵlistener("click", function SpatialFilterItemComponent_button_17_Template_button_click_0_listener() { i0__namespace.ɵɵrestoreView(_r46_1); var ctx_r45 = i0__namespace.ɵɵnextContext(); return ctx_r45.clearDrawZone(); });
             i0__namespace.ɵɵtext(1);
             i0__namespace.ɵɵpipe(2, "translate");
             i0__namespace.ɵɵelementEnd();
@@ -28397,6 +28576,50 @@
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 2, "igo.geo.spatialFilter.clearForm"), " ");
         }
     }
+    function SpatialFilterItemComponent_button_27_Template(rf, ctx) {
+        if (rf & 1) {
+            var _r48_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "button", 54);
+            i0__namespace.ɵɵlistener("click", function SpatialFilterItemComponent_button_27_Template_button_click_0_listener() { i0__namespace.ɵɵrestoreView(_r48_1); var ctx_r47 = i0__namespace.ɵɵnextContext(); return ctx_r47.toggleVisibleList(); });
+            i0__namespace.ɵɵpipe(1, "translate");
+            i0__namespace.ɵɵelement(2, "mat-icon", 55);
+            i0__namespace.ɵɵelementEnd();
+        }
+        if (rf & 2) {
+            i0__namespace.ɵɵproperty("matTooltip", i0__namespace.ɵɵpipeBind1(1, 1, "igo.geo.spatialFilter.showSearchResults"));
+        }
+    }
+    function SpatialFilterItemComponent_div_28_button_1_Template(rf, ctx) {
+        if (rf & 1) {
+            var _r51_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "button", 59);
+            i0__namespace.ɵɵlistener("click", function SpatialFilterItemComponent_div_28_button_1_Template_button_click_0_listener() { i0__namespace.ɵɵrestoreView(_r51_1); var ctx_r50 = i0__namespace.ɵɵnextContext(2); return ctx_r50.toggleVisibleList(); });
+            i0__namespace.ɵɵpipe(1, "translate");
+            i0__namespace.ɵɵelement(2, "mat-icon", 60);
+            i0__namespace.ɵɵelementEnd();
+        }
+        if (rf & 2) {
+            i0__namespace.ɵɵproperty("matTooltip", i0__namespace.ɵɵpipeBind1(1, 1, "igo.geo.spatialFilter.hideSearchResults"));
+        }
+    }
+    function SpatialFilterItemComponent_div_28_Template(rf, ctx) {
+        if (rf & 1) {
+            var _r53_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "div", 56);
+            i0__namespace.ɵɵtemplate(1, SpatialFilterItemComponent_div_28_button_1_Template, 3, 3, "button", 57);
+            i0__namespace.ɵɵelementStart(2, "igo-entity-table", 58);
+            i0__namespace.ɵɵlistener("entitySelectChange", function SpatialFilterItemComponent_div_28_Template_igo_entity_table_entitySelectChange_2_listener($event) { i0__namespace.ɵɵrestoreView(_r53_1); var ctx_r52 = i0__namespace.ɵɵnextContext(); return ctx_r52.entityChange.emit($event); });
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+        }
+        if (rf & 2) {
+            var ctx_r9 = i0__namespace.ɵɵnextContext();
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵproperty("ngIf", ctx_r9.listIsVisible);
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵproperty("template", ctx_r9.tableTemplate)("store", ctx_r9.store);
+        }
+    }
     /**
      * Spatial-Filter-Item (search parameters)
      */
@@ -28421,6 +28644,7 @@
             this.clearSearchEvent = new i0.EventEmitter();
             this.export = new i0.EventEmitter();
             this.openWorkspace = new i0.EventEmitter();
+            this.entityChange = new i0.EventEmitter();
             this.itemType = [exports.SpatialFilterItemType.Address, exports.SpatialFilterItemType.Thematics];
             this.selectedItemType = exports.SpatialFilterItemType.Address;
             this.treeControl = new tree.NestedTreeControl(function (node) { return node.children; });
@@ -28449,6 +28673,7 @@
             this.radiusFormControl = new i16.FormControl();
             this.bufferFormControl = new i16.FormControl();
             this.measureUnit = exports.MeasureLengthUnit.Meters;
+            this.listIsVisible = true;
         }
         Object.defineProperty(SpatialFilterItemComponent.prototype, "type", {
             get: function () {
@@ -28710,6 +28935,24 @@
                     _this.messageService.alert(_this.languageService.translate.instant('igo.geo.spatialFilter.bufferAlert'), _this.languageService.translate.instant('igo.geo.spatialFilter.warning'));
                 }
             });
+            var selectedRecordStrategy = new i6$1.EntityStoreFilterSelectionStrategy({});
+            var selectionStrategy = new FeatureStoreSelectionStrategy({
+                layer: new VectorLayer({
+                    zIndex: 300,
+                    source: new FeatureDataSource(),
+                    style: undefined,
+                    showInLayerList: false,
+                    exportable: false,
+                    browsable: false
+                }),
+                map: this.map,
+                hitTolerance: 15,
+                motion: exports.FeatureMotion.Default,
+                many: true,
+                dragBox: true
+            });
+            this.store.addStrategy(selectionStrategy, true);
+            this.store.addStrategy(selectedRecordStrategy, false);
         };
         /**
          * Unsubscribe to the value stream
@@ -28981,9 +29224,10 @@
                 this.bufferEvent.emit(this.buffer);
             }
             this.toggleSearch.emit();
-            this.store.entities$.subscribe(function (value) {
+            this.store.entities$.pipe(operators.debounceTime(500)).subscribe(function (value) {
                 if (value.length && _this.layers.length === _this.thematicLength + 1) {
                     _this.openWorkspace.emit();
+                    _this.createTableTemplate();
                 }
             });
         };
@@ -29004,6 +29248,7 @@
             this.bufferEvent.emit(0);
             this.clearButtonEvent.emit();
             this.loading = false;
+            this.tableTemplate = undefined;
         };
         SpatialFilterItemComponent.prototype.clearDrawZone = function () {
             this.formControl.reset();
@@ -29108,10 +29353,31 @@
                 this.drawStyle$.next(this.PointStyle);
             }
         };
+        SpatialFilterItemComponent.prototype.toggleVisibleList = function () {
+            this.listIsVisible = !this.listIsVisible;
+        };
+        SpatialFilterItemComponent.prototype.createTableTemplate = function () {
+            var typeColumn = {
+                name: 'meta.title',
+                title: this.languageService.translate.instant('igo.geo.spatialFilter.type'),
+                renderer: i6$1.EntityTableColumnRenderer.UnsanitizedHTML
+            };
+            var nameColumn = {
+                name: 'properties.nom',
+                title: this.languageService.translate.instant('igo.geo.spatialFilter.searchResults'),
+                renderer: i6$1.EntityTableColumnRenderer.UnsanitizedHTML
+            };
+            var columns = [typeColumn, nameColumn];
+            this.tableTemplate = {
+                selection: true,
+                sort: true,
+                columns: columns
+            };
+        };
         return SpatialFilterItemComponent;
     }());
     SpatialFilterItemComponent.ɵfac = function SpatialFilterItemComponent_Factory(t) { return new (t || SpatialFilterItemComponent)(i0__namespace.ɵɵdirectiveInject(i0__namespace.ChangeDetectorRef), i0__namespace.ɵɵdirectiveInject(SpatialFilterService), i0__namespace.ɵɵdirectiveInject(i2__namespace$1.MessageService), i0__namespace.ɵɵdirectiveInject(i2__namespace$1.LanguageService)); };
-    SpatialFilterItemComponent.ɵcmp = /*@__PURE__*/ i0__namespace.ɵɵdefineComponent({ type: SpatialFilterItemComponent, selectors: [["igo-spatial-filter-item"]], inputs: { map: "map", type: "type", queryType: "queryType", zone: "zone", loading: "loading", store: "store", layers: "layers", allLayers: "allLayers", thematicLength: "thematicLength" }, outputs: { toggleSearch: "toggleSearch", itemTypeChange: "itemTypeChange", thematicChange: "thematicChange", drawZoneEvent: "drawZoneEvent", bufferEvent: "bufferEvent", zoneWithBufferChange: "zoneWithBufferChange", measureUnitChange: "measureUnitChange", radiusEvent: "radiusEvent", freehandControl: "freehandControl", clearButtonEvent: "clearButtonEvent", clearSearchEvent: "clearSearchEvent", export: "export", openWorkspace: "openWorkspace" }, decls: 27, vars: 40, consts: [[3, "formControl", "map", "geometryType", "drawGuide", "measure", "drawControlIsActive", "freehandDrawIsActive", "drawStyle", "overlayStyle", "radius"], [1, "header"], [3, "checked", "labelPosition", "change", 4, "ngIf"], ["class", "buffer-unit", 4, "ngIf"], ["class", "radius-unit", 4, "ngIf"], [1, "title", "mat-typography"], [3, "value"], [3, "value", "change", 4, "ngFor", "ngForOf"], ["class", "thematics", 4, "ngIf"], [1, "buttons"], ["mat-raised-button", "", "class", "clear-search-button", 3, "disabled", "click", 4, "ngIf"], ["mat-raised-button", "", "class", "clear-form-button", 3, "disabled", "click", 4, "ngIf"], ["mat-raised-button", "", "color", "primary", 1, "search-button", 3, "disabled", "click"], ["mat-raised-button", "", 1, "remove-button", 3, "disabled", "click"], ["mat-raised-button", "", 1, "export-button", 3, "disabled", "click"], [3, "checked", "labelPosition", "change"], [1, "buffer-unit"], [1, "buffer-form"], [1, "buffer"], ["type", "number", "matInput", "", 3, "placeholder", "formControl", "value", "readonly"], [1, "unit-field"], [3, "value", "selectionChange"], [3, "value", 4, "ngFor", "ngForOf"], [1, "radius-unit"], [1, "radius-form"], [1, "radius"], ["type", "number", "matInput", "", 3, "placeholder", "formControl", "value", "readonly", "input"], [3, "value", "change"], [1, "thematics"], ["matColumnDef", "name"], ["class", "thematics-header", 4, "matHeaderCellDef"], ["matColumnDef", "select"], ["class", "checks-header", 4, "matHeaderCellDef"], [4, "matHeaderRowDef"], [4, "matRowDef", "matRowDefColumns"], [3, "dataSource", "treeControl"], ["matTreeNodeToggle", "", 4, "matTreeNodeDef"], [4, "matTreeNodeDef", "matTreeNodeDefWhen"], [1, "thematics-header"], [1, "checks-header"], [3, "checked", "indeterminate", "change"], ["matTreeNodeToggle", ""], [1, "mat-tree-node"], ["mat-icon-button", "", "disabled", ""], [1, "tree-check", 3, "checked", "click", "change"], ["mat-icon-button", "", 3, "click"], [3, "svgIcon"], [1, "tree-check-2", 3, "checked", "indeterminate", "change"], [1, "tree-ul"], ["matTreeNodeOutlet", ""], ["mat-raised-button", "", 1, "clear-search-button", 3, "disabled", "click"], ["mat-raised-button", "", 1, "clear-form-button", 3, "disabled", "click"]], template: function SpatialFilterItemComponent_Template(rf, ctx) {
+    SpatialFilterItemComponent.ɵcmp = /*@__PURE__*/ i0__namespace.ɵɵdefineComponent({ type: SpatialFilterItemComponent, selectors: [["igo-spatial-filter-item"]], inputs: { map: "map", type: "type", queryType: "queryType", zone: "zone", loading: "loading", store: "store", layers: "layers", allLayers: "allLayers", thematicLength: "thematicLength" }, outputs: { toggleSearch: "toggleSearch", itemTypeChange: "itemTypeChange", thematicChange: "thematicChange", drawZoneEvent: "drawZoneEvent", bufferEvent: "bufferEvent", zoneWithBufferChange: "zoneWithBufferChange", measureUnitChange: "measureUnitChange", radiusEvent: "radiusEvent", freehandControl: "freehandControl", clearButtonEvent: "clearButtonEvent", clearSearchEvent: "clearSearchEvent", export: "export", openWorkspace: "openWorkspace", entityChange: "entityChange" }, decls: 29, vars: 42, consts: [[3, "formControl", "map", "geometryType", "drawGuide", "measure", "drawControlIsActive", "freehandDrawIsActive", "drawStyle", "overlayStyle", "radius"], [1, "header"], [3, "checked", "labelPosition", "change", 4, "ngIf"], ["class", "buffer-unit", 4, "ngIf"], ["class", "radius-unit", 4, "ngIf"], [1, "title", "mat-typography"], [3, "value"], [3, "value", "change", 4, "ngFor", "ngForOf"], ["class", "thematics", 4, "ngIf"], [1, "buttons"], ["mat-raised-button", "", "class", "clear-search-button", 3, "disabled", "click", 4, "ngIf"], ["mat-raised-button", "", "class", "clear-form-button", 3, "disabled", "click", 4, "ngIf"], ["mat-raised-button", "", "color", "primary", 1, "search-button", 3, "disabled", "click"], ["mat-raised-button", "", 1, "remove-button", 3, "disabled", "click"], ["mat-raised-button", "", 1, "export-button", 3, "disabled", "click"], ["class", "chevron-down", "mat-icon-button", "", "matTooltipShowDelay", "500", 3, "matTooltip", "click", 4, "ngIf"], ["class", "results", 4, "ngIf"], [3, "checked", "labelPosition", "change"], [1, "buffer-unit"], [1, "buffer-form"], [1, "buffer"], ["type", "number", "matInput", "", 3, "placeholder", "formControl", "value", "readonly"], [1, "unit-field"], [3, "value", "selectionChange"], [3, "value", 4, "ngFor", "ngForOf"], [1, "radius-unit"], [1, "radius-form"], [1, "radius"], ["type", "number", "matInput", "", 3, "placeholder", "formControl", "value", "readonly", "input"], [3, "value", "change"], [1, "thematics"], ["matColumnDef", "name"], ["class", "thematics-header", 4, "matHeaderCellDef"], ["matColumnDef", "select"], ["class", "checks-header", 4, "matHeaderCellDef"], [4, "matHeaderRowDef"], [4, "matRowDef", "matRowDefColumns"], [3, "dataSource", "treeControl"], ["matTreeNodeToggle", "", 4, "matTreeNodeDef"], [4, "matTreeNodeDef", "matTreeNodeDefWhen"], [1, "thematics-header"], [1, "checks-header"], [3, "checked", "indeterminate", "change"], ["matTreeNodeToggle", ""], [1, "mat-tree-node"], ["mat-icon-button", "", "disabled", ""], [1, "tree-check", 3, "checked", "click", "change"], ["mat-icon-button", "", 3, "click"], [3, "svgIcon"], [1, "tree-check-2", 3, "checked", "indeterminate", "change"], [1, "tree-ul"], ["matTreeNodeOutlet", ""], ["mat-raised-button", "", 1, "clear-search-button", 3, "disabled", "click"], ["mat-raised-button", "", 1, "clear-form-button", 3, "disabled", "click"], ["mat-icon-button", "", "matTooltipShowDelay", "500", 1, "chevron-down", 3, "matTooltip", "click"], ["svgIcon", "chevron-down"], [1, "results"], ["mat-icon-button", "", "matTooltipShowDelay", "500", 3, "matTooltip", "click", 4, "ngIf"], [1, "results-list", 3, "template", "store", "entitySelectChange"], ["mat-icon-button", "", "matTooltipShowDelay", "500", 3, "matTooltip", "click"], ["svgIcon", "chevron-up"]], template: function SpatialFilterItemComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelement(0, "igo-geometry-form-field-input", 0);
                 i0__namespace.ɵɵpipe(1, "async");
@@ -29150,9 +29416,11 @@
                 i0__namespace.ɵɵpipe(26, "translate");
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵtemplate(27, SpatialFilterItemComponent_button_27_Template, 3, 3, "button", 15);
+                i0__namespace.ɵɵtemplate(28, SpatialFilterItemComponent_div_28_Template, 3, 3, "div", 16);
             }
             if (rf & 2) {
-                i0__namespace.ɵɵproperty("formControl", ctx.formControl)("map", ctx.map)("geometryType", ctx.geometryType)("drawGuide", i0__namespace.ɵɵpipeBind1(1, 26, ctx.drawGuide$))("measure", ctx.measure)("drawControlIsActive", ctx.drawControlIsActive)("freehandDrawIsActive", ctx.freehandDrawIsActive)("drawStyle", i0__namespace.ɵɵpipeBind1(2, 28, ctx.drawStyle$))("overlayStyle", i0__namespace.ɵɵpipeBind1(3, 30, ctx.overlayStyle$))("radius", ctx.radius);
+                i0__namespace.ɵɵproperty("formControl", ctx.formControl)("map", ctx.map)("geometryType", ctx.geometryType)("drawGuide", i0__namespace.ɵɵpipeBind1(1, 28, ctx.drawGuide$))("measure", ctx.measure)("drawControlIsActive", ctx.drawControlIsActive)("freehandDrawIsActive", ctx.freehandDrawIsActive)("drawStyle", i0__namespace.ɵɵpipeBind1(2, 30, ctx.drawStyle$))("overlayStyle", i0__namespace.ɵɵpipeBind1(3, 32, ctx.overlayStyle$))("radius", ctx.radius);
                 i0__namespace.ɵɵadvance(5);
                 i0__namespace.ɵɵproperty("ngIf", !ctx.isPredefined());
                 i0__namespace.ɵɵadvance(1);
@@ -29162,13 +29430,13 @@
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("ngIf", ctx.isPoint());
                 i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵtextInterpolate1("", i0__namespace.ɵɵpipeBind1(11, 32, "igo.geo.spatialFilter.search"), " : ");
+                i0__namespace.ɵɵtextInterpolate1("", i0__namespace.ɵɵpipeBind1(11, 34, "igo.geo.spatialFilter.search"), " : ");
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("value", ctx.selectedItemType);
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("ngForOf", ctx.itemType);
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("ngIf", ctx.selectedItemType === "Thematics");
+                i0__namespace.ɵɵproperty("ngIf", ctx.selectedItemType === "Thematics" && !ctx.tableTemplate || ctx.selectedItemType === "Thematics" && ctx.tableTemplate && !ctx.listIsVisible);
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("ngIf", ctx.isPredefined());
                 i0__namespace.ɵɵadvance(1);
@@ -29176,17 +29444,21 @@
                 i0__namespace.ɵɵadvance(1);
                 i0__namespace.ɵɵproperty("disabled", ctx.disableSearchButton());
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(20, 34, "igo.geo.spatialFilter.goSearch"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(20, 36, "igo.geo.spatialFilter.goSearch"), " ");
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("disabled", ctx.allLayers.length === 0);
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(23, 36, "igo.geo.spatialFilter.removeLayer"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(23, 38, "igo.geo.spatialFilter.removeLayer"), " ");
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("disabled", !ctx.store.entities$.getValue().length);
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(26, 38, "igo.geo.spatialFilter.exportLayer"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(26, 40, "igo.geo.spatialFilter.exportLayer"), " ");
+                i0__namespace.ɵɵadvance(2);
+                i0__namespace.ɵɵproperty("ngIf", ctx.store.all().length && ctx.tableTemplate && !ctx.listIsVisible);
+                i0__namespace.ɵɵadvance(1);
+                i0__namespace.ɵɵproperty("ngIf", ctx.store.all().length && ctx.tableTemplate && ctx.listIsVisible);
             }
-        }, styles: [".header[_ngcontent-%COMP%]{margin-top:5px;width:100%}.mat-slide-toggle[_ngcontent-%COMP%]{padding:5px;margin-bottom:15px;width:98%}.mat-slide-toggle[_ngcontent-%COMP%]     .mat-slide-toggle-content{width:calc(100% - 20px)}.title[_ngcontent-%COMP%]{margin-left:5px;font-size:medium;font-size:initial}.mat-radio-group[_ngcontent-%COMP%]{display:flex;flex-direction:column;padding-top:10px}.mat-radio-button[_ngcontent-%COMP%]{display:inline-flex;position:relative;margin-left:16px;margin-top:10px}.mat-form-field[_ngcontent-%COMP%]{margin-top:5px}.mat-column-select[_ngcontent-%COMP%]{overflow:auto}.buttons[_ngcontent-%COMP%]{margin-top:15px}.search-button[_ngcontent-%COMP%]{left:15px;width:165px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.search-button[_ngcontent-%COMP%]{left:10px;width:45%;min-height:35px;white-space:normal;line-height:normal}}.export-button[_ngcontent-%COMP%]{left:15px;width:165px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.export-button[_ngcontent-%COMP%]{left:10px;margin-top:10px;width:45%;min-height:35px;white-space:normal;line-height:normal}}.remove-button[_ngcontent-%COMP%]{margin-top:12px;left:5px;width:165px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.remove-button[_ngcontent-%COMP%]{margin:0;width:45%;min-height:35px;white-space:normal;line-height:normal}}.clear-form-button[_ngcontent-%COMP%]{left:5px;width:165px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.clear-form-button[_ngcontent-%COMP%]{width:45%;min-height:35px;white-space:normal;line-height:normal}}.clear-search-button[_ngcontent-%COMP%]{left:5px;width:165px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.clear-search-button[_ngcontent-%COMP%]{width:45%;min-height:35px;white-space:normal;line-height:normal}}.thematics[_ngcontent-%COMP%]{max-height:35%;overflow:auto;margin-top:5px;width:98%}.results[_ngcontent-%COMP%]{overflow:auto;max-height:250px;width:98%}.mat-column-typeResults[_ngcontent-%COMP%]{max-width:100px;margin-right:5px}.buffer-unit[_ngcontent-%COMP%], .radius-unit[_ngcontent-%COMP%]{display:flex;width:100%;margin-left:2px;padding:5px}.radius[_ngcontent-%COMP%], .buffer[_ngcontent-%COMP%]{display:flex;flex-flow:column nowrap;width:110%}.unit-field[_ngcontent-%COMP%]{width:110px;margin-left:30px}.example-tree-invisible[_ngcontent-%COMP%]{display:none}.tree-ul[_ngcontent-%COMP%]{margin:0;padding:0 0 0 20px;list-style-type:none}.tree-check[_ngcontent-%COMP%], .tree-check-2[_ngcontent-%COMP%]{position:relative;margin-left:auto;margin-right:5px}.thematics-header[_ngcontent-%COMP%]{max-width:250px}.checks-header[_ngcontent-%COMP%]{padding:none;max-width:calc(100% - 316px);overflow:hidden}.mat-checkbox[_ngcontent-%COMP%]{padding:5px}.mat-tree-node[_ngcontent-%COMP%]{position:relative;min-height:42px;width:280px}.mat-header-cell[_ngcontent-%COMP%]{height:56px}"], changeDetection: 0 });
+        }, styles: [".header[_ngcontent-%COMP%]{margin-top:5px;width:100%}.mat-slide-toggle[_ngcontent-%COMP%]{padding:5px;margin-bottom:15px;width:98%}.mat-slide-toggle[_ngcontent-%COMP%]     .mat-slide-toggle-content{width:calc(100% - 20px)}.title[_ngcontent-%COMP%]{margin-left:5px;font-size:medium;font-size:initial}.mat-radio-group[_ngcontent-%COMP%]{display:flex;flex-direction:column;padding-top:10px}.mat-radio-button[_ngcontent-%COMP%]{display:inline-flex;position:relative;margin-left:16px;margin-top:10px}.mat-form-field[_ngcontent-%COMP%]{margin-top:5px}.mat-column-select[_ngcontent-%COMP%]{overflow:auto}.buttons[_ngcontent-%COMP%]{margin-top:15px}.search-button[_ngcontent-%COMP%]{left:15px;width:46%}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.search-button[_ngcontent-%COMP%]{left:10px;width:45%;min-height:35px;white-space:normal;line-height:normal}}.export-button[_ngcontent-%COMP%]{left:15px;width:46%;margin-bottom:5px}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.export-button[_ngcontent-%COMP%]{left:10px;margin-top:10px;width:45%;min-height:35px;white-space:normal;line-height:normal}}.remove-button[_ngcontent-%COMP%]{margin-top:12px;left:5px;width:46%}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.remove-button[_ngcontent-%COMP%]{margin:0;width:45%;min-height:35px;white-space:normal;line-height:normal}}.clear-form-button[_ngcontent-%COMP%]{left:5px;width:46%}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.clear-form-button[_ngcontent-%COMP%]{width:45%;min-height:35px;white-space:normal;line-height:normal}}.clear-search-button[_ngcontent-%COMP%]{left:5px;width:46%}@media only screen and (orientation:portrait) and (max-width: 599px),only screen and (orientation:landscape) and (max-width: 959px){.clear-search-button[_ngcontent-%COMP%]{width:45%;min-height:35px;white-space:normal;line-height:normal}}.thematics[_ngcontent-%COMP%]{max-height:35%;overflow:auto;margin-top:5px;width:98%}.results[_ngcontent-%COMP%]{overflow:auto;max-height:250px;width:98%}.mat-column-typeResults[_ngcontent-%COMP%]{max-width:100px;margin-right:5px}.buffer-unit[_ngcontent-%COMP%], .radius-unit[_ngcontent-%COMP%]{display:flex;width:100%;margin-left:2px;padding:5px}.radius[_ngcontent-%COMP%], .buffer[_ngcontent-%COMP%]{display:flex;flex-flow:column nowrap;width:110%}.unit-field[_ngcontent-%COMP%]{width:110px;margin-left:30px}.example-tree-invisible[_ngcontent-%COMP%]{display:none}.tree-ul[_ngcontent-%COMP%]{margin:0;padding:0 0 0 20px;list-style-type:none}.tree-check[_ngcontent-%COMP%], .tree-check-2[_ngcontent-%COMP%]{position:relative;margin-left:auto;margin-right:5px}.thematics-header[_ngcontent-%COMP%]{max-width:250px}.checks-header[_ngcontent-%COMP%]{padding:none;max-width:calc(100% - 316px);overflow:hidden}.mat-checkbox[_ngcontent-%COMP%]{padding:5px}.mat-tree-node[_ngcontent-%COMP%]{position:relative;min-height:42px;width:280px}.mat-header-cell[_ngcontent-%COMP%]{height:56px}.results[_ngcontent-%COMP%]{max-height:45%;width:98%}.results[_ngcontent-%COMP%]   igo-entity-table[_ngcontent-%COMP%]     div.table-container{overflow:unset}"], changeDetection: 0 });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(SpatialFilterItemComponent, [{
                 type: i0.Component,
@@ -29240,6 +29512,8 @@
                     type: i0.Output
                 }], openWorkspace: [{
                     type: i0.Output
+                }], entityChange: [{
+                    type: i0.Output
                 }] });
     })();
 
@@ -30340,6 +30614,7 @@
                 IgoLayerModule,
                 i6$1.IgoCollapsibleModule,
                 i6$1.IgoListModule,
+                i6$1.IgoEntityModule,
                 i6$1.IgoKeyValueModule,
                 IgoGeometryModule,
                 i9$1.MatBadgeModule
@@ -30378,6 +30653,7 @@
                             IgoLayerModule,
                             i6$1.IgoCollapsibleModule,
                             i6$1.IgoListModule,
+                            i6$1.IgoEntityModule,
                             i6$1.IgoKeyValueModule,
                             IgoGeometryModule,
                             i9$1.MatBadgeModule
@@ -30473,6 +30749,7 @@
                 IgoLayerModule,
                 i6$1.IgoCollapsibleModule,
                 i6$1.IgoListModule,
+                i6$1.IgoEntityModule,
                 i6$1.IgoKeyValueModule,
                 IgoGeometryModule,
                 i9$1.MatBadgeModule], exports: [FilterableDataSourcePipe,
@@ -30504,7 +30781,7 @@
     i0__namespace.ɵɵsetComponentScope(OgcFilterableItemComponent, [i1__namespace$3.MatListItem, i1__namespace$1.NgIf, i4__namespace.MatIcon, i1__namespace$3.MatListAvatarCssMatStyler, i6__namespace$1.CollapseDirective, i9__namespace.MatLine, i1__namespace$1.NgStyle, i3__namespace.MatTooltip, i2__namespace.MatButton, i1__namespace$1.NgClass, LayerLegendComponent, OgcFilterableFormComponent, i10__namespace.MatDivider, i11__namespace.MatCheckbox, i16__namespace.NgControlStatus, i16__namespace.NgModel], [i7__namespace.TranslatePipe, i1__namespace$1.AsyncPipe]);
     i0__namespace.ɵɵsetComponentScope(OgcFilterableListComponent, [i6__namespace$1.ListComponent, i1__namespace$1.NgForOf, OgcFilterableItemComponent, i6__namespace$1.ListItemDirective], [FilterableDataSourcePipe]);
     i0__namespace.ɵɵsetComponentScope(SpatialFilterTypeComponent, [i20__namespace.MatTabGroup, i20__namespace.MatTab, i12__namespace.MatFormField, i12__namespace.MatLabel, i13__namespace.MatSelect, i1__namespace$1.NgForOf, i9__namespace.MatOption, SpatialFilterListComponent, i18__namespace.MatButtonToggleGroup, i18__namespace.MatButtonToggle, i3__namespace.MatTooltip, i4__namespace.MatIcon], [i7__namespace.TranslatePipe]);
-    i0__namespace.ɵɵsetComponentScope(SpatialFilterItemComponent, [GeometryFormFieldInputComponent, i16__namespace.NgControlStatus, i16__namespace.FormControlDirective, i1__namespace$1.NgIf, i22__namespace.MatSlideToggle, i16__namespace.ɵNgNoValidate, i16__namespace.NgControlStatusGroup, i16__namespace.NgForm, i12__namespace.MatFormField, i16__namespace.NumberValueAccessor, i5__namespace.MatInput, i16__namespace.DefaultValueAccessor, i13__namespace.MatSelect, i1__namespace$1.NgForOf, i9__namespace.MatOption, i12__namespace.MatLabel, i19__namespace.MatRadioGroup, i19__namespace.MatRadioButton, i23__namespace.MatTable, i23__namespace.MatColumnDef, i23__namespace.MatHeaderCellDef, i23__namespace.MatHeaderCell, i11__namespace.MatCheckbox, i23__namespace.MatHeaderRowDef, i23__namespace.MatHeaderRow, i23__namespace.MatRowDef, i23__namespace.MatRow, i24__namespace.MatTree, i24__namespace.MatTreeNodeDef, i24__namespace.MatTreeNode, i24__namespace.MatTreeNodeToggle, i2__namespace.MatButton, i24__namespace.MatNestedTreeNode, i4__namespace.MatIcon, i24__namespace.MatTreeNodeOutlet], [i1__namespace$1.AsyncPipe, i7__namespace.TranslatePipe]);
+    i0__namespace.ɵɵsetComponentScope(SpatialFilterItemComponent, [GeometryFormFieldInputComponent, i16__namespace.NgControlStatus, i16__namespace.FormControlDirective, i1__namespace$1.NgIf, i22__namespace.MatSlideToggle, i16__namespace.ɵNgNoValidate, i16__namespace.NgControlStatusGroup, i16__namespace.NgForm, i12__namespace.MatFormField, i16__namespace.NumberValueAccessor, i5__namespace.MatInput, i16__namespace.DefaultValueAccessor, i13__namespace.MatSelect, i1__namespace$1.NgForOf, i9__namespace.MatOption, i12__namespace.MatLabel, i19__namespace.MatRadioGroup, i19__namespace.MatRadioButton, i23__namespace.MatTable, i23__namespace.MatColumnDef, i23__namespace.MatHeaderCellDef, i23__namespace.MatHeaderCell, i11__namespace.MatCheckbox, i23__namespace.MatHeaderRowDef, i23__namespace.MatHeaderRow, i23__namespace.MatRowDef, i23__namespace.MatRow, i24__namespace.MatTree, i24__namespace.MatTreeNodeDef, i24__namespace.MatTreeNode, i24__namespace.MatTreeNodeToggle, i2__namespace.MatButton, i24__namespace.MatNestedTreeNode, i4__namespace.MatIcon, i24__namespace.MatTreeNodeOutlet, i3__namespace.MatTooltip, i6__namespace$1.EntityTableComponent], [i1__namespace$1.AsyncPipe, i7__namespace.TranslatePipe]);
     i0__namespace.ɵɵsetComponentScope(OgcFilterTimeComponent, [i1__namespace$1.NgIf, i22__namespace.MatSlideToggle, i16__namespace.NgControlStatus, i16__namespace.NgModel, OgcFilterTimeSliderComponent, i12__namespace.MatFormField, i12__namespace.MatLabel, i5__namespace.MatInput, i25__namespace.MatDatepickerToggle, i12__namespace.MatSuffix, i25__namespace.MatDatepicker, i25__namespace.MatDatepickerInput, i13__namespace.MatSelect, i16__namespace.FormControlDirective, i1__namespace$1.NgForOf, i9__namespace.MatOption], [i7__namespace.TranslatePipe]);
 
     function ExportButtonComponent_button_0_Template(rf, ctx) {
@@ -30700,7 +30977,7 @@
                     acc[key] = olFeature.get(key);
                     return acc;
                 }, { geometry: olFeature.getGeometry() });
-                return new olFeature__default["default"](properties);
+                return new OlFeature__default["default"](properties);
             });
         };
         ExportService.prototype.generateAggregatedFeature = function (olFeatures) {
@@ -30717,7 +30994,7 @@
                 }, {
                     geometry: olFeature.getGeometry()
                 });
-                var newFeature = new olFeature__default["default"](properties);
+                var newFeature = new OlFeature__default["default"](properties);
                 newFeature.set('name', olFeature.getId());
                 newFeature.set('cmt', comment);
                 return newFeature;
@@ -31508,7 +31785,7 @@
     }
     function ImportExportComponent_form_12_span_9_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "span", 27);
+            i0__namespace.ɵɵelementStart(0, "span", 29);
             i0__namespace.ɵɵtext(1);
             i0__namespace.ɵɵpipe(2, "translate");
             i0__namespace.ɵɵelementEnd();
@@ -31521,9 +31798,9 @@
     }
     function ImportExportComponent_form_12_mat_option_10_mat_slide_toggle_4_Template(rf, ctx) {
         if (rf & 1) {
-            var _r28_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementStart(0, "mat-slide-toggle", 30);
-            i0__namespace.ɵɵlistener("click", function ImportExportComponent_form_12_mat_option_10_mat_slide_toggle_4_Template_mat_slide_toggle_click_0_listener($event) { i0__namespace.ɵɵrestoreView(_r28_1); var layer_r24 = i0__namespace.ɵɵnextContext().$implicit; var ctx_r26 = i0__namespace.ɵɵnextContext(2); return ctx_r26.onlySelectedClick($event, layer_r24.id); })("checked", function ImportExportComponent_form_12_mat_option_10_mat_slide_toggle_4_Template_mat_slide_toggle_checked_0_listener() { i0__namespace.ɵɵrestoreView(_r28_1); var layer_r24 = i0__namespace.ɵɵnextContext().$implicit; var ctx_r29 = i0__namespace.ɵɵnextContext(2); return ctx_r29.inLayersIdToExportSelectionOnly(layer_r24); })("change", function ImportExportComponent_form_12_mat_option_10_mat_slide_toggle_4_Template_mat_slide_toggle_change_0_listener($event) { i0__namespace.ɵɵrestoreView(_r28_1); var layer_r24 = i0__namespace.ɵɵnextContext().$implicit; var ctx_r31 = i0__namespace.ɵɵnextContext(2); return ctx_r31.onlySelected($event, layer_r24.id); });
+            var _r30_1 = i0__namespace.ɵɵgetCurrentView();
+            i0__namespace.ɵɵelementStart(0, "mat-slide-toggle", 32);
+            i0__namespace.ɵɵlistener("click", function ImportExportComponent_form_12_mat_option_10_mat_slide_toggle_4_Template_mat_slide_toggle_click_0_listener($event) { i0__namespace.ɵɵrestoreView(_r30_1); var layer_r26 = i0__namespace.ɵɵnextContext().$implicit; var ctx_r28 = i0__namespace.ɵɵnextContext(2); return ctx_r28.onlySelectedClick($event, layer_r26.id); })("checked", function ImportExportComponent_form_12_mat_option_10_mat_slide_toggle_4_Template_mat_slide_toggle_checked_0_listener() { i0__namespace.ɵɵrestoreView(_r30_1); var layer_r26 = i0__namespace.ɵɵnextContext().$implicit; var ctx_r31 = i0__namespace.ɵɵnextContext(2); return ctx_r31.inLayersIdToExportSelectionOnly(layer_r26); })("change", function ImportExportComponent_form_12_mat_option_10_mat_slide_toggle_4_Template_mat_slide_toggle_change_0_listener($event) { i0__namespace.ɵɵrestoreView(_r30_1); var layer_r26 = i0__namespace.ɵɵnextContext().$implicit; var ctx_r33 = i0__namespace.ɵɵnextContext(2); return ctx_r33.onlySelected($event, layer_r26.id); });
             i0__namespace.ɵɵelementStart(1, "small");
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵpipe(3, "translate");
@@ -31539,24 +31816,24 @@
     var _c1$3 = function (a0) { return { "igo-export-layer-mat-option": a0 }; };
     function ImportExportComponent_form_12_mat_option_10_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "mat-option", 28);
+            i0__namespace.ɵɵelementStart(0, "mat-option", 30);
             i0__namespace.ɵɵlistener("click", function ImportExportComponent_form_12_mat_option_10_Template_mat_option_click_0_listener($event) { return $event.stopPropagation(); });
             i0__namespace.ɵɵelementStart(1, "p", 16);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(3, "p", 16);
-            i0__namespace.ɵɵtemplate(4, ImportExportComponent_form_12_mat_option_10_mat_slide_toggle_4_Template, 4, 4, "mat-slide-toggle", 29);
+            i0__namespace.ɵɵtemplate(4, ImportExportComponent_form_12_mat_option_10_mat_slide_toggle_4_Template, 4, 4, "mat-slide-toggle", 31);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var layer_r24 = ctx.$implicit;
+            var layer_r26 = ctx.$implicit;
             var ctx_r18 = i0__namespace.ɵɵnextContext(2);
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(4, _c1$3, ctx_r18.layerHasSelectedFeatures(layer_r24)))("value", layer_r24.id);
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(4, _c1$3, ctx_r18.layerHasSelectedFeatures(layer_r26)))("value", layer_r26.id);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate(layer_r24.title);
+            i0__namespace.ɵɵtextInterpolate(layer_r26.title);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r18.layerHasSelectedFeatures(layer_r24));
+            i0__namespace.ɵɵproperty("ngIf", ctx_r18.layerHasSelectedFeatures(layer_r26));
         }
     }
     function ImportExportComponent_form_12_ng_container_18_mat_option_1_Template(rf, ctx) {
@@ -31567,16 +31844,16 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var format_r35 = ctx.$implicit;
-            i0__namespace.ɵɵproperty("value", format_r35.key);
+            var format_r37 = ctx.$implicit;
+            i0__namespace.ɵɵproperty("value", format_r37.key);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 2, "igo.geo.export.format." + format_r35.value), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 2, "igo.geo.export.format." + format_r37.value), " ");
         }
     }
     function ImportExportComponent_form_12_ng_container_18_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵtemplate(1, ImportExportComponent_form_12_ng_container_18_mat_option_1_Template, 3, 4, "mat-option", 31);
+            i0__namespace.ɵɵtemplate(1, ImportExportComponent_form_12_ng_container_18_mat_option_1_Template, 3, 4, "mat-option", 33);
             i0__namespace.ɵɵpipe(2, "keyvalue");
             i0__namespace.ɵɵpipe(3, "async");
             i0__namespace.ɵɵelementContainerEnd();
@@ -31589,7 +31866,7 @@
     }
     function ImportExportComponent_form_12_mat_option_20_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "mat-option", 32);
+            i0__namespace.ɵɵelementStart(0, "mat-option", 34);
             i0__namespace.ɵɵtext(1);
             i0__namespace.ɵɵpipe(2, "translate");
             i0__namespace.ɵɵelementEnd();
@@ -31603,7 +31880,7 @@
         if (rf & 1) {
             i0__namespace.ɵɵelementStart(0, "div", 6);
             i0__namespace.ɵɵelementStart(1, "mat-form-field");
-            i0__namespace.ɵɵelement(2, "input", 33);
+            i0__namespace.ɵɵelement(2, "input", 35);
             i0__namespace.ɵɵpipe(3, "translate");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
@@ -31621,24 +31898,24 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var encoding_r38 = ctx.$implicit;
-            i0__namespace.ɵɵproperty("value", encoding_r38.key);
+            var encoding_r40 = ctx.$implicit;
+            i0__namespace.ɵɵproperty("value", encoding_r40.key);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 2, "igo.geo.export.encoding." + encoding_r38.value), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 2, "igo.geo.export.encoding." + encoding_r40.value), " ");
         }
     }
     function ImportExportComponent_form_12_div_23_ng_container_6_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵtemplate(1, ImportExportComponent_form_12_div_23_ng_container_6_mat_option_1_Template, 3, 4, "mat-option", 31);
+            i0__namespace.ɵɵtemplate(1, ImportExportComponent_form_12_div_23_ng_container_6_mat_option_1_Template, 3, 4, "mat-option", 33);
             i0__namespace.ɵɵpipe(2, "keyvalue");
             i0__namespace.ɵɵpipe(3, "async");
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
-            var ctx_r36 = i0__namespace.ɵɵnextContext(3);
+            var ctx_r38 = i0__namespace.ɵɵnextContext(3);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngForOf", i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind1(3, 3, ctx_r36.encodings$)));
+            i0__namespace.ɵɵproperty("ngForOf", i0__namespace.ɵɵpipeBind1(2, 1, i0__namespace.ɵɵpipeBind1(3, 3, ctx_r38.encodings$)));
         }
     }
     function ImportExportComponent_form_12_div_23_Template(rf, ctx) {
@@ -31649,7 +31926,7 @@
             i0__namespace.ɵɵtext(3);
             i0__namespace.ɵɵpipe(4, "translate");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(5, "mat-select", 34);
+            i0__namespace.ɵɵelementStart(5, "mat-select", 36);
             i0__namespace.ɵɵtemplate(6, ImportExportComponent_form_12_div_23_ng_container_6_Template, 4, 5, "ng-container", 22);
             i0__namespace.ɵɵpipe(7, "async");
             i0__namespace.ɵɵelementEnd();
@@ -31666,8 +31943,40 @@
     }
     function ImportExportComponent_form_12_div_24_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "div", 35);
-            i0__namespace.ɵɵelementStart(1, "mat-slide-toggle", 36);
+            i0__namespace.ɵɵelementStart(0, "div", 37);
+            i0__namespace.ɵɵelementStart(1, "mat-slide-toggle", 38);
+            i0__namespace.ɵɵtext(2);
+            i0__namespace.ɵɵpipe(3, "translate");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+        }
+        if (rf & 2) {
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵproperty("labelPosition", "before");
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(3, 2, "igo.geo.importExportForm.exportCombineResults"), " ");
+        }
+    }
+    function ImportExportComponent_form_12_div_25_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementStart(0, "div", 39);
+            i0__namespace.ɵɵelementStart(1, "mat-slide-toggle", 40);
+            i0__namespace.ɵɵtext(2);
+            i0__namespace.ɵɵpipe(3, "translate");
+            i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementEnd();
+        }
+        if (rf & 2) {
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵproperty("labelPosition", "before");
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(3, 2, "igo.geo.importExportForm.exportSeparator"), " ");
+        }
+    }
+    function ImportExportComponent_form_12_div_26_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementStart(0, "div", 41);
+            i0__namespace.ɵɵelementStart(1, "mat-slide-toggle", 42);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵpipe(3, "translate");
             i0__namespace.ɵɵelementEnd();
@@ -31682,7 +31991,7 @@
     }
     function ImportExportComponent_form_12_Template(rf, ctx) {
         if (rf & 1) {
-            var _r40_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r42_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementStart(0, "form", 5);
             i0__namespace.ɵɵelementStart(1, "div", 6);
             i0__namespace.ɵɵelementStart(2, "mat-form-field");
@@ -31691,7 +32000,7 @@
             i0__namespace.ɵɵpipe(5, "translate");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(6, "mat-select", 18);
-            i0__namespace.ɵɵlistener("valueChange", function ImportExportComponent_form_12_Template_mat_select_valueChange_6_listener($event) { i0__namespace.ɵɵrestoreView(_r40_1); var ctx_r39 = i0__namespace.ɵɵnextContext(); return ctx_r39.layers = $event; });
+            i0__namespace.ɵɵlistener("valueChange", function ImportExportComponent_form_12_Template_mat_select_valueChange_6_listener($event) { i0__namespace.ɵɵrestoreView(_r42_1); var ctx_r41 = i0__namespace.ɵɵnextContext(); return ctx_r41.layers = $event; });
             i0__namespace.ɵɵelementStart(7, "mat-select-trigger");
             i0__namespace.ɵɵtext(8);
             i0__namespace.ɵɵtemplate(9, ImportExportComponent_form_12_span_9_Template, 3, 4, "span", 19);
@@ -31718,17 +32027,19 @@
             i0__namespace.ɵɵtemplate(22, ImportExportComponent_form_12_div_22_Template, 4, 3, "div", 24);
             i0__namespace.ɵɵtemplate(23, ImportExportComponent_form_12_div_23_Template, 8, 6, "div", 24);
             i0__namespace.ɵɵtemplate(24, ImportExportComponent_form_12_div_24_Template, 4, 4, "div", 25);
-            i0__namespace.ɵɵelementStart(25, "div", 26);
-            i0__namespace.ɵɵelementStart(26, "button", 10);
-            i0__namespace.ɵɵlistener("click", function ImportExportComponent_form_12_Template_button_click_26_listener() { i0__namespace.ɵɵrestoreView(_r40_1); var ctx_r41 = i0__namespace.ɵɵnextContext(); return ctx_r41.handleExportFormSubmit(ctx_r41.form.value); });
-            i0__namespace.ɵɵpipe(27, "async");
-            i0__namespace.ɵɵtext(28);
-            i0__namespace.ɵɵpipe(29, "translate");
-            i0__namespace.ɵɵpipe(30, "translate");
+            i0__namespace.ɵɵtemplate(25, ImportExportComponent_form_12_div_25_Template, 4, 4, "div", 26);
+            i0__namespace.ɵɵtemplate(26, ImportExportComponent_form_12_div_26_Template, 4, 4, "div", 27);
+            i0__namespace.ɵɵelementStart(27, "div", 28);
+            i0__namespace.ɵɵelementStart(28, "button", 10);
+            i0__namespace.ɵɵlistener("click", function ImportExportComponent_form_12_Template_button_click_28_listener() { i0__namespace.ɵɵrestoreView(_r42_1); var ctx_r43 = i0__namespace.ɵɵnextContext(); return ctx_r43.handleExportFormSubmit(ctx_r43.form.value); });
+            i0__namespace.ɵɵpipe(29, "async");
+            i0__namespace.ɵɵtext(30);
             i0__namespace.ɵɵpipe(31, "translate");
+            i0__namespace.ɵɵpipe(32, "translate");
+            i0__namespace.ɵɵpipe(33, "translate");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelement(32, "igo-spinner", 11);
-            i0__namespace.ɵɵpipe(33, "async");
+            i0__namespace.ɵɵelement(34, "igo-spinner", 11);
+            i0__namespace.ɵɵpipe(35, "async");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
@@ -31736,7 +32047,7 @@
             var ctx_r3 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵproperty("formGroup", ctx_r3.form);
             i0__namespace.ɵɵadvance(4);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(5, 15, "igo.geo.importExportForm.exportLayerPlaceholder"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(5, 17, "igo.geo.importExportForm.exportLayerPlaceholder"));
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵproperty("value", ctx_r3.layers);
             i0__namespace.ɵɵadvance(2);
@@ -31744,25 +32055,29 @@
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("ngIf", ctx_r3.layers.length > 1);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngForOf", i0__namespace.ɵɵpipeBind1(11, 17, ctx_r3.exportableLayers$));
+            i0__namespace.ɵɵproperty("ngForOf", i0__namespace.ɵɵpipeBind1(11, 19, ctx_r3.exportableLayers$));
             i0__namespace.ɵɵadvance(5);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(16, 19, "igo.geo.importExportForm.exportFormatPlaceholder"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(16, 21, "igo.geo.importExportForm.exportFormatPlaceholder"));
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵproperty("ngIf", i0__namespace.ɵɵpipeBind1(19, 21, ctx_r3.formats$).length !== 0);
+            i0__namespace.ɵɵproperty("ngIf", i0__namespace.ɵɵpipeBind1(19, 23, ctx_r3.formats$).length !== 0);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("ngIf", i0__namespace.ɵɵpipeBind1(21, 23, ctx_r3.formats$).length === 0);
+            i0__namespace.ɵɵproperty("ngIf", i0__namespace.ɵɵpipeBind1(21, 25, ctx_r3.formats$).length === 0);
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵproperty("ngIf", ctx_r3.forceNaming && ctx_r3.form.value.format !== "URL");
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("ngIf", ctx_r3.form.value.format === "CSVcomma" || ctx_r3.form.value.format === "CSVsemicolon");
             i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵproperty("ngIf", ctx_r3.layers.length > 1 && (ctx_r3.form.value.format === "CSVcomma" || ctx_r3.form.value.format === "CSVsemicolon"));
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵproperty("ngIf", ctx_r3.layers.length > 1 && (ctx_r3.form.value.format === "CSVcomma" || ctx_r3.form.value.format === "CSVsemicolon") && ctx_r3.form.value.combineLayers);
+            i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("ngIf", ctx_r3.form.value.format !== "URL");
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("disabled", !ctx_r3.form.valid || i0__namespace.ɵɵpipeBind1(27, 25, ctx_r3.loading$));
+            i0__namespace.ɵɵproperty("disabled", !ctx_r3.form.valid || i0__namespace.ɵɵpipeBind1(29, 27, ctx_r3.loading$));
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate1(" ", ctx_r3.form.value.format !== "URL" ? i0__namespace.ɵɵpipeBind1(29, 27, "igo.geo.importExportForm.exportButton") : ctx_r3.form.value.layers.length > 1 ? i0__namespace.ɵɵpipeBind1(30, 29, "igo.geo.importExportForm.exportButtonLinks") : i0__namespace.ɵɵpipeBind1(31, 31, "igo.geo.importExportForm.exportButtonLink"), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", ctx_r3.form.value.format !== "URL" ? i0__namespace.ɵɵpipeBind1(31, 29, "igo.geo.importExportForm.exportButton") : ctx_r3.form.value.layers.length > 1 ? i0__namespace.ɵɵpipeBind1(32, 31, "igo.geo.importExportForm.exportButtonLinks") : i0__namespace.ɵɵpipeBind1(33, 33, "igo.geo.importExportForm.exportButtonLink"), " ");
             i0__namespace.ɵɵadvance(4);
-            i0__namespace.ɵɵproperty("shown", i0__namespace.ɵɵpipeBind1(33, 33, ctx_r3.loading$));
+            i0__namespace.ɵɵproperty("shown", i0__namespace.ɵɵpipeBind1(35, 35, ctx_r3.loading$));
         }
     }
     var ImportExportComponent = /** @class */ (function () {
@@ -32094,6 +32409,7 @@
             return this.popupAllowed;
         };
         ImportExportComponent.prototype.handleExportFormSubmit = function (data) {
+            var e_2, _b;
             var _this = this;
             this.loading$.next(true);
             var ogreFormats = Object.keys(ExportService.ogreFormats);
@@ -32101,11 +32417,20 @@
                 (ogreFormats.indexOf(data.format) >= 0 || data.format === ExportFormat.URL) && !this.popupAllowed) {
                 this.handlePopup();
             }
-            data.layers.forEach(function (layer) {
-                var lay = _this.map.getLayerById(layer);
-                var filename = lay.title;
-                if (data.name !== undefined) {
-                    filename = data.name;
+            var geomTypesCSV = [];
+            var featuresCSV = [];
+            var filename = "";
+            var _loop_2 = function (layerIndex, layer) {
+                var lay = this_2.map.getLayerById(layer);
+                if (!(data.format === ExportFormat.CSVsemicolon || data.format === ExportFormat.CSVcomma)
+                    || !data.combineLayers || data.layers.length === 1) {
+                    filename = lay.title;
+                    if (data.name) {
+                        filename = data.name;
+                    }
+                }
+                else {
+                    filename = this_2.languageService.translate.instant('igo.geo.export.combinedLayers');
                 }
                 var dSOptions = lay.dataSource.options;
                 if (data.format === ExportFormat.URL && dSOptions.download && (dSOptions.download.url || dSOptions.download.dynamicUrl)) {
@@ -32115,10 +32440,10 @@
                         url.match(/service=wfs/gi) ? _this.downloadService.open(lay) : window.open(url, '_blank');
                         _this.loading$.next(false);
                     }, 500);
-                    return;
+                    return { value: void 0 };
                 }
-                var wks = _this.getWorkspaceByLayerId(layer);
-                var olFeatures;
+                var wks = this_2.getWorkspaceByLayerId(layer);
+                var olFeatures = void 0;
                 if (wks && wks.entityStore && wks.entityStore.stateView.all().length) {
                     if (data.layersWithSelection.indexOf(layer) !== -1 && data.featureInMapExtent) {
                         // Only export selected feature && into map extent
@@ -32152,7 +32477,7 @@
                         olFeatures = olFeatures.flatMap(function (cluster) { return cluster.get('features'); });
                     }
                 }
-                var translate = _this.languageService.translate;
+                var translate = this_2.languageService.translate;
                 var geomTypes = [];
                 if (data.format === ExportFormat.Shapefile || data.format === ExportFormat.GPX) {
                     olFeatures.forEach(function (olFeature) {
@@ -32187,31 +32512,113 @@
                     if (gpxFeatureCnt > gpxFeatureCntPointOrPoly) {
                         var title = translate.instant('igo.geo.export.gpx.error.poly.title');
                         var message = translate.instant('igo.geo.export.gpx.error.poly.text');
-                        _this.messageService.error(message, title, { timeOut: 20000 });
+                        this_2.messageService.error(message, title, { timeOut: 20000 });
+                    }
+                }
+                else if ((data.format === ExportFormat.CSVsemicolon || data.format === ExportFormat.CSVcomma) && data.combineLayers) {
+                    geomTypes.forEach(function (geomType) { return geomTypesCSV.push(geomType); });
+                    if (layerIndex !== data.layers.length - 1) {
+                        return "continue";
+                    }
+                    else {
+                        var previousFeature_1 = undefined;
+                        geomTypesCSV.forEach(function (geomType) {
+                            geomType.features.forEach(function (currentFeature) {
+                                if (data.separator) {
+                                    if (previousFeature_1) {
+                                        if (currentFeature.get('_featureStore').layer.options.title !==
+                                            previousFeature_1.get('_featureStore').layer.options.title) {
+                                            var titleEmptyRows = _this.createTitleEmptyRows(previousFeature_1, currentFeature);
+                                            featuresCSV.push(titleEmptyRows[2]);
+                                            featuresCSV.push(titleEmptyRows[1]);
+                                        }
+                                    }
+                                    else {
+                                        var titleEmptyRows = _this.createTitleEmptyRows(currentFeature, currentFeature);
+                                        featuresCSV.push(titleEmptyRows[0]);
+                                    }
+                                }
+                                featuresCSV.push(currentFeature);
+                                previousFeature_1 = currentFeature;
+                            });
+                        });
                     }
                 }
                 if (geomTypes.length === 0) {
-                    _this.loading$.next(false);
+                    this_2.loading$.next(false);
                     var title = translate.instant('igo.geo.export.nothing.title');
                     var message = translate.instant('igo.geo.export.nothing.text');
-                    _this.messageService.error(message, title, { timeOut: 20000 });
+                    this_2.messageService.error(message, title, { timeOut: 20000 });
                 }
                 else {
-                    geomTypes.map(function (geomType) { return _this.exportService.export(geomType.features, data.format, filename + geomType.geometryType, data.encoding, _this.map.projection)
-                        .subscribe(function () { }, function (error) { return _this.onFileExportError(error); }, function () {
-                        _this.onFileExportSuccess();
-                        geomType.features.forEach(function (feature) {
-                            var radius = feature.get('rad');
-                            if (radius) {
-                                var point = new OlPoint__default["default"]([feature.get('longitude'), feature.get('latitude')]);
-                                point.transform('EPSG:4326', feature.get('_projection'));
-                                feature.setGeometry(point);
-                            }
-                        });
-                        _this.loading$.next(false);
-                    }); });
+                    if (!(data.format === ExportFormat.CSVsemicolon || data.format === ExportFormat.CSVcomma) || !data.combineLayers) {
+                        geomTypes.map(function (geomType) { return _this.exportService.export(geomType.features, data.format, filename + geomType.geometryType, data.encoding, _this.map.projection)
+                            .subscribe(function () { }, function (error) { return _this.onFileExportError(error); }, function () {
+                            _this.onFileExportSuccess();
+                            geomType.features.forEach(function (feature) {
+                                _this.circleToPoint(feature);
+                            });
+                            _this.loading$.next(false);
+                        }); });
+                    }
+                }
+            };
+            var this_2 = this;
+            try {
+                for (var _c = __values(data.layers.entries()), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    var _e = __read(_d.value, 2), layerIndex = _e[0], layer = _e[1];
+                    var state_1 = _loop_2(layerIndex, layer);
+                    if (typeof state_1 === "object")
+                        return state_1.value;
+                }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+            ;
+            if ((data.format === ExportFormat.CSVsemicolon || data.format === ExportFormat.CSVcomma) && data.combineLayers) {
+                this.exportService.export(featuresCSV, data.format, filename, data.encoding, this.map.projection)
+                    .subscribe(function () { }, function (error) { return _this.onFileExportError(error); }, function () {
+                    _this.onFileExportSuccess();
+                    featuresCSV.forEach(function (feature) {
+                        _this.circleToPoint(feature);
+                    });
+                    _this.loading$.next(false);
+                });
+            }
+        };
+        ImportExportComponent.prototype.createTitleEmptyRows = function (previousFeature, currentFeature) {
+            var titleRow = previousFeature.clone();
+            var titleRowWithArrow = previousFeature.clone();
+            var emptyRow = previousFeature.clone();
+            var previousFeatureKeys = previousFeature.getKeys();
+            var firstKey = previousFeatureKeys[1];
+            previousFeatureKeys.forEach(function (key) {
+                if (key === firstKey) {
+                    titleRow.set(key, currentFeature.get('_featureStore').layer.options.title, true);
+                    titleRowWithArrow.set(key, currentFeature.get('_featureStore').layer.options.title + " ===================>", true);
+                    emptyRow.unset(key, true);
+                }
+                else {
+                    titleRow.unset(key, true);
+                    titleRowWithArrow.unset(key, true);
+                    emptyRow.unset(key, true);
                 }
             });
+            var titleEmptyRows = [titleRow, titleRowWithArrow, emptyRow];
+            return titleEmptyRows;
+        };
+        ImportExportComponent.prototype.circleToPoint = function (feature) {
+            var radius = feature.get('rad');
+            if (radius) {
+                var point = new OlPoint__default["default"]([feature.get('longitude'), feature.get('latitude')]);
+                point.transform('EPSG:4326', feature.get('_projection'));
+                feature.setGeometry(point);
+            }
         };
         ImportExportComponent.prototype.buildForm = function () {
             this.importForm = this.formBuilder.group({
@@ -32223,6 +32630,8 @@
                     layers: [[], [i16.Validators.required]],
                     layersWithSelection: [[]],
                     encoding: [EncodingFormat.UTF8, [i16.Validators.required]],
+                    combineLayers: [true, [i16.Validators.required]],
+                    separator: [false, [i16.Validators.required]],
                     featureInMapExtent: [false, [i16.Validators.required]],
                     name: ['', [i16.Validators.required]]
                 });
@@ -32233,6 +32642,8 @@
                     layers: [[], [i16.Validators.required]],
                     layersWithSelection: [[]],
                     encoding: [EncodingFormat.UTF8, [i16.Validators.required]],
+                    combineLayers: [true, [i16.Validators.required]],
+                    separator: [false, [i16.Validators.required]],
                     featureInMapExtent: [false, [i16.Validators.required]],
                 });
             }
@@ -32432,7 +32843,7 @@
         return ImportExportComponent;
     }());
     ImportExportComponent.ɵfac = function ImportExportComponent_Factory(t) { return new (t || ImportExportComponent)(i0__namespace.ɵɵdirectiveInject(ImportService), i0__namespace.ɵɵdirectiveInject(ExportService), i0__namespace.ɵɵdirectiveInject(i2__namespace$1.LanguageService), i0__namespace.ɵɵdirectiveInject(i2__namespace$1.MessageService), i0__namespace.ɵɵdirectiveInject(StyleListService), i0__namespace.ɵɵdirectiveInject(StyleService), i0__namespace.ɵɵdirectiveInject(i16__namespace.FormBuilder), i0__namespace.ɵɵdirectiveInject(i2__namespace$1.ConfigService), i0__namespace.ɵɵdirectiveInject(i0__namespace.ChangeDetectorRef), i0__namespace.ɵɵdirectiveInject(i2__namespace$1.StorageService), i0__namespace.ɵɵdirectiveInject(DownloadService)); };
-    ImportExportComponent.ɵcmp = /*@__PURE__*/ i0__namespace.ɵɵdefineComponent({ type: ImportExportComponent, selectors: [["igo-import-export"]], inputs: { selectFirstProj: "selectFirstProj", map: "map", projectionsLimitations: "projectionsLimitations", store: "store", selectedMode: "selectedMode", exportOptions$: "exportOptions$" }, outputs: { selectMode: "selectMode", exportOptionsChange: "exportOptionsChange" }, decls: 14, vars: 17, consts: [[1, "import-export-toggle", "mat-typography"], [3, "value", "change"], [3, "value"], ["class", "igo-form", 3, "formGroup", 4, "ngIf"], ["class", "mat-typography", 4, "ngIf"], [1, "igo-form", 3, "formGroup"], [1, "igo-input-container"], [3, "value", "valueChange"], [3, "value", "click", 4, "ngFor", "ngForOf"], ["tooltip-position", "below", "matTooltipShowDelay", "500", 1, "igo-form-button-group", 3, "matTooltip"], ["mat-raised-button", "", "type", "button", 3, "disabled", "click"], [3, "shown"], ["hidden", "", "type", "file", 3, "click", "change"], ["fileInput", ""], [3, "value", "click"], ["mat-line", "", 4, "ngIf"], ["mat-line", ""], [1, "mat-typography"], ["multiple", "", 3, "value", "valueChange"], ["class", "export-select-trigger", 4, "ngIf"], [3, "ngClass", "value", "click", 4, "ngFor", "ngForOf"], ["formControlName", "format"], [4, "ngIf"], ["disabled", "true", 4, "ngIf"], ["class", "igo-input-container", 4, "ngIf"], ["class", "export-options mat-typography", 4, "ngIf"], [1, "igo-form-button-group"], [1, "export-select-trigger"], [3, "ngClass", "value", "click"], [3, "labelPosition", "click", "checked", "change", 4, "ngIf"], [3, "labelPosition", "click", "checked", "change"], [3, "value", 4, "ngFor", "ngForOf"], ["disabled", "true"], ["matInput", "", "formControlName", "name", 3, "placeholder"], ["formControlName", "encoding"], [1, "export-options", "mat-typography"], ["formControlName", "featureInMapExtent", 3, "labelPosition"]], template: function ImportExportComponent_Template(rf, ctx) {
+    ImportExportComponent.ɵcmp = /*@__PURE__*/ i0__namespace.ɵɵdefineComponent({ type: ImportExportComponent, selectors: [["igo-import-export"]], inputs: { selectFirstProj: "selectFirstProj", map: "map", projectionsLimitations: "projectionsLimitations", store: "store", selectedMode: "selectedMode", exportOptions$: "exportOptions$" }, outputs: { selectMode: "selectMode", exportOptionsChange: "exportOptionsChange" }, decls: 14, vars: 17, consts: [[1, "import-export-toggle", "mat-typography"], [3, "value", "change"], [3, "value"], ["class", "igo-form", 3, "formGroup", 4, "ngIf"], ["class", "mat-typography", 4, "ngIf"], [1, "igo-form", 3, "formGroup"], [1, "igo-input-container"], [3, "value", "valueChange"], [3, "value", "click", 4, "ngFor", "ngForOf"], ["tooltip-position", "below", "matTooltipShowDelay", "500", 1, "igo-form-button-group", 3, "matTooltip"], ["mat-raised-button", "", "type", "button", 3, "disabled", "click"], [3, "shown"], ["hidden", "", "type", "file", 3, "click", "change"], ["fileInput", ""], [3, "value", "click"], ["mat-line", "", 4, "ngIf"], ["mat-line", ""], [1, "mat-typography"], ["multiple", "", 3, "value", "valueChange"], ["class", "export-select-trigger", 4, "ngIf"], [3, "ngClass", "value", "click", 4, "ngFor", "ngForOf"], ["formControlName", "format"], [4, "ngIf"], ["disabled", "true", 4, "ngIf"], ["class", "igo-input-container", 4, "ngIf"], ["class", "export-combine-layers mat-typography", 4, "ngIf"], ["class", "export-separator mat-typography", 4, "ngIf"], ["class", "export-options mat-typography", 4, "ngIf"], [1, "igo-form-button-group"], [1, "export-select-trigger"], [3, "ngClass", "value", "click"], [3, "labelPosition", "click", "checked", "change", 4, "ngIf"], [3, "labelPosition", "click", "checked", "change"], [3, "value", 4, "ngFor", "ngForOf"], ["disabled", "true"], ["matInput", "", "formControlName", "name", 3, "placeholder"], ["formControlName", "encoding"], [1, "export-combine-layers", "mat-typography"], ["formControlName", "combineLayers", 3, "labelPosition"], [1, "export-separator", "mat-typography"], ["formControlName", "separator", 3, "labelPosition"], [1, "export-options", "mat-typography"], ["formControlName", "featureInMapExtent", 3, "labelPosition"]], template: function ImportExportComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelementStart(0, "div", 0);
                 i0__namespace.ɵɵelementStart(1, "mat-button-toggle-group", 1);
@@ -32451,7 +32862,7 @@
                 i0__namespace.ɵɵtemplate(9, ImportExportComponent_section_9_Template, 14, 15, "section", 4);
                 i0__namespace.ɵɵtemplate(10, ImportExportComponent_section_10_Template, 4, 3, "section", 4);
                 i0__namespace.ɵɵpipe(11, "async");
-                i0__namespace.ɵɵtemplate(12, ImportExportComponent_form_12_Template, 34, 35, "form", 3);
+                i0__namespace.ɵɵtemplate(12, ImportExportComponent_form_12_Template, 36, 37, "form", 3);
                 i0__namespace.ɵɵpipe(13, "async");
             }
             if (rf & 2) {
@@ -32474,7 +32885,7 @@
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("ngIf", i0__namespace.ɵɵpipeBind1(13, 15, ctx.exportableLayers$).length > 0 && ctx.selectedMode === "export");
             }
-        }, directives: [i18__namespace.MatButtonToggleGroup, i18__namespace.MatButtonToggle, i1__namespace$1.NgIf, i16__namespace.ɵNgNoValidate, i16__namespace.NgControlStatusGroup, i16__namespace.FormGroupDirective, i12__namespace.MatFormField, i12__namespace.MatLabel, i13__namespace.MatSelect, i1__namespace$1.NgForOf, i3__namespace.MatTooltip, i2__namespace.MatButton, i6__namespace$1.SpinnerComponent, i9__namespace.MatOption, i13__namespace.MatSelectTrigger, i16__namespace.NgControlStatus, i16__namespace.FormControlName, i1__namespace$1.NgClass, i22__namespace.MatSlideToggle, i5__namespace.MatInput, i16__namespace.DefaultValueAccessor], pipes: [i7__namespace.TranslatePipe, i1__namespace$1.AsyncPipe, i6__namespace$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%]{overflow-x:hidden}.export-options[_ngcontent-%COMP%]   mat-slide-toggle[_ngcontent-%COMP%]{width:100%;margin:10px}.export-options[_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__namespace.MatButtonToggleGroup, i18__namespace.MatButtonToggle, i1__namespace$1.NgIf, i16__namespace.ɵNgNoValidate, i16__namespace.NgControlStatusGroup, i16__namespace.FormGroupDirective, i12__namespace.MatFormField, i12__namespace.MatLabel, i13__namespace.MatSelect, i1__namespace$1.NgForOf, i3__namespace.MatTooltip, i2__namespace.MatButton, i6__namespace$1.SpinnerComponent, i9__namespace.MatOption, i13__namespace.MatSelectTrigger, i16__namespace.NgControlStatus, i16__namespace.FormControlName, i1__namespace$1.NgClass, i22__namespace.MatSlideToggle, i5__namespace.MatInput, i16__namespace.DefaultValueAccessor], pipes: [i7__namespace.TranslatePipe, i1__namespace$1.AsyncPipe, i6__namespace$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}"] });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(ImportExportComponent, [{
                 type: i0.Component,
@@ -35271,7 +35682,7 @@
                 id: stop.id,
                 revision: previousStopRevision + 1
             },
-            ol: new olFeature__default["default"]({ geometry: geometry })
+            ol: new OlFeature__default["default"]({ geometry: geometry })
         };
         stopsFeatureStore.update(stopFeatureStore);
     }
@@ -35303,7 +35714,7 @@
                 id: direction.id,
                 revision: previousRouteRevision + 1
             },
-            ol: new olFeature__default["default"]({ geometry: geometry })
+            ol: new OlFeature__default["default"]({ geometry: geometry })
         };
         routesFeatureStore.update(routeFeatureStore);
     }
@@ -36516,7 +36927,7 @@
             var routeSegmentCoordinates = geometryMapProjection.getCoordinates();
             var lastPoint = routeSegmentCoordinates[0];
             var geometry = new olgeom__namespace.Point(lastPoint);
-            var feature = new olFeature__default["default"]({ geometry: geometry });
+            var feature = new OlFeature__default["default"]({ geometry: geometry });
             var geojsonGeom = new OlGeoJSON__default["default"]().writeGeometryObject(geometry, {
                 featureProjection: this.stepFeatureStore.layer.map.projection,
                 dataProjection: this.stepFeatureStore.layer.map.projection
@@ -37719,7 +38130,8 @@
                     id: id,
                     title: data.properties.nom,
                     titleHtml: titleHtml + subtitleHtml,
-                    icon: data.icon || 'map-marker'
+                    icon: data.icon || 'map-marker',
+                    pointerSummaryTitle: this.getSubtitle(data) + ': ' + data.properties.nom
                 }
             };
         };
@@ -40627,11 +41039,13 @@
                     if (closestResultByType.hasOwnProperty(result.data.properties.type)) {
                         var prevDistance = closestResultByType[result.data.properties.type].distance;
                         if (result.data.properties.distance < prevDistance) {
-                            closestResultByType[result.data.properties.type] = { distance: result.data.properties.distance, title: result.meta.title };
+                            var title = result.meta.pointerSummaryTitle || result.meta.title;
+                            closestResultByType[result.data.properties.type] = { distance: result.data.properties.distance, title: title };
                         }
                     }
                     else {
-                        closestResultByType[result.data.properties.type] = { distance: result.data.properties.distance, title: result.meta.title };
+                        var title = result.meta.pointerSummaryTitle || result.meta.title;
+                        closestResultByType[result.data.properties.type] = { distance: result.data.properties.distance, title: title };
                     }
                 }
             });
@@ -40655,7 +41069,7 @@
                 }
                 else {
                     if (processedSummarizedClosestType.indexOf(result.data.properties.type) === -1) {
-                        summary.push(result.meta.title);
+                        summary.push(result.meta.pointerSummaryTitle || result.meta.title);
                     }
                 }
             });
@@ -40714,6 +41128,14 @@
                 _this.onSearchCoordinate();
             }, this.igoSearchPointerSummaryDelay);
         };
+        /**
+       * Sort the results by display order.
+       * @param r1 First result
+       * @param r2 Second result
+       */
+        SearchPointerSummaryDirective.prototype.sortByOrder = function (r1, r2) {
+            return r1.source.displayOrder - r2.source.displayOrder;
+        };
         SearchPointerSummaryDirective.prototype.onSearchCoordinate = function () {
             var _this = this;
             this.pointerSearchStore.clear();
@@ -40735,7 +41157,7 @@
             var newResults = this.pointerSearchStore.all()
                 .filter(function (result) { return result.source !== event.research.source; })
                 .concat(results);
-            this.pointerSearchStore.load(newResults);
+            this.pointerSearchStore.load(newResults.sort(this.sortByOrder));
         };
         /**
          * Add a feature to the pointer store
@@ -40744,7 +41166,7 @@
         SearchPointerSummaryDirective.prototype.addPointerOverlay = function (text) {
             this.clearLayer();
             var geometry = new olgeom__namespace.Point(olproj.transform(this.lonLat, 'EPSG:4326', this.mapProjection));
-            var feature = new olFeature__default["default"]({ geometry: geometry });
+            var feature = new OlFeature__default["default"]({ geometry: geometry });
             var geojsonGeom = new OlGeoJSON__default["default"]().writeGeometryObject(geometry, {
                 featureProjection: this.mapProjection,
                 dataProjection: this.mapProjection
@@ -43402,6 +43824,7 @@
     exports.computeBestAreaUnit = computeBestAreaUnit;
     exports.computeBestLengthUnit = computeBestLengthUnit;
     exports.computeLayerTitleFromFile = computeLayerTitleFromFile;
+    exports.computeMVTOptionsOnHover = computeMVTOptionsOnHover;
     exports.computeOlFeatureExtent = computeOlFeatureExtent;
     exports.computeOlFeaturesDiff = computeOlFeaturesDiff;
     exports.computeOlFeaturesExtent = computeOlFeaturesExtent;