fix(routing): Disable queryLayers on routing and reactivate on destroy (

#217) * refactor(query) moving queryLayers from directive to service * fix(routing) Disable queryLayers on routing and reactivate on destroy * refactor(*) ling and cleaning
infra-geo-ouverte · Nov 1, 2018 · f7f3989 · f7f3989
1 parent 9a2abf9
commit f7f3989
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/projects/geo/src/lib/query/shared/query.directive.ts b/projects/geo/src/lib/query/shared/query.directive.ts
@@ -31,7 +31,6 @@ import { QueryService } from './query.service';
   selector: '[igoQuery]'
 })
 export class QueryDirective implements AfterViewInit, OnDestroy {
-  private queryLayers: Layer[];
   private queryLayers$$: Subscription;
   private queries$$: Subscription[] = [];
 
@@ -91,7 +90,7 @@ export class QueryDirective implements AfterViewInit, OnDestroy {
       }
     });
 
-    this.queryLayers = queryLayers;
+    this.queryService.queryLayers = queryLayers;
   }
 
   private manageFeatureByClick(
@@ -174,7 +173,7 @@ export class QueryDirective implements AfterViewInit, OnDestroy {
       delete element.properties['clickedTitle'];
     });
     const view = this.map.ol.getView();
-    const queries$ = this.queryService.query(this.queryLayers, {
+    const queries$ = this.queryService.query(this.queryService.queryLayers, {
       coordinates: event.coordinate,
       projection: this.map.projection,
       resolution: view.getResolution()

diff --git a/projects/geo/src/lib/query/shared/query.service.ts b/projects/geo/src/lib/query/shared/query.service.ts
@@ -33,6 +33,7 @@ import { QueryOptions, QueryableDataSource } from './query.interface';
   providedIn: 'root'
 })
 export class QueryService {
+  public queryLayers: Layer[];
   constructor(
     private http: HttpClient,
     private featureService: FeatureService

diff --git a/projects/geo/src/lib/routing/routing-form/routing-form.component.ts b/projects/geo/src/lib/routing/routing-form/routing-form.component.ts
@@ -32,6 +32,8 @@ import { Routing } from '../shared/routing.interface';
 import { RoutingService } from '../shared/routing.service';
 import { RoutingFormService } from './routing-form.service';
 
+import { QueryService } from '../../query/shared/query.service';
+
 @Component({
   selector: 'igo-routing-form',
   templateUrl: './routing-form.component.html',
@@ -59,6 +61,8 @@ export class RoutingFormComponent implements OnInit, AfterViewInit, OnDestroy {
   public initialStopsCoords;
   private browserLanguage;
 
+  private queryLayersOnInit;
+
   // https://stackoverflow.com/questions/46364852/create-input-fields-dynamically-in-angular-2
 
   @Input()
@@ -104,6 +108,7 @@ export class RoutingFormComponent implements OnInit, AfterViewInit, OnDestroy {
     private languageService: LanguageService,
     private messageService: MessageService,
     private searchService: SearchService,
+    private queryService: QueryService,
     private routingFormService: RoutingFormService,
     @Optional() private route: RouteService
   ) {}
@@ -113,6 +118,7 @@ export class RoutingFormComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   ngOnDestroy(): void {
+    this.queryService.queryLayers = this.queryLayersOnInit;
     const stopCoordinates = [];
 
     this.stops.value.forEach(stop => {
@@ -141,6 +147,8 @@ export class RoutingFormComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   ngAfterViewInit(): void {
+    this.queryLayersOnInit = this.queryService.queryLayers;
+    this.queryService.queryLayers = [];
     this.focusOnStop = false;
     const stopsLayer = new VectorLayer({
       title: 'routingStopOverlay',