@provoly/dashboard 1.3.32 → 1.3.33

package/fesm2022/provoly-dashboard.mjs

@@ -4725,7 +4725,7 @@ class ItemUtils {
             ...new Set(Object.keys(resultSet?.items || {})
                 .map((classId) => classes.find((cl) => cl.id === classId))
                 .filter((oClass) => oClass !== undefined)
-                .map((oClass) => oClass.attributes)
+                .map((oClass) => oClass.attributes.filter((attr) => ItemUtils.getClassNonGeoAttributesNames(oClass, definitions, fields).includes(attr.name)))
                 .reduce((p, c) => [...p, ...c], [])
                 .filter((attr) => !!fields.find((f) => f.id === attr.field.id)))
         ];
@@ -11906,8 +11906,8 @@ class WmsService {
     getWmsFeatures(url) {
         return this.httpClient.get(url).pipe(map((json) => json));
     }
-    getWfsFeatures(wmsUrl, bbox, geomPropName) {
-        const url = wfsUrlBuilder(wmsUrl, bbox, geomPropName);
+    getWfsFeatures(wmsUrl, bbox) {
+        const url = wfsUrlBuilder(wmsUrl, bbox);
         return this.httpClient.get(url).pipe(map((json) => json));
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.1.3", ngImport: i0, type: WmsService, deps: [{ token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -11919,17 +11919,21 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.1.3", ngImpor
                     providedIn: 'root'
                 }]
         }], ctorParameters: () => [{ type: i1$2.HttpClient }] });
-const wfsUrlBuilder = (wmsUrl, bbox, geomPropName, params) => {
-    const isBboxPoint = bbox[0] === bbox[2] && bbox[1] === bbox[3];
+const BBOX_ENHANCE_DISTANCE = 0.0001;
+const wfsUrlBuilder = (wmsUrl, bbox, params) => {
+    const enhancedBbox = [
+        bbox[0] - BBOX_ENHANCE_DISTANCE,
+        bbox[1] - BBOX_ENHANCE_DISTANCE,
+        bbox[2] + BBOX_ENHANCE_DISTANCE,
+        bbox[3] + BBOX_ENHANCE_DISTANCE
+    ];
     const wfsFragments = {
         service: 'WFS',
         version: '2.0.0',
         request: 'GetFeature',
         outputFormat: 'application/json',
         typeNames: undefined,
-        cql_filter: isBboxPoint
-            ? `DWITHIN(${geomPropName}, POINT(${bbox[0]} ${bbox[1]}),1,meters)`
-            : `BBOX(${geomPropName},${bbox.join(',')})`,
+        bbox: `${enhancedBbox.join(',')},EPSG:4326`,
         srsName: undefined,
         params: params ? `&${params.join('&')}` : ''
     };
@@ -11937,9 +11941,7 @@ const wfsUrlBuilder = (wmsUrl, bbox, geomPropName, params) => {
     const wmsUrlFragments = wmsUrl.split('&');
     wfsFragments['typeNames'] = wmsUrlFragments.find((param) => param.includes('LAYERS'))?.split('=')[1];
     wfsFragments['srsName'] = wmsUrlFragments.find((param) => param.toUpperCase().includes('CRS'))?.split('=')[1];
-    wfsFragments['cql_filter'] += wmsUrlFragments.find((param) => param.toUpperCase().includes('CQL_FILTER'))
-        ? ' AND ' + wmsUrlFragments.find((param) => param.toUpperCase().includes('CQL_FILTER'))?.split('=')[1]
-        : '';
+    wfsFragments['cql_filter'] = wmsUrlFragments.find((param) => param.includes('CQL_FILTER'))?.split('=')[1];
     return (base +
         '?' +
         Object.entries(wfsFragments)
@@ -12355,11 +12357,10 @@ class DashboardEffects {
             if (wmsJson.features[0] &&
                 wmsJson.features[0].properties.count &&
                 wmsJson.features[0].properties.countunique &&
-                wmsJson.features[0].properties.count > 1 &&
-                wmsJson.features[0].properties.countunique === 1) {
-                let envBBOXCoords = [...wmsJson.features[0].properties.envBBOX.matchAll(/\d+.\d+/g)].map((m) => m[0]);
+                wmsJson.features[0].properties.count > 1) {
+                let envBBOXCoords = [...wmsJson.features[0].properties.envBBOX.matchAll(/\d+.\d+/g)].map((m) => parseFloat(m[0]));
                 return this.wmsService
-                    .getWfsFeatures(action.url, envBBOXCoords, action.geomProName)
+                    .getWfsFeatures(action.url, envBBOXCoords)
                     .pipe(map$1((wfsJson) => ({ action, json: wfsJson })));
             }
             // if data is not a stack just add features without calling wfs service