Skip to content

Commit

Permalink
Merge branch 'displacement' into will/displacement
Browse files Browse the repository at this point in the history
  • Loading branch information
@williamh890
williamh890 committed Sep 24, 2024
2 parents 80b645b + 4ce2138 commit b279166
Show file tree
Hide file tree
Showing 24 changed files with 456 additions and 180 deletions.
237 changes: 128 additions & 109 deletions src/app/app.component.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, OnInit, OnDestroy, AfterViewInit, ViewChild, Inject } from '@angular/core';
import { Component, OnInit, OnDestroy, AfterViewInit, ViewChild, Inject } from '@angular/core';
import { TranslateService } from '@ngx-translate/core';
import { MatSidenav } from '@angular/material/sidenav';
import { MatIconRegistry } from '@angular/material/icon';
Expand Down Expand Up @@ -34,20 +34,20 @@ import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, NativeDateAdapter } fro
import { MAT_MOMENT_DATE_FORMATS } from "@angular/material-moment-adapter";

@Component({
selector : 'app-root',
selector: 'app-root',
templateUrl: './app.component.html',
styleUrls : ['./app.component.scss'],
styleUrls: ['./app.component.scss'],
providers: [
{
provide: DateAdapter,
useClass: NativeDateAdapter
},
{provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS},
{provide: MAT_DATE_LOCALE, useValue: 'en'},
{ provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS },
{ provide: MAT_DATE_LOCALE, useValue: 'en' },
]
})
export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
@ViewChild('sidenav', {static: true}) sidenav: MatSidenav;
@ViewChild('sidenav', { static: true }) sidenav: MatSidenav;

private queueStateKey = 'asf-queue-state-v1';
private customProductsQueueStateKey = 'asf-custom-products-queue-state-v2';
Expand Down Expand Up @@ -91,12 +91,13 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
private mapService: services.MapService,
private hyp3Service: services.Hyp3Service,
private themeService: services.ThemingService,
private drawService: services.DrawService,
public translate: TranslateService,
public language: services.AsfLanguageService,
public _adapter: DateAdapter<any>,
private titleService: Title,
@Inject(MAT_DATE_LOCALE) public _locale: string,
) {}
) { }

public ngOnInit(): void {
this.store$.dispatch(new hyp3Store.LoadCosts());
Expand Down Expand Up @@ -125,89 +126,89 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
);

this.subs.add(
this.store$.select(uiStore.getHelpDialogTopic).subscribe(topic => {
const previousTopic = this.helpTopic;
this.helpTopic = topic;
this.store$.select(uiStore.getHelpDialogTopic).subscribe(topic => {
const previousTopic = this.helpTopic;
this.helpTopic = topic;

if (!topic || !!previousTopic) {
return;
}

window.dataLayer = window.dataLayer || [];
window.dataLayer.push({
'event': 'open-help',
'open-help': topic
});

const ref = this.dialog.open(HelpComponent, {
panelClass: 'help-panel-config',
data: {helpTopic: topic},
width: '80vw',
height: '80vh',
maxWidth: '100%',
maxHeight: '100%'
});
if (!topic || !!previousTopic) {
return;
}

ref.afterClosed().subscribe(_ => {
this.store$.dispatch(new uiStore.SetHelpDialogTopic(null));
});
})
window.dataLayer = window.dataLayer || [];
window.dataLayer.push({
'event': 'open-help',
'open-help': topic
});

const ref = this.dialog.open(HelpComponent, {
panelClass: 'help-panel-config',
data: { helpTopic: topic },
width: '80vw',
height: '80vh',
maxWidth: '100%',
maxHeight: '100%'
});

ref.afterClosed().subscribe(_ => {
this.store$.dispatch(new uiStore.SetHelpDialogTopic(null));
});
})
);

this.subs.add(
this.store$.select(uiStore.getIsDownloadQueueOpen).subscribe(isDownloadQueueOpen => {
if (!isDownloadQueueOpen) {
return;
}

this.store$.dispatch(new hyp3Store.LoadUser());

window.dataLayer = window.dataLayer || [];
window.dataLayer.push({
'event': 'open-download-queue',
'open-download-queue': this.numberQueuedProducts
});

const ref = this.dialog.open(QueueComponent, {
id: 'dlQueueDialog',
maxWidth: '100vw',
maxHeight: '100vh'
});
this.store$.select(uiStore.getIsDownloadQueueOpen).subscribe(isDownloadQueueOpen => {
if (!isDownloadQueueOpen) {
return;
}

this.subs.add(
ref.afterClosed().subscribe(
_ => this.store$.dispatch(new uiStore.SetIsDownloadQueueOpen(null))
)
);
})
this.store$.dispatch(new hyp3Store.LoadUser());

window.dataLayer = window.dataLayer || [];
window.dataLayer.push({
'event': 'open-download-queue',
'open-download-queue': this.numberQueuedProducts
});

const ref = this.dialog.open(QueueComponent, {
id: 'dlQueueDialog',
maxWidth: '100vw',
maxHeight: '100vh'
});

this.subs.add(
ref.afterClosed().subscribe(
_ => this.store$.dispatch(new uiStore.SetIsDownloadQueueOpen(null))
)
);
})
);

