Merge pull request #464 from stuartwoodman/AUS-4297-Search-Filter-Issues

AUS-4297 Search Filter Issues
AuScope · Dec 6, 2024 · 451f5c0 · 451f5c0
2 parents cffc464 + 8faa3ae
commit 451f5c0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/app/menupanel/search/searchpanel.component.ts b/src/app/menupanel/search/searchpanel.component.ts
@@ -1,7 +1,7 @@
 import { Component, ElementRef, HostListener, Inject, OnInit, ViewChild } from '@angular/core';
 import { RectangleEditorObservable } from '@auscope/angular-cesium';
 
-import { Bbox, CSWRecordModel, CsMapService, LayerHandlerService, LayerModel, ManageStateService, RenderStatusService, UtilitiesService, Constants } from '@auscope/portal-core-ui';
+import { Bbox, CSWRecordModel, CsMapService, LayerHandlerService, LayerModel, RenderStatusService, UtilitiesService, Constants } from '@auscope/portal-core-ui';
 import { NgbDropdown, NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { SearchService } from 'app/services/search/search.service';
 import { Observable, Subject, Subscription } from 'rxjs';
@@ -61,11 +61,11 @@ const OGC_SERVICES = [
     checked: true
   }, {
     name: 'IRIS',
-    fields: ['OGC:IRIS'],
+    fields: ['iris'],
     checked: true
   }, {
     name: "KML",
-    fields: ['OGC:KML'],
+    fields: ['kml'],
     checked: true
   }, {
     name: 'WFS',
@@ -77,7 +77,7 @@ const OGC_SERVICES = [
     checked: true
   }, {
     name: 'WWW',
-    fields: ['OGC:WWW'],
+    fields: ['OGC:WWW', 'WWW:LINK-1.0-http--link'],
     checked: true
   }]
 
@@ -144,8 +144,7 @@ export class SearchPanelComponent implements OnInit {
   constructor(private searchService: SearchService, private csMapService: CsMapService,
               private layerHandlerService: LayerHandlerService, private layerManagerService: LayerManagerService,
               private uiLayerModelService: UILayerModelService, private renderStatusService: RenderStatusService,
-              private sidebarService: SidebarService,
-              private manageStateService: ManageStateService, private modalService: NgbModal,
+              private sidebarService: SidebarService, private modalService: NgbModal,
               private http: HttpClient, @Inject('env') private env) { }
 
   ngOnInit() {
@@ -712,10 +711,12 @@ export class SearchPanelComponent implements OnInit {
 
     // OGC services if selected
     const selectedServices: string[] = [];
-    const checkedServices = this.ogcServices.filter(s => s.checked === true);
-    if (checkedServices.length < OGC_SERVICES.length) {
+    if (!this.allOGCServices.checked) {
+      const checkedServices = this.ogcServices.filter(s => s.checked === true);
       for (const service of checkedServices) {
-        selectedServices.push(service.fields[0]);
+        for (const serviceField of service.fields) {
+          selectedServices.push(serviceField);
+        }
       }
     }
 

diff --git a/src/app/modalwindow/querier/customanalytic/nvcl/nvcl.datasetlist.component.ts b/src/app/modalwindow/querier/customanalytic/nvcl/nvcl.datasetlist.component.ts
@@ -220,7 +220,7 @@ export class NVCLDatasetListComponent implements OnInit {
     this.nvclService.getNVCL2_0_Images(url, datasetId).subscribe(trayImages => {
       for (const trayImage of trayImages) {
         if (trayImage.logName === 'Tray Thumbnail Images') {
-          this.datasetImages[datasetId] = []
+          this.datasetImages[datasetId] = [];
           let httpParams = new HttpParams();
           // httpParams = httpParams.append('serviceUrl', this.nvclService.getNVCLDataServiceUrl(this.onlineResource.url));
           // httpParams = httpParams.append('logId', trayImage.logId);