From ba2d24088cc8dc52032efc6cdb610180ce0cde14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Lafreni=C3=A8re?= <53181414+PhilippeLafreniere18@users.noreply.github.com> Date: Thu, 6 Aug 2020 15:37:18 -0400 Subject: [PATCH] fix(spatial-filter): fix spatial filter 1.4 (#697) --- .../import-export/import-export.component.html | 10 +++++----- .../import-export/import-export.component.ts | 14 +++++--------- packages/geo/src/locale/en.geo.json | 8 +++++++- packages/geo/src/locale/fr.geo.json | 8 +++++++- .../spatial-filter-tool.component.ts | 10 ++++++++-- .../import-export-tool.component.html | 4 ++-- .../import-export-tool.component.ts | 16 ++++++++-------- .../src/lib/import-export/import-export.state.ts | 6 +++--- .../map-details-tool.component.ts | 2 +- .../src/lib/map/map-tool/map-tool.component.ts | 2 +- .../src/lib/map/map-tools/map-tools.component.ts | 2 +- 11 files changed, 48 insertions(+), 34 deletions(-) diff --git a/packages/geo/src/lib/import-export/import-export/import-export.component.html b/packages/geo/src/lib/import-export/import-export/import-export.component.html index 5e5872352e..6529ebd4ce 100644 --- a/packages/geo/src/lib/import-export/import-export/import-export.component.html +++ b/packages/geo/src/lib/import-export/import-export/import-export.component.html @@ -1,6 +1,6 @@
{{'igo.geo.importExportForm.importTabTitle' | translate}} @@ -11,7 +11,7 @@
-
+
-
+

{{'igo.geo.importExportForm.importClarifications' | translate}}

-
+

{{'igo.geo.importExportForm.exportNoLayersExportable' | translate}}

-
+
{{'igo.geo.importExportForm.exportLayerPlaceholder' | translate}} diff --git a/packages/geo/src/lib/import-export/import-export/import-export.component.ts b/packages/geo/src/lib/import-export/import-export/import-export.component.ts index d725bd952a..91d1527455 100644 --- a/packages/geo/src/lib/import-export/import-export/import-export.component.ts +++ b/packages/geo/src/lib/import-export/import-export/import-export.component.ts @@ -60,7 +60,6 @@ export class ImportExportComponent implements OnDestroy, OnInit { private espgCodeRegex = new RegExp('^\\d{4,6}'); private clientSideFileSizeMax: number; - public activeImportExport: string = 'import'; public fileSizeMb: number; private previousLayerSpecs$: BehaviorSubject< @@ -74,9 +73,9 @@ export class ImportExportComponent implements OnDestroy, OnInit { @Input() map: IgoMap; - @Input() selectedIndex: number = 0; + @Input() selectedMode = 'import'; - @Output() selectedTabIndex = new EventEmitter(); + @Output() selectMode = new EventEmitter(); @Input() exportOptions$: BehaviorSubject = new BehaviorSubject( undefined @@ -96,9 +95,6 @@ export class ImportExportComponent implements OnDestroy, OnInit { ) { this.loadConfig(); this.buildForm(); - console.log(this); - console.log(this.form); - console.log(this.form); } ngOnInit() { @@ -473,8 +469,8 @@ export class ImportExportComponent implements OnDestroy, OnInit { }); } - public tabChanged(tab: MatTabChangeEvent) { - this.selectedTabIndex.emit(tab.index); + public modeChanged(mode) { + this.selectMode.emit(mode); } private onFileExportSuccess() { @@ -482,6 +478,6 @@ export class ImportExportComponent implements OnDestroy, OnInit { } onImportExportChange(event) { - this.activeImportExport = event.value; + this.selectedMode = event.value; } } diff --git a/packages/geo/src/locale/en.geo.json b/packages/geo/src/locale/en.geo.json index 75fa5d9df6..391e1636c3 100644 --- a/packages/geo/src/locale/en.geo.json +++ b/packages/geo/src/locale/en.geo.json @@ -419,7 +419,9 @@ "culturel": "Cultural", "education": "Education", "sante": "Health", - "securite": "Security" + "securite": "Security", + "sepaq": "SEPAQ", + "transport": "Transportation" } }, "terrapi": { @@ -435,6 +437,10 @@ "hydro": "Hydrography", "routes": "Roads", "bati": "Buildings", + "batiment": "Buildings", + "camping": "Camping", + "equipement": "Equipment", + "commun": "Public", "geographie": "Natural sites", "parc": "Parks", "secteur": "Sector", diff --git a/packages/geo/src/locale/fr.geo.json b/packages/geo/src/locale/fr.geo.json index 9f24681ff9..b21e4637cc 100644 --- a/packages/geo/src/locale/fr.geo.json +++ b/packages/geo/src/locale/fr.geo.json @@ -420,7 +420,9 @@ "culturel": "Culturel", "education": "Éducation", "sante": "Santé", - "securite": "Sécurité" + "securite": "Sécurité", + "sepaq": "SÉPAQ", + "transport": "Transport" } }, "terrapi": { @@ -436,6 +438,10 @@ "hydro": "Hydrographie", "routes": "Routes", "bati": "Bâtiments", + "batiment": "Bâtiments", + "camping": "Camping", + "equipement": "Équipements", + "commun": "Commun", "geographie": "Lieux naturels", "parc": "Parcs", "secteur": "Secteurs", diff --git a/packages/integration/src/lib/filter/spatial-filter-tool/spatial-filter-tool.component.ts b/packages/integration/src/lib/filter/spatial-filter-tool/spatial-filter-tool.component.ts index 5b5bd123f8..a80a2ab3c3 100644 --- a/packages/integration/src/lib/filter/spatial-filter-tool/spatial-filter-tool.component.ts +++ b/packages/integration/src/lib/filter/spatial-filter-tool/spatial-filter-tool.component.ts @@ -20,7 +20,8 @@ import { SpatialFilterQueryType, SpatialFilterThematic, Layer, - createOverlayMarkerStyle + createOverlayMarkerStyle, + ExportOptions } from '@igo2/geo'; import { EntityStore, ToolComponent } from '@igo2/common'; import olFormatGeoJSON from 'ol/format/GeoJSON'; @@ -102,7 +103,12 @@ export class SpatialFilterToolComponent { } activateExportTool() { - this.importExportState.setSelectedTab(1); + const ids = []; + for (const layer of this.layers) { + ids.push(layer.id); + } + this.importExportState.setMode('export'); + this.importExportState.setsExportOptions({ layer: ids } as ExportOptions); this.toolState.toolbox.activateTool('importExport'); } diff --git a/packages/integration/src/lib/import-export/import-export-tool/import-export-tool.component.html b/packages/integration/src/lib/import-export/import-export-tool/import-export-tool.component.html index df561ca3f5..d6d1cf6ace 100644 --- a/packages/integration/src/lib/import-export/import-export-tool/import-export-tool.component.html +++ b/packages/integration/src/lib/import-export/import-export-tool/import-export-tool.component.html @@ -1,8 +1,8 @@ diff --git a/packages/integration/src/lib/import-export/import-export-tool/import-export-tool.component.ts b/packages/integration/src/lib/import-export/import-export-tool/import-export-tool.component.ts index 1e26e4c100..001688a75e 100644 --- a/packages/integration/src/lib/import-export/import-export-tool/import-export-tool.component.ts +++ b/packages/integration/src/lib/import-export/import-export-tool/import-export-tool.component.ts @@ -32,21 +32,21 @@ export class ImportExportToolComponent implements OnInit { ) {} ngOnInit(): void { - this.selectedTab(); + this.selectMode(); } - private selectedTab() { - const userSelectedTab = this.importExportState.selectedTab$.value; - if (userSelectedTab !== undefined) { - this.importExportState.setSelectedTab(userSelectedTab); + private selectMode() { + const userSelectedMode = this.importExportState.selectedMode$.value; + if (userSelectedMode !== undefined) { + this.importExportState.setMode(userSelectedMode); } else { - this.importExportState.setSelectedTab(0); + this.importExportState.setMode('import'); } } - public tabChanged(tab: number) { - this.importExportState.setSelectedTab(tab); + public modeChanged(mode: string) { + this.importExportState.setMode(mode); } public exportOptionsChange(exportOptions: ExportOptions) { diff --git a/packages/integration/src/lib/import-export/import-export.state.ts b/packages/integration/src/lib/import-export/import-export.state.ts index c36394886a..ec8fe938e6 100644 --- a/packages/integration/src/lib/import-export/import-export.state.ts +++ b/packages/integration/src/lib/import-export/import-export.state.ts @@ -11,11 +11,11 @@ import { ExportOptions } from '@igo2/geo'; }) export class ImportExportState { - readonly selectedTab$: BehaviorSubject = new BehaviorSubject(undefined); + readonly selectedMode$: BehaviorSubject = new BehaviorSubject(undefined); readonly exportOptions$: BehaviorSubject = new BehaviorSubject(undefined); - setSelectedTab(tab: number) { - this.selectedTab$.next(tab); + setMode(mode: string) { + this.selectedMode$.next(mode); } setsExportOptions(exportOptions: ExportOptions) { diff --git a/packages/integration/src/lib/map/map-details-tool/map-details-tool.component.ts b/packages/integration/src/lib/map/map-details-tool/map-details-tool.component.ts index 953db88c65..21b5ef89d0 100644 --- a/packages/integration/src/lib/map/map-details-tool/map-details-tool.component.ts +++ b/packages/integration/src/lib/map/map-details-tool/map-details-tool.component.ts @@ -135,7 +135,7 @@ export class MapDetailsToolComponent implements OnInit { activateExport(id: string) { this.importExportState.setsExportOptions({ layer: [id] } as ExportOptions); - this.importExportState.setSelectedTab(1); + this.importExportState.setMode('export'); this.toolState.toolbox.activateTool('importExport'); } } diff --git a/packages/integration/src/lib/map/map-tool/map-tool.component.ts b/packages/integration/src/lib/map/map-tool/map-tool.component.ts index cea49518b5..2d21679d24 100644 --- a/packages/integration/src/lib/map/map-tool/map-tool.component.ts +++ b/packages/integration/src/lib/map/map-tool/map-tool.component.ts @@ -77,7 +77,7 @@ export class MapToolComponent { activateExport(id: string) { this.importExportState.setsExportOptions({ layer: [id] } as ExportOptions); - this.importExportState.setSelectedTab(1); + this.importExportState.setMode('export'); this.toolState.toolbox.activateTool('importExport'); } } diff --git a/packages/integration/src/lib/map/map-tools/map-tools.component.ts b/packages/integration/src/lib/map/map-tools/map-tools.component.ts index 6f728bcaea..68a25230ed 100644 --- a/packages/integration/src/lib/map/map-tools/map-tools.component.ts +++ b/packages/integration/src/lib/map/map-tools/map-tools.component.ts @@ -256,7 +256,7 @@ export class MapToolsComponent implements OnInit, OnDestroy { activateExport(id: string) { this.importExportState.setsExportOptions({ layer: [id] } as ExportOptions); - this.importExportState.setSelectedTab(1); + this.importExportState.setMode('export'); this.toolState.toolbox.activateTool('importExport'); }