this.subs.add(
this.store$.select(uiStore.getIsOnDemandQueueOpen).subscribe(isOnDemandQueueOpen => {
if (!isOnDemandQueueOpen) {
return;
}

this.store$.dispatch(new hyp3Store.LoadUser());

window.dataLayer = window.dataLayer || [];
window.dataLayer.push({
'event': 'open-processing-queue',
'open-processing-queue': this.queuedCustomProducts.length
});

const ref = this.dialog.open(ProcessingQueueComponent, {
id: 'processingQueueDialog',
maxWidth: '100vw',
maxHeight: '100vh'
});
this.store$.select(uiStore.getIsOnDemandQueueOpen).subscribe(isOnDemandQueueOpen => {
if (!isOnDemandQueueOpen) {
return;
}

this.subs.add(
ref.afterClosed().subscribe(
_ => this.store$.dispatch(new uiStore.SetIsOnDemandQueueOpen(null))
)
);
})
this.store$.dispatch(new hyp3Store.LoadUser());

window.dataLayer = window.dataLayer || [];
window.dataLayer.push({
'event': 'open-processing-queue',
'open-processing-queue': this.queuedCustomProducts.length
});

const ref = this.dialog.open(ProcessingQueueComponent, {
id: 'processingQueueDialog',
maxWidth: '100vw',
maxHeight: '100vh'
});

this.subs.add(
ref.afterClosed().subscribe(
_ => this.store$.dispatch(new uiStore.SetIsOnDemandQueueOpen(null))
)
);
})
);

this.store$.dispatch(new uiStore.LoadBanners());
Expand Down Expand Up @@ -253,8 +254,8 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
this.language.setProfileLanguage(profile.language);
this.isAutoTheme = profile.theme === 'System Preferences';

const presets = Object.entries(profile.defaultFilterPresets).map(([_, val2]) => val2).filter(val2 =>val2 !== '')
if(isDefaultSearch && presets.length > 0) {
const presets = Object.entries(profile.defaultFilterPresets).map(([_, val2]) => val2).filter(val2 => val2 !== '')
if (isDefaultSearch && presets.length > 0) {
this.loadDefaultFilters(profile)
}
})
Expand All @@ -270,19 +271,19 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
this.store$.dispatch(new hyp3Store.LoadCosts());
this.store$.dispatch(new hyp3Store.LoadUser());
}
)
)
);

this.subs.add(
this.actions$.pipe(
ofType<userStore.SetProfile>(userStore.UserActionType.SET_PROFILE),
withLatestFrom(this.urlStateService.isDefaultSearch$),
filter(([action, isDefaultSearch]) => {
const hasCustomDefaults = Object.entries(action.payload.defaultFilterPresets).map(([_, val2]) => val2).filter(val2 =>val2 !== '').length > 0
return isDefaultSearch && hasCustomDefaults;
}),
map(([action, _]) => action.payload.defaultFilterPresets)
).subscribe( defaultFilters =>
ofType<userStore.SetProfile>(userStore.UserActionType.SET_PROFILE),
withLatestFrom(this.urlStateService.isDefaultSearch$),
filter(([action, isDefaultSearch]) => {
const hasCustomDefaults = Object.entries(action.payload.defaultFilterPresets).map(([_, val2]) => val2).filter(val2 => val2 !== '').length > 0
return isDefaultSearch && hasCustomDefaults;
}),
map(([action, _]) => action.payload.defaultFilterPresets)
).subscribe(defaultFilters =>
this.store$.dispatch(new filterStore.SetDefaultFilters(defaultFilters))
)
);
Expand Down Expand Up @@ -359,9 +360,9 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
this.store$.select(queueStore.getQueuedJobs),
this.store$.select(hyp3Store.getProcessingOptions)]
).subscribe(
([jobs, options]) => localStorage.setItem(
this.customProductsQueueStateKey, JSON.stringify({jobs, options})
)
([jobs, options]) => localStorage.setItem(
this.customProductsQueueStateKey, JSON.stringify({ jobs, options })
)
)
);

