@provoly/dashboard 0.19.12 → 0.20.1

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

@@ -17,7 +17,7 @@ import { toLonLat, get, transform, fromLonLat } from 'ol/proj';
 import { register } from 'ol/proj/proj4';
 import { Vector, TileWMS, WMTS, XYZ, Cluster, DataTile } from 'ol/source';
 import proj4 from 'proj4';
-import { BehaviorSubject, map, combineLatest, filter, distinctUntilChanged, startWith, debounceTime, delay, mergeMap, of, from, switchMap } from 'rxjs';
+import { BehaviorSubject, map, combineLatest, filter, distinctUntilChanged, startWith, debounceTime, delay, mergeMap, of, from, switchMap, catchError } from 'rxjs';
 import { ScaleLine, Attribution, defaults } from 'ol/control';
 import { Polygon, Circle as Circle$1, LineString } from 'ol/geom';
 import PointerInteraction from 'ol/interaction/Pointer';
@@ -1055,29 +1055,6 @@ class WidgetMapUtils {
         }
         return geometry;
     }
-    static extractGeometries(value, points, type) {
-        const valueSimple = value.value;
-        if (typeof valueSimple !== 'string' && typeof valueSimple !== 'number') {
-            if (type === 'point' && valueSimple.type === FieldType.POINT) {
-                points.push(valueSimple.coordinates);
-            }
-            if (type === 'point' && valueSimple.type === FieldType.MULTIPOINT) {
-                points.push(...valueSimple.coordinates);
-            }
-            if (type === 'line' && valueSimple.type === FieldType.LINE) {
-                points.push(valueSimple.coordinates);
-            }
-            if (type === 'line' && valueSimple.type === FieldType.MULTILINE) {
-                points.push(...valueSimple.coordinates);
-            }
-            if (type === 'polygon' && valueSimple.type === FieldType.POLYGON) {
-                points.push(valueSimple.coordinates);
-            }
-            if (type === 'polygon' && valueSimple.type === FieldType.MULTIPOLYGON) {
-                points.push(...valueSimple.coordinates);
-            }
-        }
-    }
     static projectExtentAggregationResponse(field, extentResponse, layer, wmsCapabilities, map) {
         const projBox = get(field.crs ?? DEFAULT_PROJECTION);
         const response = extentResponse.values;
@@ -1092,6 +1069,7 @@ class WidgetMapUtils {
             response[0].value.bottom_right.lon !== undefined) {
             return {
                 datasource: layer.datasourceId,
+                error: false,
                 extent: [
                     transform([
                         parseFloat(extentResponse.values[0].value.top_left.lon),
@@ -1106,7 +1084,8 @@ class WidgetMapUtils {
         }
         return {
             datasource: layer.datasourceId,
-            extent: XMLUtils.getLayerExtent(layer.paramLayer, map, wmsCapabilities[layer.url]?.doc) ?? []
+            extent: XMLUtils.getLayerExtent(layer.paramLayer, map, wmsCapabilities[layer.url]?.doc) ?? [],
+            error: false
         };
     }
     static { this.DEFAULT_HEATMAP_RADIUS = 25; }
@@ -1580,7 +1559,10 @@ class WidgetMapComponent extends DataWidgetComponent {
                 new MapboxVectorLayer({
                     properties: { title: 'background' },
                     styleUrl
-                })
+                }) /* ,
+                new TileLayer({
+                  source: new TileDebug()
+                }) */
             ];
         }));
         this.options$
@@ -1717,17 +1699,19 @@ class WidgetMapComponent extends DataWidgetComponent {
                     .aggregate([layer.datasourceId], {
                     ordinate: { operation: Operation.EXTENT, attribute: attr.id, label: attr.name, keep0: false }
                 })
-                    .pipe(map((extentResponse) => {
-                    return WidgetMapUtils.projectExtentAggregationResponse(field, extentResponse, layer, wmsCapabilities, this.map);
-                })))
+                    .pipe(map((extentResponse) => WidgetMapUtils.projectExtentAggregationResponse(field, extentResponse, layer, wmsCapabilities, this.map)), catchError(() => of({ datasource: layer.datasourceId, extent: [], error: true }))))
                     .flat())
                     .flat(),
                 ...(options.layers?.filter((layer) => layer.type === 'wms') ?? [])
                     .filter((layer) => layer.fit)
