Merge pull request #369 from PDOK/fix-url-params-in-ui

fix: url params in search UI

Author: rkettelerij

viewer/src/app/feature-view/feature-view.component.ts

@@ -1,13 +1,4 @@
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  Component,
-  ElementRef,
-  EventEmitter,
-  Input,
-  OnChanges,
-  Output,
-} from '@angular/core'
+import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, EventEmitter, Input, OnChanges, Output } from '@angular/core'
 import { Feature, Map as OLMap, MapBrowserEvent, Overlay, View } from 'ol'
 import { FeatureLike } from 'ol/Feature'
 import { defaults as defaultControls } from 'ol/control'

viewer/src/app/legend-view/legend-item/legend-item.component.ts

@@ -9,13 +9,7 @@ import { fromExtent } from 'ol/geom/Polygon'
 import VectorTileLayer from 'ol/layer/VectorTile'
 import { Projection } from 'ol/proj'
 import VectorTileSource from 'ol/source/VectorTile.js'
-import {
-  exhaustiveGuard,
-  LayerType,
-  LegendItem,
-  MapboxStyle,
-  MapboxStyleService,
-} from '../../shared/services/mapbox-style.service'
+import { exhaustiveGuard, LayerType, LegendItem, MapboxStyle, MapboxStyleService } from '../../shared/services/mapbox-style.service'
 
 @Component({
   selector: 'app-legend-item',

viewer/src/app/shared/services/feature.service.ts

@@ -82,19 +82,18 @@ export class FeatureService {
   ) {}
 
   queryFeatures(q: string, searchParams: { [key: string]: number }, crs?: string): Observable<FeatureGeoJSON[]> {
-    const params = new HttpParams().set('q', q)
+    let params = new HttpParams().set('q', q)
     if (crs) {
-      params.set('crs', crs)
+      params = params.set('crs', crs)
     }
     for (const key in searchParams) {
-      params.set(`${key}[relevance]`, searchParams[key].toString())
-      params.set(`${key}[version]`, '1')
+      params = params.append(`${key}[relevance]`, searchParams[key].toString())
+      params = params.append(`${key}[version]`, '1')
     }
     return this.http.get<FeatureCollectionGeoJSON>('search', { params }).pipe(map(res => res.features))
   }
 
   getFeatures(url: DataUrl): Observable<FeatureLike[]> {
-    this.logger.debug('Getfeatures')
     this.logger.debug(JSON.stringify(url))
     const dataproj = getProj(url.dataMapping.dataProjection)!
     this.logger.debug(dataproj.getAxisOrientation()) // Ensure the projection is initialized