@provoly/dashboard 0.14.8 → 0.14.10

package/fesm2022/provoly-dashboard-widgets-widget-map.mjs

@@ -16,7 +16,7 @@ import { applyStyle, applyBackground } from 'ol-mapbox-style';
 import { getWidth, getTopLeft, createEmpty, boundingExtent } from 'ol/extent';
 import { Heatmap, Tile } from 'ol/layer';
 import VectorTileLayer from 'ol/layer/VectorTile';
-import { toLonLat, fromLonLat, get, transform } from 'ol/proj';
+import { toLonLat, get, transform, fromLonLat } from 'ol/proj';
 import { register } from 'ol/proj/proj4';
 import { Vector, TileWMS, WMTS, XYZ, Cluster } from 'ol/source';
 import proj4 from 'proj4';
@@ -307,16 +307,16 @@ class CqlUtils {
             if (attributeName && cond.value && cond.value.length > 0) {
                 switch (cond.operator) {
                     case 'EQUALS':
-                        conditions.push(`${attributeName}=${cond.value}`);
+                        conditions.push(`${attributeName}='${cond.value}'`);
                         break;
                     case 'CONTAINS':
-                        conditions.push(`${attributeName} LIKE %${cond.value}%`);
+                        conditions.push(`${attributeName} LIKE '%${cond.value}%'`);
                         break;
                     case 'START_WITH':
-                        conditions.push(`${attributeName} LIKE ${cond.value}%`);
+                        conditions.push(`${attributeName} LIKE '${cond.value}%'`);
                         break;
                     case 'END_WITH':
-                        conditions.push(`${attributeName} LIKE %${cond.value}`);
+                        conditions.push(`${attributeName} LIKE '%${cond.value}'`);
                         break;
                     case 'GREATER_THAN':
                         conditions.push(`${attributeName}>${cond.value}`);
@@ -506,9 +506,11 @@ class WidgetMapLayerService {
                         attributions: [layer.attribution ?? ''],
                         crossOrigin: 'anonymous',
                         url: layer.url,
-                        params: { LAYERS: layer.paramLayer, TILED: layer.paramTiled }
+                        params: { LAYERS: layer.paramLayer, TILED: layer.paramTiled, ...(layer.additionalParameters ?? {}) }
                     })
                 });
+                impl.set('url', layer.url);
+                impl.set('paramLayer', layer.paramLayer);
                 impl.set('oClass', layer.oClass);
                 impl.set('getFeatureInfoAdditionalParameters', layer.getFeatureInfoAdditionalParameters ?? {});
                 return impl;
@@ -919,6 +921,27 @@ class XMLUtils {
         }
         return null;
     }
+    static getLayerExtent(paramLayer, map, doc) {
+        if (!doc) {
+            return null;
+        }
+        const matchingLayer = XMLUtils.getMatchingLayer(paramLayer, doc);
+        if (matchingLayer) {
+            const boundingBox = XMLUtils.find(matchingLayer.childNodes, 'BoundingBox');
+            if (boundingBox) {
+                // @ts-ignore
+                const attributes = boundingBox.attributes;
+                const projBox = get(attributes.CRS.textContent ?? 'CRS:84');
+                if (projBox) {
+                    return [
+                        transform([parseFloat(attributes.minx.textContent), parseFloat(attributes.miny.textContent)], projBox, map.getView().getProjection()),
+                        transform([parseFloat(attributes.maxx.textContent), parseFloat(attributes.maxy.textContent)], projBox, map.getView().getProjection())
+                    ];
+                }
+            }
+        }
+        return null;
+    }
 }
 
 class PryWidgetMapCssComponent {
@@ -1011,6 +1034,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.6", ngImpor
         }], ctorParameters: function () { return []; } });
 
 const TOOLTIP_PADDING = 15;
+// Define Lambert Projection
+proj4.defs('EPSG:2154', '+proj=lcc +lat_0=46.5 +lon_0=3 +lat_1=49 +lat_2=44 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs +type=crs');
+register(proj4);
 class WidgetMapComponent extends DataWidgetComponent {
     constructor(store, snackBar, translateService, tooltipFactoryService, overlay, viewContainerRef, symbolService, injector, widgetMapLayerService, el) {
         super(store, el);
@@ -1258,7 +1284,6 @@ class WidgetMapComponent extends DataWidgetComponent {
         })), distinctUntilChanged())
             .subscribe((view) => this.map.setView(new View(view)));
         this.fitOption$ = this.options$.pipe(map((options) => !!options.fit), distinctUntilChanged());
-        this.fitOption$.subscribe((fit) => this.fitMapForObjects(fit));
         this.layers$ = combineLatest([
             this.resultSet$,
             this.options$,
@@ -1354,8 +1379,9 @@ class WidgetMapComponent extends DataWidgetComponent {
             this.mapStyleLayer$,
             this.layers$,
             this.fitOption$,
-            this.selectedIds$.pipe(distinctUntilChanged((p, c) => equal(p, c)))
-        ]).subscribe(([mapStyleLayer, layers, fit, selectedIds]) => {
+            this.selectedIds$.pipe(distinctUntilChanged((p, c) => equal(p, c))),
+            this.wmsCapabilities$
+        ]).subscribe(([mapStyleLayer, layers, fit, selectedIds, capabilities]) => {
             const toApplyLayers = [...layers, ...mapStyleLayer];
             this.map.setLayers(toApplyLayers);
             this.map
@@ -1373,7 +1399,7 @@ class WidgetMapComponent extends DataWidgetComponent {
                 }
             });
             setTimeout(() => {
-                this.fitMapForObjects(fit, selectedIds);
+                this.fitMapForObjects(fit, capabilities, selectedIds);
                 this.map.updateSize();
             }, 200);
         }));
@@ -1483,7 +1509,7 @@ class WidgetMapComponent extends DataWidgetComponent {
             }
         }
     }
-    fitMapForObjects(fit, selectedIds) {
+    fitMapForObjects(fit, wmsCapabilities = {}, selectedIds) {
         if (fit) {
             let extent = createEmpty();
             const listOfMarkers = [];
@@ -1517,7 +1543,12 @@ class WidgetMapComponent extends DataWidgetComponent {
                     }
                 });
             });
-            const selectedExtent = boundingExtent(listOfMarkers.filter((coord) => !!coord));
+            const wmsLayersAvailableExtents = this.map
+                .getAllLayers()
+                .filter((layer) => layer.getSource() instanceof TileWMS)
+                .map((layer) => XMLUtils.getLayerExtent(layer.getProperties()['paramLayer'], this.map, wmsCapabilities[layer.getProperties()['url']]?.doc))
+                .filter((extent) => !!extent);
+            const selectedExtent = boundingExtent(listOfMarkers.filter((coord) => !!coord).concat(...wmsLayersAvailableExtents));
             if (selectedExtent[0] !== Infinity &&
                 selectedExtent[1] !== Infinity &&
                 selectedExtent[2] !== -Infinity &&
@@ -1698,8 +1729,6 @@ class WidgetMapComponent extends DataWidgetComponent {
             ?.getVisible();
     }
     getFeatureFromServer(wmsLayers, pixel) {
-        proj4.defs('EPSG:2154', '+proj=lcc +lat_0=46.5 +lon_0=3 +lat_1=49 +lat_2=44 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs +type=crs');
-        register(proj4);
         const projGeo = get('EPSG:3857');
         const projLambert = get('EPSG:2154');
         if (projLambert && projGeo) {