feat(spatial-filter): link spatial filter to export tool (#662)

Co-authored-by: Marc-André Barbeau <marc-andre.barbeau@msp.gouv.qc.ca>
infra-geo-ouverte · Jun 8, 2020 · 2ac67f1 · 2ac67f1
1 parent 7a26ddc
commit 2ac67f1
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 6 deletions.
diff --git a/.../geo/src/lib/filter/spatial-filter/spatial-filter-item/spatial-filter-item.component.html b/.../geo/src/lib/filter/spatial-filter/spatial-filter-item/spatial-filter-item.component.html
@@ -121,11 +121,14 @@
     {{'igo.geo.spatialFilter.goSearch' | translate}}
   </button>
 
-  <button *ngIf="selectedSourceAddress || selectedThematics" mat-raised-button class="remove-button"
-    [disabled]="!layers.length" (click)="clearButton()">
+  <button mat-raised-button class="remove-button" [disabled]="!store.entities$.getValue().length" (click)="clearButton()">
     {{'igo.geo.spatialFilter.removeLayer' | translate}}
   </button>
 
+  <button mat-raised-button class="export-button" [disabled]="!store.entities$.getValue().length" (click)="export.emit()">
+    {{'igo.geo.spatialFilter.exportLayer' | translate}}
+  </button>
+
 </div>
 
 <div class="results" *ngIf="store">

diff --git a/.../geo/src/lib/filter/spatial-filter/spatial-filter-item/spatial-filter-item.component.scss b/.../geo/src/lib/filter/spatial-filter/spatial-filter-item/spatial-filter-item.component.scss
@@ -52,8 +52,7 @@
 }
 
 .remove-button {
-    left: 75px;
-    margin: 15px;
+    margin: 12px;
     width: 150px;
 }
 

diff --git a/...es/geo/src/lib/filter/spatial-filter/spatial-filter-item/spatial-filter-item.component.ts b/...es/geo/src/lib/filter/spatial-filter/spatial-filter-item/spatial-filter-item.component.ts
@@ -147,6 +147,8 @@ export class SpatialFilterItemComponent implements OnDestroy, OnInit {
 
   @Output() clearSearchEvent = new EventEmitter();
 
+  @Output() export = new EventEmitter();
+
   public itemType: SpatialFilterItemType[] = [SpatialFilterItemType.Address, SpatialFilterItemType.Thematics];
   public selectedItemType: SpatialFilterItemType = SpatialFilterItemType.Address;
   public selectedSourceAddress;

diff --git a/packages/geo/src/locale/en.geo.json b/packages/geo/src/locale/en.geo.json
@@ -377,6 +377,7 @@
         "layer": "Layer",
         "goSearch": "Launch research",
         "removeLayer": "Remove results",
+        "exportLayer": "Export results",
         "clearForm": "Remove draw",
         "clearSearch": "Reset",
         "Address": "Addresses",

diff --git a/packages/geo/src/locale/fr.geo.json b/packages/geo/src/locale/fr.geo.json
@@ -379,6 +379,7 @@
         "layer": "Couche",
         "goSearch": "Lancer la recherche",
         "removeLayer": "Retirer les résultats",
+        "exportLayer": "Exporter les résultats",
         "clearForm": "Retirer le dessin",
         "clearSearch": "Réinitialiser",
         "Address": "Adresses",

diff --git a/packages/integration/src/lib/filter/spatial-filter-tool/spatial-filter-tool.component.html b/packages/integration/src/lib/filter/spatial-filter-tool/spatial-filter-tool.component.html
@@ -23,7 +23,8 @@
     (thematicChange)="thematics = $event"
     (toggleSearch)="getOutputToggleSearch()"
     (clearButtonEvent)="layers = $event"
-    (clearSearchEvent)="getOutputClearSearch()">
+    (clearSearchEvent)="getOutputClearSearch()"
+    (export)="activateExportTool()">
   </igo-spatial-filter-item>
 </igo-panel>
 

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
@@ -26,8 +26,10 @@ import { EntityStore, ToolComponent } from '@igo2/common';
 import olFormatGeoJSON from 'ol/format/GeoJSON';
 import { BehaviorSubject } from 'rxjs';
 import { MapState } from '../../map/map.state';
+import { ImportExportState } from './../../import-export/import-export.state';
 import * as olstyle from 'ol/style';
 import { MessageService, LanguageService } from '@igo2/core';
+import { ToolState } from '../../tool/tool.state';
 
 /**
  * Tool to apply spatial filter
@@ -81,7 +83,9 @@ export class SpatialFilterToolComponent {
     private layerService: LayerService,
     private mapState: MapState,
     private messageService: MessageService,
-    private languageService: LanguageService
+    private languageService: LanguageService,
+    private importExportState: ImportExportState,
+    private toolState: ToolState
   ) {}
 
   getOutputType(event: SpatialFilterType) {
@@ -97,6 +101,11 @@ export class SpatialFilterToolComponent {
     }
   }
 
+  activateExportTool() {
+    this.importExportState.setSelectedTab(1);
+    this.toolState.toolbox.activateTool('importExport');
+  }
+
   private loadFilterList() {
     this.spatialFilterService
       .loadFilterList(this.queryType)