@provoly/dashboard 0.15.10 → 0.15.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/admin/components/admin-classes/admin-classes-view/admin-attributes-form/admin-attributes-form.component.mjs +3 -3
- package/esm2022/lib/core/components/modal-status/modal-status.component.mjs +3 -3
- package/esm2022/lib/core/model/widget-map-manifest.interface.mjs +1 -1
- package/esm2022/widgets/widget-map/component/widget-map.component.mjs +8 -6
- package/fesm2022/provoly-dashboard-admin.mjs +2 -2
- package/fesm2022/provoly-dashboard-admin.mjs.map +1 -1
- package/fesm2022/provoly-dashboard-widgets-widget-map.mjs +7 -5
- package/fesm2022/provoly-dashboard-widgets-widget-map.mjs.map +1 -1
- package/fesm2022/provoly-dashboard.mjs +2 -2
- package/fesm2022/provoly-dashboard.mjs.map +1 -1
- package/lib/core/model/widget-map-manifest.interface.d.ts +1 -0
- package/package.json +1 -1
- package/styles/components/_o-modal.scss +12 -0
- package/widgets/widget-map/component/widget-map.component.d.ts +2 -1
|
@@ -1347,6 +1347,7 @@ class WidgetMapComponent extends DataWidgetComponent {
|
|
|
1347
1347
|
})), distinctUntilChanged())
|
|
1348
1348
|
.subscribe((view) => this.map.setView(new View(view)));
|
|
1349
1349
|
this.fitOption$ = this.options$.pipe(map((options) => !!options.fit), distinctUntilChanged());
|
|
1350
|
+
this.ignoreGetCapabilitiesExtent$ = this.options$.pipe(map((options) => !!options.ignoreGetCapabilitiesExtent), distinctUntilChanged());
|
|
1350
1351
|
this.layers$ = combineLatest([
|
|
1351
1352
|
this.resultSet$,
|
|
1352
1353
|
this.options$,
|
|
@@ -1483,8 +1484,9 @@ class WidgetMapComponent extends DataWidgetComponent {
|
|
|
1483
1484
|
this.selectedIds$.pipe(distinctUntilChanged((p, c) => equal(p, c))),
|
|
1484
1485
|
this.wmsCapabilities$,
|
|
1485
1486
|
this.aggregatedExtents$,
|
|
1486
|
-
this.datasourceFilters
|
|
1487
|
-
|
|
1487
|
+
this.datasourceFilters$,
|
|
1488
|
+
this.ignoreGetCapabilitiesExtent$
|
|
1489
|
+
]).subscribe(([mapStyleLayer, layers, fit, selectedIds, capabilities, extents, filters, ignoreGetCapabilitiesExtent]) => {
|
|
1488
1490
|
const toApplyLayers = [...layers, ...mapStyleLayer];
|
|
1489
1491
|
this.map.setLayers(toApplyLayers);
|
|
1490
1492
|
this.map
|
|
@@ -1502,7 +1504,7 @@ class WidgetMapComponent extends DataWidgetComponent {
|
|
|
1502
1504
|
}
|
|
1503
1505
|
});
|
|
1504
1506
|
setTimeout(() => {
|
|
1505
|
-
this.fitMapForObjects(fit, capabilities, selectedIds, extents, filters);
|
|
1507
|
+
this.fitMapForObjects(fit, ignoreGetCapabilitiesExtent, capabilities, selectedIds, extents, filters);
|
|
1506
1508
|
this.map.updateSize();
|
|
1507
1509
|
}, 200);
|
|
1508
1510
|
}));
|
|
@@ -1612,7 +1614,7 @@ class WidgetMapComponent extends DataWidgetComponent {
|
|
|
1612
1614
|
}
|
|
1613
1615
|
}
|
|
1614
1616
|
}
|
|
1615
|
-
fitMapForObjects(fit, wmsCapabilities = {}, selectedIds, extents = [], filters = {}) {
|
|
1617
|
+
fitMapForObjects(fit, ignoreGetCapabilitiesExtent = false, wmsCapabilities = {}, selectedIds, extents = [], filters = {}) {
|
|
1616
1618
|
if (fit) {
|
|
1617
1619
|
let extent = createEmpty();
|
|
1618
1620
|
const listOfMarkers = [];
|
|
@@ -1655,7 +1657,7 @@ class WidgetMapComponent extends DataWidgetComponent {
|
|
|
1655
1657
|
}))
|
|
1656
1658
|
.filter((extent) => !!extent.extent);
|
|
1657
1659
|
const activeFilters = Object.keys(filters).filter((filter) => filters[filter].find((attr) => !!attr.value));
|
|
1658
|
-
const uniqueExtent = activeFilters.length > 0
|
|
1660
|
+
const uniqueExtent = activeFilters.length > 0 || ignoreGetCapabilitiesExtent
|
|
1659
1661
|
? extents
|
|
1660
1662
|
: extents.concat(...capabilitiesExtents.filter((capabilityExtent) => !capabilityExtent.datasource ||
|
|
1661
1663
|
!extents.find((extent) => extent.datasource === capabilityExtent.datasource)));
|