Expand All @@ -381,7 +382,7 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
})
).subscribe(
(mode) => {
this.store$.dispatch(new mapStore.SetMapInteractionMode(mode));
this.store$.dispatch(new mapStore.SetMapInteractionMode(mode));
})
);

Expand Down Expand Up @@ -437,6 +438,24 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
this.domSanitizer.bypassSecurityTrustResourceUrl(`../assets/icons/${iconName}.svg`)
);
});

this.subs.add(
combineLatest(
[
this.drawService.polygon$,
this.store$.select(searchStore.getSearchType),
this.store$.select(uiStore.getIsResultsMenuOpen),
this.store$.select(scenesStore.getAreResultsLoaded)
]).pipe(
filter(([_, searchType, _resultsOpen, resultsLoaded]) => searchType == SearchType.DISPLACEMENT && !resultsLoaded)
).subscribe(([polygon, _, __]) => {
if (polygon) {
if (polygon.getGeometry().getType() === 'Point') {
this.store$.dispatch(new searchStore.MakeSearch());
this.store$.dispatch(new scenesStore.SetResultsLoaded(true))
}
}
}))
}

public ngAfterViewInit(): void {
Expand Down Expand Up @@ -489,7 +508,7 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
const queueItemsStr = localStorage.getItem(this.customProductsQueueStateKey);

if (queueItemsStr) {
const {jobs, options} = JSON.parse(queueItemsStr);
const { jobs, options } = JSON.parse(queueItemsStr);
this.store$.dispatch(new queueStore.AddJobs(jobs));
if (this.areOptionsByJobType(options)) {
this.store$.dispatch(new hyp3Store.SetProcessingOptions(options));
Expand Down Expand Up @@ -522,8 +541,8 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
private updateMaxSearchResults(): void {
const checkAmount = this.searchParams$.getlatestParams.pipe(
distinctUntilChanged((previous, current) => {
for(let key of Object.keys(previous)) {
if(previous[key] !== current[key]) {
for (let key of Object.keys(previous)) {
if (previous[key] !== current[key]) {
return false;
}
}
Expand All @@ -532,7 +551,7 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
debounceTime(200),
filter(_ => this.searchType !== SearchType.SARVIEWS_EVENTS
&& this.searchType !== SearchType.CUSTOM_PRODUCTS),
map(params => ({...params, output: 'COUNT'})),
map(params => ({ ...params, output: 'COUNT' })),
tap(_ =>
this.store$.dispatch(new searchStore.SearchAmountLoading())
),
Expand All @@ -541,15 +560,15 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
return this.sarviewsService.filteredSarviewsEvents$().pipe(map(events => events.length));
}
return this.asfSearchApi.query<any[]>(params).pipe(
catchError(resp => {
const { error } = resp;
if (!resp.ok || error && error.includes('VALIDATION_ERROR')) {
return of(0);
}

return of(-1);
})
);
catchError(resp => {
const { error } = resp;
if (!resp.ok || error && error.includes('VALIDATION_ERROR')) {
return of(0);
}

return of(-1);
})
);
}
),
);
Expand Down Expand Up @@ -607,7 +626,7 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
}

private errorBanner(): models.Banner {
return {
return {
id: 'Error',
text: 'ASF is experiencing errors loading data. Please try again later.',
name: 'Error',
Expand Down
4 changes: 2 additions & 2 deletions ...pp/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<mat-radio-button color="primary" (click)="onPointClick($index)" [checked]="$index === pointHistoryService.selectedPoint">
<mat-icon class="ts-wkt-icon">place</mat-icon>
<span class="ts-wkt-text">
{{point.flatCoordinates[0] | floatPrecision: 2}},&ensp;{{point.flatCoordinates[1] | floatPrecision: 2}}
{{point.flatCoordinates[1] | floatPrecision: 2}},&ensp;{{point.flatCoordinates[0] | floatPrecision: 2}}
</span>
</mat-radio-button>
}
Expand Down Expand Up @@ -121,7 +121,7 @@
</div>

<div class="ts-chart-row">
<div id="ts-chart-column" class="ts-column-2">
<div id="ts-chart-column">
<app-timeseries-chart
[zoomIn$]="zoomInChart$"
[zoomToFit$]="zoomToFitChart$"
Expand Down
Loading

0 comments on commit b279166

Please sign in to comment.