@igo2/integration 19.0.0-next.13 → 19.0.0-next.15
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/fesm2022/igo2-integration.mjs +40 -13
- package/fesm2022/igo2-integration.mjs.map +1 -1
- package/lib/workspace/shared/feature-actions.service.d.ts +4 -2
- package/lib/workspace/shared/wfs-actions.service.d.ts +4 -3
- package/lib/workspace/shared/workspace.utils.d.ts +1 -1
- package/locale/en.integration.json +3 -1
- package/locale/fr.integration.json +3 -1
- package/package.json +4 -4
|
@@ -28,7 +28,7 @@ import * as i9 from '@ngx-translate/core';
|
|
|
28
28
|
import { TranslateModule } from '@ngx-translate/core';
|
|
29
29
|
import { EntityStore, EntityStoreFilterCustomFuncStrategy, EntityStoreFilterSelectionStrategy, EntityTableComponent, getEntityTitle } from '@igo2/common/entity';
|
|
30
30
|
import * as i1$1 from '@igo2/geo';
|
|
31
|
-
import { IgoMap, CatalogBrowserComponent, CatalogService, generateIdFromSourceOptions, isLayerItemOptions, CatalogItemType, CatalogLibraryComponent, StopsStore, StopsFeatureStore, RoutesFeatureStore, StepsFeatureStore, IgoDirectionsModule, FeatureStore, DrawComponent, isLayerItem, OgcFilterableItemComponent, TimeFilterItemComponent, OgcFilterableListComponent, OgcFilterableListBindingDirective, FeatureStoreSelectionStrategy, FeatureMotion, mapExtentStrategyActiveToolTip, noElementSelected, OgcFilterWidget, WfsWorkspace, FeatureWorkspace, EditionWorkspace, SpatialFilterItemType, MeasureLengthUnit, SpatialFilterType, featureToOl, createOverlayMarkerStyle, moveToOlFeatures, SpatialFilterTypeComponent, SpatialFilterItemComponent, FeatureDetailsComponent, SpatialFilterService, LayerService, TimeFilterListComponent, TimeFilterListBindingDirective, isBaseLayer, ImportExportComponent, formatScale, zoneMtm, zoneUtm, computeProjectionsConstraints, LayerListControlsEnum, sourceCanSearch, LayerViewerComponent, ExportButtonComponent, OgcFilterButtonComponent, TimeFilterButtonComponent, TrackFeatureButtonComponent, MetadataButtonComponent, SearchSourceService, LayerLegendListComponent, LayerLegendListBindingDirective, roundCoordTo, featureFromOl, measureOlGeometryLength, FEATURE, VectorLayer, StyleModalLayerButtonComponent, MeasurerComponent, PrintComponent, getCommonVectorStyle, computeOlFeaturesExtent, featuresAreOutOfView, featuresAreTooDeepInView, getCommonVectorSelectedStyle, SearchResultsComponent, SearchResultAddButtonComponent, isLayerGroup, GeoPropertiesStrategy } from '@igo2/geo';
|
|
31
|
+
import { IgoMap, CatalogBrowserComponent, CatalogService, generateIdFromSourceOptions, isLayerItemOptions, CatalogItemType, CatalogLibraryComponent, StopsStore, StopsFeatureStore, RoutesFeatureStore, StepsFeatureStore, IgoDirectionsModule, FeatureStore, DrawComponent, isLayerItem, OgcFilterableItemComponent, TimeFilterItemComponent, OgcFilterableListComponent, OgcFilterableListBindingDirective, FeatureStoreSelectionStrategy, FeatureMotion, mapExtentStrategyActiveToolTip, noElementSelected, OgcFilterWidget, InteractiveSelectionFormWidget, WfsWorkspace, FeatureWorkspace, EditionWorkspace, SpatialFilterItemType, MeasureLengthUnit, SpatialFilterType, featureToOl, createOverlayMarkerStyle, moveToOlFeatures, SpatialFilterTypeComponent, SpatialFilterItemComponent, FeatureDetailsComponent, SpatialFilterService, LayerService, TimeFilterListComponent, TimeFilterListBindingDirective, isBaseLayer, ImportExportComponent, formatScale, zoneMtm, zoneUtm, computeProjectionsConstraints, LayerListControlsEnum, sourceCanSearch, LayerViewerComponent, ExportButtonComponent, OgcFilterButtonComponent, TimeFilterButtonComponent, TrackFeatureButtonComponent, MetadataButtonComponent, SearchSourceService, LayerLegendListComponent, LayerLegendListBindingDirective, roundCoordTo, featureFromOl, measureOlGeometryLength, FEATURE, VectorLayer, StyleModalLayerButtonComponent, MeasurerComponent, PrintComponent, getCommonVectorStyle, computeOlFeaturesExtent, featuresAreOutOfView, featuresAreTooDeepInView, getCommonVectorSelectedStyle, SearchResultsComponent, SearchResultAddButtonComponent, isLayerGroup, GeoPropertiesStrategy } from '@igo2/geo';
|
|
32
32
|
import { take, switchMap, concatAll, map, toArray, skipWhile, takeUntil, tap, debounceTime, skip } from 'rxjs/operators';
|
|
33
33
|
import * as i5 from '@igo2/core/storage';
|
|
34
34
|
import { StorageScope, StorageService, StorageServiceEventEnum } from '@igo2/core/storage';
|
|
@@ -1589,7 +1589,7 @@ function handleZoomAuto(workspace, storageService) {
|
|
|
1589
1589
|
? FeatureMotion.Default
|
|
1590
1590
|
: FeatureMotion.None);
|
|
1591
1591
|
}
|
|
1592
|
-
function getWorkspaceActions(workspace, rowsInMapExtentCheckCondition$, selectOnlyCheckCondition$, ogcFilterWidget, zoomAuto$, maximize$, storageService, languageService, mediaService, toolState) {
|
|
1592
|
+
function getWorkspaceActions(workspace, rowsInMapExtentCheckCondition$, selectOnlyCheckCondition$, ogcFilterWidget, zoomAuto$, maximize$, storageService, languageService, mediaService, toolState, interactiveSelectionFormWidget) {
|
|
1593
1593
|
const actions = [
|
|
1594
1594
|
{
|
|
1595
1595
|
id: 'zoomAuto',
|
|
@@ -1666,6 +1666,19 @@ function getWorkspaceActions(workspace, rowsInMapExtentCheckCondition$, selectOn
|
|
|
1666
1666
|
},
|
|
1667
1667
|
args: [ogcFilterWidget, workspace]
|
|
1668
1668
|
},
|
|
1669
|
+
{
|
|
1670
|
+
id: 'interactiveSelect',
|
|
1671
|
+
icon: 'select-marker',
|
|
1672
|
+
title: 'igo.integration.workspace.interactiveSelection.title',
|
|
1673
|
+
tooltip: 'igo.integration.workspace.interactiveSelection.tooltip',
|
|
1674
|
+
handler: (widget, ws) => {
|
|
1675
|
+
ws.activateWidget(widget, {
|
|
1676
|
+
map: ws.map,
|
|
1677
|
+
workspace: ws
|
|
1678
|
+
});
|
|
1679
|
+
},
|
|
1680
|
+
args: [interactiveSelectionFormWidget, workspace]
|
|
1681
|
+
},
|
|
1669
1682
|
{
|
|
1670
1683
|
id: 'maximize',
|
|
1671
1684
|
title: languageService.translate.instant('igo.integration.workspace.maximize'),
|
|
@@ -1808,6 +1821,7 @@ class FeatureActionsService {
|
|
|
1808
1821
|
languageService;
|
|
1809
1822
|
toolState;
|
|
1810
1823
|
mediaService;
|
|
1824
|
+
interactiveSelectionFormWidget;
|
|
1811
1825
|
maximize$;
|
|
1812
1826
|
zoomAuto$ = new BehaviorSubject(false);
|
|
1813
1827
|
storageChange$$;
|
|
@@ -1817,11 +1831,12 @@ class FeatureActionsService {
|
|
|
1817
1831
|
get zoomAuto() {
|
|
1818
1832
|
return this.storageService.get('zoomAuto');
|
|
1819
1833
|
}
|
|
1820
|
-
constructor(storageState, languageService, toolState, mediaService) {
|
|
1834
|
+
constructor(storageState, languageService, toolState, mediaService, interactiveSelectionFormWidget) {
|
|
1821
1835
|
this.storageState = storageState;
|
|
1822
1836
|
this.languageService = languageService;
|
|
1823
1837
|
this.toolState = toolState;
|
|
1824
1838
|
this.mediaService = mediaService;
|
|
1839
|
+
this.interactiveSelectionFormWidget = interactiveSelectionFormWidget;
|
|
1825
1840
|
this.maximize$ = new BehaviorSubject(this.storageService.get('workspaceMaximize'));
|
|
1826
1841
|
}
|
|
1827
1842
|
ngOnDestroy() {
|
|
@@ -1842,9 +1857,9 @@ class FeatureActionsService {
|
|
|
1842
1857
|
this.zoomAuto$.next(this.zoomAuto);
|
|
1843
1858
|
handleZoomAuto(workspace, this.storageService);
|
|
1844
1859
|
});
|
|
1845
|
-
return getWorkspaceActions(workspace, rowsInMapExtentCheckCondition$, selectOnlyCheckCondition$, undefined, this.zoomAuto$, this.maximize$, this.storageService, this.languageService, this.mediaService, this.toolState);
|
|
1860
|
+
return getWorkspaceActions(workspace, rowsInMapExtentCheckCondition$, selectOnlyCheckCondition$, undefined, this.zoomAuto$, this.maximize$, this.storageService, this.languageService, this.mediaService, this.toolState, this.interactiveSelectionFormWidget);
|
|
1846
1861
|
}
|
|
1847
|
-
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: FeatureActionsService, deps: [{ token: StorageState }, { token: i2$1.LanguageService }, { token: ToolState }, { token: i3$1.MediaService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
1862
|
+
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: FeatureActionsService, deps: [{ token: StorageState }, { token: i2$1.LanguageService }, { token: ToolState }, { token: i3$1.MediaService }, { token: InteractiveSelectionFormWidget, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
1848
1863
|
static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: FeatureActionsService, providedIn: 'root' });
|
|
1849
1864
|
}
|
|
1850
1865
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: FeatureActionsService, decorators: [{
|
|
@@ -1852,14 +1867,20 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.5", ngImpor
|
|
|
1852
1867
|
args: [{
|
|
1853
1868
|
providedIn: 'root'
|
|
1854
1869
|
}]
|
|
1855
|
-
}], ctorParameters: () => [{ type: StorageState }, { type: i2$1.LanguageService }, { type: ToolState }, { type: i3$1.MediaService }
|
|
1870
|
+
}], ctorParameters: () => [{ type: StorageState }, { type: i2$1.LanguageService }, { type: ToolState }, { type: i3$1.MediaService }, { type: i5$1.Widget, decorators: [{
|
|
1871
|
+
type: Optional
|
|
1872
|
+
}, {
|
|
1873
|
+
type: Inject,
|
|
1874
|
+
args: [InteractiveSelectionFormWidget]
|
|
1875
|
+
}] }] });
|
|
1856
1876
|
|
|
1857
1877
|
class WfsActionsService {
|
|
1858
|
-
ogcFilterWidget;
|
|
1859
1878
|
storageState;
|
|
1860
1879
|
languageService;
|
|
1861
1880
|
mediaService;
|
|
1862
1881
|
toolState;
|
|
1882
|
+
interactiveSelectionFormWidget;
|
|
1883
|
+
ogcFilterWidget;
|
|
1863
1884
|
maximize$;
|
|
1864
1885
|
selectOnlyCheckCondition$ = new BehaviorSubject(false);
|
|
1865
1886
|
// rowsInMapExtentCheckCondition$: BehaviorSubject<boolean> = new BehaviorSubject(true);
|
|
@@ -1871,12 +1892,13 @@ class WfsActionsService {
|
|
|
1871
1892
|
get zoomAuto() {
|
|
1872
1893
|
return this.storageService.get('zoomAuto');
|
|
1873
1894
|
}
|
|
1874
|
-
constructor(
|
|
1875
|
-
this.ogcFilterWidget = ogcFilterWidget;
|
|
1895
|
+
constructor(storageState, languageService, mediaService, toolState, interactiveSelectionFormWidget, ogcFilterWidget) {
|
|
1876
1896
|
this.storageState = storageState;
|
|
1877
1897
|
this.languageService = languageService;
|
|
1878
1898
|
this.mediaService = mediaService;
|
|
1879
1899
|
this.toolState = toolState;
|
|
1900
|
+
this.interactiveSelectionFormWidget = interactiveSelectionFormWidget;
|
|
1901
|
+
this.ogcFilterWidget = ogcFilterWidget;
|
|
1880
1902
|
this.maximize$ = new BehaviorSubject(this.storageService.get('workspaceMaximize'));
|
|
1881
1903
|
}
|
|
1882
1904
|
ngOnDestroy() {
|
|
@@ -1897,9 +1919,9 @@ class WfsActionsService {
|
|
|
1897
1919
|
this.zoomAuto$.next(this.zoomAuto);
|
|
1898
1920
|
handleZoomAuto(workspace, this.storageService);
|
|
1899
1921
|
});
|
|
1900
|
-
return getWorkspaceActions(workspace, rowsInMapExtentCheckCondition$, selectOnlyCheckCondition$, this.ogcFilterWidget, this.zoomAuto$, this.maximize$, this.storageService, this.languageService, this.mediaService, this.toolState);
|
|
1922
|
+
return getWorkspaceActions(workspace, rowsInMapExtentCheckCondition$, selectOnlyCheckCondition$, this.ogcFilterWidget, this.zoomAuto$, this.maximize$, this.storageService, this.languageService, this.mediaService, this.toolState, this.interactiveSelectionFormWidget);
|
|
1901
1923
|
}
|
|
1902
|
-
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: WfsActionsService, deps: [{ token:
|
|
1924
|
+
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: WfsActionsService, deps: [{ token: StorageState }, { token: i2$1.LanguageService }, { token: i3$1.MediaService }, { token: ToolState }, { token: InteractiveSelectionFormWidget, optional: true }, { token: OgcFilterWidget, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
1903
1925
|
static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: WfsActionsService, providedIn: 'root' });
|
|
1904
1926
|
}
|
|
1905
1927
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.5", ngImport: i0, type: WfsActionsService, decorators: [{
|
|
@@ -1907,12 +1929,17 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.5", ngImpor
|
|
|
1907
1929
|
args: [{
|
|
1908
1930
|
providedIn: 'root'
|
|
1909
1931
|
}]
|
|
1910
|
-
}], ctorParameters: () => [{ type: i5$1.Widget, decorators: [{
|
|
1932
|
+
}], ctorParameters: () => [{ type: StorageState }, { type: i2$1.LanguageService }, { type: i3$1.MediaService }, { type: ToolState }, { type: i5$1.Widget, decorators: [{
|
|
1933
|
+
type: Optional
|
|
1934
|
+
}, {
|
|
1935
|
+
type: Inject,
|
|
1936
|
+
args: [InteractiveSelectionFormWidget]
|
|
1937
|
+
}] }, { type: i5$1.Widget, decorators: [{
|
|
1911
1938
|
type: Optional
|
|
1912
1939
|
}, {
|
|
1913
1940
|
type: Inject,
|
|
1914
1941
|
args: [OgcFilterWidget]
|
|
1915
|
-
}] }
|
|
1942
|
+
}] }] });
|
|
1916
1943
|
|
|
1917
1944
|
/**
|
|
1918
1945
|
* Service that holds the state of the workspace module
|