-                    .map((layer) => of({
-                    datasource: `wms-${layer.paramLayer}`,
-                    extent: XMLUtils.getLayerExtent(layer.paramLayer, this.map, wmsCapabilities[layer.url]?.doc) ?? []
-                }))
+                    .map((layer) => {
+                    const extent = XMLUtils.getLayerExtent(layer.paramLayer, this.map, wmsCapabilities[layer.url]?.doc);
+                    return of({
+                        datasource: `wms-${layer.paramLayer}`,
+                        extent: extent ?? [],
+                        error: !extent
+                    });
+                })
             ])
             : of([])), startWith([]));
         this.legendLayers$ = this.options$.pipe(map((options) => (options.layers ?? []).filter((layer) => ['geoserver', 'wms'].includes(layer.type))), delay(10));
@@ -1744,26 +1728,33 @@ class WidgetMapComponent extends DataWidgetComponent {
             this.fitExtents$,
             this.datasourceFilters$
         ]).subscribe(([mapStyleLayer, layers, selectedIds, extents, filters]) => {
-            const toApplyLayers = [...layers, ...mapStyleLayer];
-            this.map.setLayers(toApplyLayers);
-            this.map
-                .getAllLayers()
-                .filter((layer) => !(layer instanceof Tile))
-                .forEach((layer) => {
-                const getFeatures = layer.getSource()?.getFeatures;
-                if (typeof getFeatures === 'function') {
-                    layer.getSource()?.getFeatures().forEach((feature) => {
-                        const type = feature.get('type');
-                        if (['bubble', 'marker', 'point', 'line', 'polygon', 'multi-line', 'multi-polygon'].includes(type)) {
-                            feature.setStyle(feature.get(selectedIds.includes(feature.get('id')) ? 'selectedStyle' : 'classicStyle'));
-                        }
-                    });
-                }
-            });
-            setTimeout(() => {
+            const neededCalculatedExtents = layers.filter((layer) => ['geoserver', 'wms'].includes(layer.get('type')) && layer.get('fit')).length;
+            const nbCalculatedExtents = extents.filter((extent) => !extent.error).length;
+            if (nbCalculatedExtents >= neededCalculatedExtents) {
                 this.fitMapForObjects(selectedIds, extents, filters);
                 this.map.updateSize();
-            }, 200);
+                setTimeout(() => {
+                    const toApplyLayers = [...layers, ...mapStyleLayer];
+                    this.map.setLayers(toApplyLayers);
+                    this.map
+                        .getAllLayers()
+                        .filter((layer) => !(layer instanceof Tile))
+                        .forEach((layer) => {
+                        const getFeatures = layer.getSource()?.getFeatures;
+                        if (typeof getFeatures === 'function') {
+                            layer.getSource()?.getFeatures().forEach((feature) => {
+                                const type = feature.get('type');
+                                if (['bubble', 'marker', 'point', 'line', 'polygon', 'multi-line', 'multi-polygon'].includes(type)) {
+                                    feature.setStyle(feature.get(selectedIds.includes(feature.get('id')) ? 'selectedStyle' : 'classicStyle'));
+                                }
+                            });
+                        }
+                    });
+                }, 100);
+            }
+            else {
+                this.map.setLayers([...mapStyleLayer]);
+            }
         }));
         this.subscriptions.add(combineLatest([this.wmsFeatures$, this.classicFeatures$, this.widgetSize$, this.displayHeader$]).subscribe(([wmsFeatures, classicFeatures, size, header]) => {
             if (this.map) {