@provoly/dashboard 1.4.25 → 1.4.27

package/fesm2022/provoly-dashboard.mjs

@@ -9510,15 +9510,6 @@ class DashboardComponent extends SubscriptionnerDirective {
             return wManifest;
         }), distinctUntilChanged((p, c) => equal(p, c)));
         this.nonFillerWidgets$ = this.windowManifest$.pipe(map((wManifest) => (wManifest.widgets ?? []).filter((w) => w.type !== 'filler').length));
-        this.subscriptions.add(combineLatest([
-            this.windowManifest$,
-            this.store.select(DataSourceSelectors.getDataSources),
-            this.staticDashboard$
-        ]).subscribe(([manifest, datasets, staticManifest]) => {
-            if (datasets.length > 0) {
-                this.store.dispatch(DashboardActions.assertResultSets({ staticManifest }));
-            }
-        }));
         this.store.dispatch(FieldActions.load({}));
         this.store.dispatch(ClassActions.load({}));
         this.store.dispatch(CategoryActions.load({}));
@@ -9570,6 +9561,15 @@ class DashboardComponent extends SubscriptionnerDirective {
         this.updateSelfSize();
     }
     ngOnInit() {
+        this.subscriptions.add(combineLatest([
+            this.windowManifest$,
+            this.store.select(DataSourceSelectors.getDataSources),
+            this.staticDashboard$
+        ]).subscribe(([manifest, datasets, staticManifest]) => {
+            if (datasets.length > 0) {
+                this.store.dispatch(DashboardActions.assertResultSets({ staticManifest }));
+            }
+        }));
         if (this.displayOptions)
             this.store.dispatch(DashboardActions.updateDisplayOptions({ mode: ViewMode.CUSTOM, customDisplay: this.displayOptions }));
     }
@@ -12115,8 +12115,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: "18.2.7", ngImport: i0, type: WmsService, deps: [{ token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -12129,7 +12129,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.7", ngImpor
                 }]
         }], ctorParameters: () => [{ type: i1$1.HttpClient }] });
 const BBOX_ENHANCE_DISTANCE = 0.0001;
-const wfsUrlBuilder = (wmsUrl, bbox, params) => {
+const wfsUrlBuilder = (wmsUrl, bbox, geomPropName, params) => {
     const enhancedBbox = [
         bbox[0] - BBOX_ENHANCE_DISTANCE,
         bbox[1] - BBOX_ENHANCE_DISTANCE,
@@ -12148,9 +12148,16 @@ const wfsUrlBuilder = (wmsUrl, bbox, params) => {
     };
     const base = wmsUrl.split('?')[0].replace('wms', 'wfs');
     const wmsUrlFragments = wmsUrl.split('&');
-    wfsFragments['typeNames'] = wmsUrlFragments.find((param) => param.includes('LAYERS'))?.split('=')[1];
+    wfsFragments['typeNames'] = wmsUrlFragments.find((param) => param.toUpperCase().includes('LAYERS'))?.split('=')[1];
     wfsFragments['srsName'] = wmsUrlFragments.find((param) => param.toUpperCase().includes('CRS'))?.split('=')[1];
-    wfsFragments['cql_filter'] = wmsUrlFragments.find((param) => param.includes('CQL_FILTER'))?.split('=')[1];
+    const cqlFilterFragment = wmsUrlFragments.find((param) => param.toUpperCase().includes('CQL_FILTER'));
+    if (cqlFilterFragment) {
+        const previousFragment = cqlFilterFragment.split('=')[1];
+        // cql_filter and bbox are mutually exclusive so we need to replace bbox with a cql filter on the bbox
+        wfsFragments['cql_filter'] =
+            previousFragment + ` AND BBOX(${geomPropName}, ${enhancedBbox.join(',')}, 'EPSG:4326')`;
+        wfsFragments['bbox'] = undefined;
+    }
     return (base +
         '?' +
         Object.entries(wfsFragments)
@@ -12565,7 +12572,7 @@ class DashboardEffects {
                 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)
+                    .getWfsFeatures(action.url, envBBOXCoords, action.geomPropName ?? wmsJson.features[0]['geometry_name'])
                     .pipe(map((wfsJson) => ({ action, json: wfsJson })));
             }
             // if data is not a stack just add features without calling wfs service