@provoly/dashboard 1.3.19 → 1.3.21

package/fesm2022/provoly-dashboard.mjs

@@ -11902,8 +11902,8 @@ class WmsService {
     getWmsFeatures(url) {
         return this.httpClient.get(url).pipe(map((json) => json));
     }
-    getWfsFeatures(wmsUrl, bbox) {
-        const url = wfsUrlBuilder(wmsUrl, bbox);
+    getWfsFeatures(wmsUrl, bbox, geomPropName) {
+        const url = wfsUrlBuilder(wmsUrl, bbox, geomPropName);
         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 }); }
@@ -11915,14 +11915,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.1.3", ngImpor
                     providedIn: 'root'
                 }]
         }], ctorParameters: () => [{ type: i1$2.HttpClient }] });
-const wfsUrlBuilder = (wmsUrl, bbox, params) => {
+const wfsUrlBuilder = (wmsUrl, bbox, geomPropName, params) => {
     const wfsFragments = {
         service: 'WFS',
         version: '2.0.0',
         request: 'GetFeature',
         outputFormat: 'application/json',
         typeNames: undefined,
-        cql_filter: `BBOX(geom,${bbox.join(',')})`,
+        cql_filter: `BBOX(${geomPropName},${bbox.join(',')})`,
         srsName: undefined,
         params: params ? `&${params.join('&')}` : ''
     };
@@ -11936,7 +11936,8 @@ const wfsUrlBuilder = (wmsUrl, bbox, params) => {
     return (base +
         '?' +
         Object.entries(wfsFragments)
-            .map(([key, value]) => (value ? `${key}=${value}` : ''))
+            .map(([key, value]) => (value ? `${key}=${value}` : undefined))
+            .filter((val) => !!val)
             .join('&'));
 };
 
@@ -12366,7 +12367,7 @@ class DashboardEffects {
                 wmsJson.features[0].properties.countunique === 1) {
                 let envBBOXCoords = [...wmsJson.features[0].properties.envBBOX.matchAll(/\d+.\d+/g)].map((m) => m[0]);
                 return this.wmsService
-                    .getWfsFeatures(action.url, envBBOXCoords)
+                    .getWfsFeatures(action.url, envBBOXCoords, action.geomProName)
                     .pipe(map$1((wfsJson) => ({ action, json: wfsJson })));
             }
             // if data is not a stack just add features without calling wfs service