Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AUS-4297 Search Filter Issues #464

Merged
merged 1 commit into from
Dec 6, 2024
Merged

AUS-4297 Search Filter Issues #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions src/app/menupanel/search/searchpanel.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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',
Expand All @@ -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
}]

Expand Down Expand Up @@ -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() {
Expand Down Expand Up @@ -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);
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/app/modalwindow/querier/customanalytic/nvcl/nvcl.datasetlist.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading