diff --git a/.github/workflows/deploy-displacement.yml b/.github/workflows/deploy-displacement.yml new file mode 100644 index 000000000..edf34a59a --- /dev/null +++ b/.github/workflows/deploy-displacement.yml @@ -0,0 +1,26 @@ +name: Deploy Displacement SearchUI + +on: + push: + branches: + - displacement + +jobs: + deploy: + runs-on: ubuntu-latest + environment: displacement + permissions: + id-token: write + contents: read + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: build + uses: ./.github/workflows/search-ui-deploy-composite + with: + maturity: ${{ vars.MATURITY }} + cdn-id: ${{ vars.CDN_ID }} + s3-bucket: ${{ vars.S3_BUCKET }} + aws-account-id: ${{ secrets.AWS_ACCOUNT_ID }} diff --git a/.gitignore b/.gitignore index f8b7f38f2..d5d09e198 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ # dependencies /node_modules - +bun.lockb # IDEs and editors /.idea .project diff --git a/angular.json b/angular.json index 9a7e6c912..f6864aa14 100644 --- a/angular.json +++ b/angular.json @@ -87,9 +87,14 @@ "extractLicenses": true, "vendorChunk": false, "buildOptimizer": true + }, + "local": { + "sourceMap": true, + "optimization": false, + "extractLicenses": false } }, - "defaultConfiguration": "" + "defaultConfiguration": "production" }, "serve": { "builder": "@angular-devkit/build-angular:dev-server", @@ -99,6 +104,9 @@ "configurations": { "production": { "buildTarget": "search-ui:build:production" + }, + "local": { + "buildTarget": "search-ui:build:local" } } }, diff --git a/build/github-actions-oidc.yml b/build/github-actions-oidc.yml index 3723cbfc2..d255ea48c 100644 --- a/build/github-actions-oidc.yml +++ b/build/github-actions-oidc.yml @@ -42,22 +42,10 @@ Resources: - s3:ListBucket - s3:PutObject Resource: - - arn:aws:s3:::asf-search-ui-dev - - arn:aws:s3:::asf-search-ui-dev/* - - arn:aws:s3:::asf-search-ui-test - - arn:aws:s3:::asf-search-ui-test/* + - arn:aws:s3:::asf-search-* + - arn:aws:s3:::asf-search-*/* - arn:aws:s3:::search-ui-custom-deployments - arn:aws:s3:::search-ui-custom-deployments/* - - arn:aws:s3:::asf-search-ui-4 - - arn:aws:s3:::asf-search-ui-4/* - - arn:aws:s3:::asf-search-ui-3 - - arn:aws:s3:::asf-search-ui-3/* - - arn:aws:s3:::asf-search-ui-2 - - arn:aws:s3:::asf-search-ui-2/* - - arn:aws:s3:::asf-search-ui-1 - - arn:aws:s3:::asf-search-ui-1/* - - arn:aws:s3:::asf-search-ui-andy-2 - - arn:aws:s3:::asf-search-ui-andy-2/* - PolicyName: CloudfrontInvalidation PolicyDocument: Version: '2012-10-17' diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 1c8d38dd1..97ce40adf 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit, OnDestroy, AfterViewInit, ViewChild, Inject } from '@angular/core'; +import { Component, OnInit, OnDestroy, AfterViewInit, ViewChild, Inject, HostListener } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { MatSidenav } from '@angular/material/sidenav'; import { MatIconRegistry } from '@angular/material/icon'; @@ -18,6 +18,7 @@ import { HelpComponent } from '@components/help/help.component'; import { AppState } from '@store'; import * as scenesStore from '@store/scenes'; +import * as chartsStore from '@store/charts'; import * as filterStore from '@store/filters'; import * as searchStore from '@store/search'; import * as uiStore from '@store/ui'; @@ -34,20 +35,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'; @@ -67,6 +68,8 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit { public interactionTypes = models.MapInteractionModeType; public searchType: models.SearchType; + public kioskMode = false; + private helpTopic: string | null; private subs = new SubSink(); @@ -91,14 +94,22 @@ 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, private titleService: Title, + private pointHistoryService: services.PointHistoryService, @Inject(MAT_DATE_LOCALE) public _locale: string, - ) {} - + ) { } + + @HostListener('window:keydown.control./', ['$event']) + handleKeyDown(_event: KeyboardEvent) { + console.log('Toggling kiosk mode. Use "ctrl+/" to re-toggle') + this.store$.dispatch(new searchStore.setSearchKioskMode(!this.kioskMode)) + } public ngOnInit(): void { + console.log('To toggle kiosk mode, use "ctrl+/"') this.store$.dispatch(new hyp3Store.LoadCosts()); this.subs.add( @@ -125,89 +136,92 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit { ); this.subs.add( - 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 - }); + this.store$.select(searchStore.getKioskMode).subscribe(kioskMode => this.kioskMode = kioskMode) + ) + this.subs.add( + this.store$.select(uiStore.getHelpDialogTopic).subscribe(topic => { + const previousTopic = this.helpTopic; + this.helpTopic = 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()); @@ -253,8 +267,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) } }) @@ -270,19 +284,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.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.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)) ) ); @@ -359,9 +373,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 }) + ) ) ); @@ -381,7 +395,7 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit { }) ).subscribe( (mode) => { - this.store$.dispatch(new mapStore.SetMapInteractionMode(mode)); + this.store$.dispatch(new mapStore.SetMapInteractionMode(mode)); }) ); @@ -437,6 +451,41 @@ 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]) => { + // TODO: this seems to sometimes not work, sometimes clearing isn't actually setting resultsLoaded to false + return 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)) + } + } + })) + + + this.subs.add(this.store$.select(chartsStore.getTimeseriesChartStates).pipe( + withLatestFrom(this.pointHistoryService.history$) + ).subscribe(([chartStates, history]) => { + if(Object.keys(chartStates).length === history.length) { + let data = [] + + for (const p of history) { + data.push({ point: p.point, seriesNumber: chartStates[p.wkt].seriesNumber, color: chartStates[p.wkt].color }) + } + this.mapService.setDisplacementLayer(data); + } + + })); } public ngAfterViewInit(): void { @@ -450,6 +499,7 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit { } public onClearSearch(): void { + this.pointHistoryService.clear(); this.store$.dispatch(new scenesStore.ClearScenes()); this.store$.dispatch(new scenesStore.SetSelectedSarviewsEvent('')); this.mapService.clearDrawLayer(); @@ -489,7 +539,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)); @@ -522,8 +572,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; } } @@ -531,8 +581,10 @@ 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'})), + && this.searchType !== SearchType.CUSTOM_PRODUCTS + && this.searchType !== SearchType.DISPLACEMENT + ), + map(params => ({ ...params, output: 'COUNT' })), tap(_ => this.store$.dispatch(new searchStore.SearchAmountLoading()) ), @@ -541,15 +593,15 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit { return this.sarviewsService.filteredSarviewsEvents$().pipe(map(events => events.length)); } return this.asfSearchApi.query(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); + }) + ); } ), ); @@ -607,7 +659,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', diff --git a/src/app/components/filters-dropdown/filters-dropdown.component.html b/src/app/components/filters-dropdown/filters-dropdown.component.html index 9e17fbc62..45fb71ca7 100644 --- a/src/app/components/filters-dropdown/filters-dropdown.component.html +++ b/src/app/components/filters-dropdown/filters-dropdown.component.html @@ -33,6 +33,10 @@ {{ 'EVENT_SEARCH' | translate }} + + @if(selectedSearchType === searchTypes.DISPLACEMENT) { + {{ 'DISPLACEMENT_SEARCH' | translate }} + } @@ -62,6 +66,9 @@ + @if(selectedSearchType === searchTypes.DISPLACEMENT) { + + }
diff --git a/src/app/components/filters-dropdown/filters-dropdown.module.ts b/src/app/components/filters-dropdown/filters-dropdown.module.ts index 0498a9e66..bc5ca385b 100644 --- a/src/app/components/filters-dropdown/filters-dropdown.module.ts +++ b/src/app/components/filters-dropdown/filters-dropdown.module.ts @@ -14,6 +14,7 @@ import { FiltersDropdownComponent } from './filters-dropdown.component'; import { ListFiltersModule } from './list-filters'; import { DatasetFiltersModule } from './dataset-filters'; +import { TimeseriesFiltersModule } from './timeseries-filters'; import { BaselineFiltersModule } from './baseline-filters'; import { SbasFiltersModule } from './sbas-filters'; import { CustomProductsFiltersModule } from './custom-products-filters'; @@ -37,6 +38,7 @@ import { SharedModule } from '@shared'; SbasFiltersModule, CustomProductsFiltersModule, SarviewsFiltersModule, + TimeseriesFiltersModule, SearchButtonModule, CancelFilterChangesModule, ClearButtonModule, diff --git a/src/app/components/filters-dropdown/timeseries-filters/index.ts b/src/app/components/filters-dropdown/timeseries-filters/index.ts new file mode 100644 index 000000000..04cb5dc2d --- /dev/null +++ b/src/app/components/filters-dropdown/timeseries-filters/index.ts @@ -0,0 +1,2 @@ +export * from './timeseries-filters.module'; +export * from './timeseries-filters.component'; diff --git a/src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.component.html b/src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.component.html new file mode 100644 index 000000000..136e1882a --- /dev/null +++ b/src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.component.html @@ -0,0 +1,21 @@ + + + + + + {{ 'SEARCH_OPTIONS' | translate }} + + + +
+ + +
+ + + + \ No newline at end of file diff --git a/src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.component.scss b/src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.component.ts b/src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.component.ts new file mode 100644 index 000000000..1c09f4b1b --- /dev/null +++ b/src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.component.ts @@ -0,0 +1,67 @@ +import {Component, OnDestroy, OnInit} from '@angular/core'; + +import { AppState } from '@store'; +import { Store } from '@ngrx/store'; +import * as scenesStore from '@store/scenes'; + +import { SubSink } from 'subsink'; +import * as models from '@models'; +import { ScreenSizeService } from '@services'; + +enum FilterPanel { + SEARCH = 'Search Options', + MASTER = 'Scene', + FILTER1 = 'Spatial Filter', + FILTER2 = 'Temporal Filter', + DATE = 'Date', + SEASON = 'Season', + OVERLAP = 'Overlap' +} +@Component({ + selector: 'app-timeseries-filters', + templateUrl: './timeseries-filters.component.html', + styleUrl: './timeseries-filters.component.scss' +}) +export class TimeseriesFiltersComponent implements OnDestroy, OnInit { + public breakpoint$ = this.screenSize.breakpoint$; + public breakpoints = models.Breakpoints; + public areResultsLoaded: boolean; + + selectedPanel: FilterPanel | null = null; + panels = FilterPanel; + defaultPanelOpenState = true; + panelIsDisabled = true; + customCollapsedHeight = '30px'; + customExpandedHeight = '30px'; + + private subs = new SubSink(); + + constructor( + private store$: Store, + private screenSize: ScreenSizeService, + ) { } + + ngOnInit(): void { + this.subs.add( + this.store$.select(scenesStore.getAreResultsLoaded).subscribe( + areLoaded => this.areResultsLoaded = areLoaded + ) + ); + } + + public isSelected(panel: FilterPanel): boolean { + return this.selectedPanel === panel; + } + + public selectPanel(panel: FilterPanel): void { + this.selectedPanel = panel; + } + + public onOpenHelp(url: string): void { + window.open(url); + } + + ngOnDestroy() { + this.subs.unsubscribe(); + } +} diff --git a/src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.module.ts b/src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.module.ts new file mode 100644 index 000000000..eb5ae8b7d --- /dev/null +++ b/src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.module.ts @@ -0,0 +1,38 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { MatExpansionModule } from '@angular/material/expansion'; + +import { MatSharedModule } from '@shared'; +import { SeasonSelectorModule } from '@components/shared/selectors/season-selector'; +import { SbasOverlapSelectorModule } from '@components/shared/selectors/sbas-overlap-selector'; +import { DateSelectorModule } from '@components/shared/selectors/date-selector'; +import { MasterSceneSelectorModule } from '@components/shared/selectors/master-scene-selector'; +import { SearchTypeSelectorModule } from '@components/shared/selectors/search-type-selector'; +import { ResultsMenuModule } from '@components/results-menu'; +import { CopyToClipboardModule } from '@components/shared/copy-to-clipboard'; +import { DocsModalModule } from '@components/shared/docs-modal'; +import { SharedModule } from "@shared"; +import { TimeseriesFiltersComponent } from './timeseries-filters.component'; + + +@NgModule({ + declarations: [TimeseriesFiltersComponent], + imports: [ + CommonModule, + MatExpansionModule, + MatSharedModule, + SeasonSelectorModule, + SbasOverlapSelectorModule, + DateSelectorModule, + MasterSceneSelectorModule, + SearchTypeSelectorModule, + ResultsMenuModule, + CopyToClipboardModule, + DocsModalModule, + SharedModule + ], + exports: [ + TimeseriesFiltersComponent + ] +}) +export class TimeseriesFiltersModule { } diff --git a/src/app/components/header/baseline-header/baseline-header.module.ts b/src/app/components/header/baseline-header/baseline-header.module.ts index d0a874d2b..e19d831fa 100644 --- a/src/app/components/header/baseline-header/baseline-header.module.ts +++ b/src/app/components/header/baseline-header/baseline-header.module.ts @@ -11,8 +11,6 @@ import { SharedModule } from "../../../shared"; imports: [ CommonModule, SharedModule - - ], exports: [ BaselineHeaderComponent diff --git a/src/app/components/header/dataset-header/aoi-filter/aoi-filter.component.ts b/src/app/components/header/dataset-header/aoi-filter/aoi-filter.component.ts index 1ced21619..f7339fa7a 100644 --- a/src/app/components/header/dataset-header/aoi-filter/aoi-filter.component.ts +++ b/src/app/components/header/dataset-header/aoi-filter/aoi-filter.component.ts @@ -7,11 +7,12 @@ import { Store } from '@ngrx/store'; import { AppState } from '@store'; import * as uiStore from '@store/ui'; import * as mapStore from '@store/map'; +import * as searchStore from '@store/search'; import { Subject } from 'rxjs'; import { tap, delay } from 'rxjs/operators'; -import { menuAnimation, MapInteractionModeType } from '@models'; +import { menuAnimation, MapInteractionModeType, SearchType } from '@models'; import * as services from '@services'; import { DrawNewPolygon } from '@store/map'; import { SetGeocode } from '@store/filters'; @@ -31,6 +32,9 @@ export class AoiFilterComponent implements OnInit, OnDestroy { public isHoveringAOISelector = false; public isAOIOptionsOpen: boolean; + public searchType$ = this.store$.select(searchStore.getSearchType); + public searchtype: SearchType; + public polygon: string; private subs = new SubSink(); @@ -47,7 +51,9 @@ export class AoiFilterComponent implements OnInit, OnDestroy { isAOIOptionsOpen => this.isAOIOptionsOpen = isAOIOptionsOpen ) ); - + this.subs.add( + this.searchType$.subscribe( searchtype => this.searchtype = searchtype) + ); this.subs.add( this.mapService.searchPolygon$.subscribe( p => { @@ -83,7 +89,7 @@ export class AoiFilterComponent implements OnInit, OnDestroy { const polygon = (event.target as HTMLInputElement).value; const didLoad = this.mapService.loadPolygonFrom(polygon); - if (!didLoad) { + if (!didLoad || (this.searchtype === SearchType.DISPLACEMENT && !(polygon.toLowerCase().includes('point')))) { this.aoiErrors$.next(); } else { this.store$.dispatch(new SetGeocode('')); diff --git a/src/app/components/header/header-buttons/header-buttons.component.html b/src/app/components/header/header-buttons/header-buttons.component.html index 50d4249d5..363c1f69d 100644 --- a/src/app/components/header/header-buttons/header-buttons.component.html +++ b/src/app/components/header/header-buttons/header-buttons.component.html @@ -1,90 +1,106 @@ -
+
- - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -310,15 +326,10 @@
- - {{ 'CONTACT' | translate }} - {{ 'NON_DISCRIMINATION' | translate }} - © {{anio}} ASF diff --git a/src/app/components/header/header-buttons/header-buttons.component.scss b/src/app/components/header/header-buttons/header-buttons.component.scss index af379597e..4455c0c8d 100644 --- a/src/app/components/header/header-buttons/header-buttons.component.scss +++ b/src/app/components/header/header-buttons/header-buttons.component.scss @@ -20,5 +20,5 @@ display: flex; flex-direction: column; height: 100%; -} +} diff --git a/src/app/components/header/header-buttons/header-buttons.module.ts b/src/app/components/header/header-buttons/header-buttons.module.ts index 371b3188c..e314fda7d 100644 --- a/src/app/components/header/header-buttons/header-buttons.module.ts +++ b/src/app/components/header/header-buttons/header-buttons.module.ts @@ -17,6 +17,7 @@ import { CustomizeEnvComponent } from './customize-env/customize-env.component'; import { OnlynumberDirective } from '@directives/onlynumber.directive'; import { SharedModule } from '@shared'; import { LanguageSelectorModule } from "@components/shared/selectors/language-selector/language-selector.module"; +import {DocsModalModule} from '@components/shared/docs-modal'; @NgModule({ declarations: [ @@ -25,20 +26,21 @@ import { LanguageSelectorModule } from "@components/shared/selectors/language-se CustomizeEnvComponent, OnlynumberDirective ], - imports: [ - CommonModule, - FormsModule, - MatBadgeModule, - MatMenuModule, - MatInputModule, - MatDialogModule, - MatSharedModule, - MatSelectModule, - DatasetSelectorModule, - MatFormFieldModule, - SharedModule, - LanguageSelectorModule, - ], + imports: [ + CommonModule, + FormsModule, + MatBadgeModule, + MatMenuModule, + MatInputModule, + MatDialogModule, + MatSharedModule, + MatSelectModule, + DatasetSelectorModule, + MatFormFieldModule, + SharedModule, + LanguageSelectorModule, + DocsModalModule, + ], exports: [ HeaderButtonsComponent ] }) export class HeaderButtonsModule { } diff --git a/src/app/components/header/header-buttons/preferences/preferences.component.ts b/src/app/components/header/header-buttons/preferences/preferences.component.ts index 5cb15078f..91c2feac0 100644 --- a/src/app/components/header/header-buttons/preferences/preferences.component.ts +++ b/src/app/components/header/header-buttons/preferences/preferences.component.ts @@ -54,7 +54,8 @@ export class PreferencesComponent implements OnInit, OnDestroy { public selectedFiltersIDs = { 'Baseline Search': '', 'Geographic Search': '', - 'SBAS Search': '' + 'SBAS Search': '', + 'Displacement': '' }; public currentTheme = 'light'; public currentFilterDisplayNames = {}; diff --git a/src/app/components/header/header.component.html b/src/app/components/header/header.component.html index 8cf7e7cd8..de31a757c 100644 --- a/src/app/components/header/header.component.html +++ b/src/app/components/header/header.component.html @@ -13,6 +13,9 @@ + + + diff --git a/src/app/components/header/header.module.ts b/src/app/components/header/header.module.ts index 1ea102f3a..69b4e0ecf 100644 --- a/src/app/components/header/header.module.ts +++ b/src/app/components/header/header.module.ts @@ -37,6 +37,7 @@ import { LogoModule } from '@components/header/logo/logo.module'; import { HeaderComponent } from './header.component'; import { InfoBarComponent } from './info-bar/info-bar.component'; import { DatasetHeaderComponent } from './dataset-header/dataset-header.component'; +import { TimeseriesHeaderComponent } from './timeseries-header/timeseries-header.component'; import { ListHeaderComponent } from './list-header/list-header.component'; import { BaselineHeaderComponent } from './baseline-header/baseline-header.component'; import { SarviewsHeaderComponent } from './sarviews-header/sarviews-header.component'; @@ -50,7 +51,8 @@ import { SarviewsEventTypeSelectorModule } from '@components/shared/selectors/sa import { Hyp3UrlModule } from '@components/shared/hyp3-url/hyp3-url.module'; import { SharedModule } from "@shared"; import { LanguageSelectorModule } from "@components/shared/selectors/language-selector/language-selector.module"; - +import { BurstSelectorModule } from '@components/shared/selectors/burst-selector'; +import { TimeseriesChartFlightDirectionToggleComponent} from '@components/timeseries-chart/timeseries-chart-flight-direction-toggle'; @NgModule({ declarations: [ HeaderComponent, @@ -61,6 +63,7 @@ import { LanguageSelectorModule } from "@components/shared/selectors/language-se BaselineHeaderComponent, Hyp3HeaderComponent, SarviewsHeaderComponent, + TimeseriesHeaderComponent ], imports: [ CommonModule, @@ -99,6 +102,8 @@ import { LanguageSelectorModule } from "@components/shared/selectors/language-se SharedModule, LanguageSelectorModule, OnDemandUserSelectorModule, + BurstSelectorModule, + TimeseriesChartFlightDirectionToggleComponent ], exports: [ HeaderComponent diff --git a/src/app/components/header/info-bar/info-bar.component.html b/src/app/components/header/info-bar/info-bar.component.html index 76345ee1f..e2d9b0485 100644 --- a/src/app/components/header/info-bar/info-bar.component.html +++ b/src/app/components/header/info-bar/info-bar.component.html @@ -15,10 +15,10 @@ {{'PRODUCT_TYPES' | translate }}: {{eventProductTypes}} - + {{ 'START' | translate }}: {{ startDate | shortDate }} - + {{ 'END' | translate }}: {{ endDate | shortDate }} @@ -51,8 +51,10 @@ {{'CAMPAIGN' | translate }}: {{ mission }} - - {{'TEMPORAL' | translate }}: {{tempRange.start}} {{ 'TO' | translate }} {{tempRange.end}} + + + {{'TEMPORAL' | translate }}: {{tempRange.start}} {{ 'TO' | translate }} {{tempRange.end}} + {{'PERPENDICULAR' | translate}}: {{perpRange.start}} {{ 'TO' | translate }} {{perpRange.end}} diff --git a/src/app/components/header/timeseries-header/timeseries-header.component.html b/src/app/components/header/timeseries-header/timeseries-header.component.html new file mode 100644 index 000000000..262543547 --- /dev/null +++ b/src/app/components/header/timeseries-header/timeseries-header.component.html @@ -0,0 +1,32 @@ + +
+
+ + +
+ +
+ @if(!isAddingPoints) { + + } + @else { + + } +
+
+
+ +
+
+ +
+ +
+ + +
+
+
+ diff --git a/src/app/components/header/timeseries-header/timeseries-header.component.scss b/src/app/components/header/timeseries-header/timeseries-header.component.scss new file mode 100644 index 000000000..cf84e8096 --- /dev/null +++ b/src/app/components/header/timeseries-header/timeseries-header.component.scss @@ -0,0 +1,33 @@ +.baseline-header-layout { + flex-direction: row; + box-sizing: border-box; + display: flex; +} + +.baseline-header-wrapper { + flex-direction: row; + box-sizing: border-box; + display: flex; +} + +.search-button-layout { + flex: 0 1 auto; + box-sizing: border-box; +} + +.scene-selector { + width: 670px; +} + +.medium-scene-selector { + width: 405px; +} + +.small-scene-selector { + width: 200px; +} + +.flight-direction-toggle { + padding-top: 15px; + padding-right: 15px; +} diff --git a/src/app/components/header/timeseries-header/timeseries-header.component.ts b/src/app/components/header/timeseries-header/timeseries-header.component.ts new file mode 100644 index 000000000..9e241d4b0 --- /dev/null +++ b/src/app/components/header/timeseries-header/timeseries-header.component.ts @@ -0,0 +1,58 @@ +import { Component, OnInit, OnDestroy } from '@angular/core'; +import { SubSink } from 'subsink'; + +import { Store } from '@ngrx/store'; +import { AppState } from '@store'; +import * as uiStore from '@store/ui'; +import * as searchStore from '@store/search'; +import * as mapStore from '@store/map'; + +import { ScreenSizeService } from '@services'; +import { Breakpoints, MapDrawModeType, MapInteractionModeType } from '@models'; + +@Component({ + selector: 'app-timeseries-header', + templateUrl: './timeseries-header.component.html', + styleUrls: ['./timeseries-header.component.scss', '../header.component.scss'] +}) +export class TimeseriesHeaderComponent implements OnInit, OnDestroy { + public breakpoint$ = this.screenSize.breakpoint$; + public breakpoints = Breakpoints; + public isAddingPoints = false; + + private subs = new SubSink(); + + constructor( + private store$: Store, + private screenSize: ScreenSizeService + ) { } + + ngOnInit() { + this.subs.add( + this.store$.select(mapStore.getMapInteractionMode).subscribe( + mode => this.isAddingPoints = mode === MapInteractionModeType.DRAW + ) + ); + + } + + public onAddPointsMode(): void { + this.store$.dispatch(new mapStore.SetMapInteractionMode(MapInteractionModeType.DRAW)); + this.store$.dispatch(new mapStore.SetMapDrawMode(MapDrawModeType.POINT)); + } + + public onStopAddPoints(): void { + this.store$.dispatch(new mapStore.SetMapInteractionMode(MapInteractionModeType.NONE)); + } + + + public onToggleFiltersMenu(): void { + this.store$.dispatch(new uiStore.OpenFiltersMenu()); + } + + public isKioskMode$ = this.store$.select(searchStore.getKioskMode); + + ngOnDestroy() { + this.subs.unsubscribe(); + } +} diff --git a/src/app/components/map/displacement-layers/displacement-layers.component.html b/src/app/components/map/displacement-layers/displacement-layers.component.html new file mode 100644 index 000000000..2750a22aa --- /dev/null +++ b/src/app/components/map/displacement-layers/displacement-layers.component.html @@ -0,0 +1,70 @@ +
+
+ +
+ {{ 'CUMULATIVE_LAYER' | translate}} +
+ + + + +
+ {{ 'DEFORMATION' | translate}} +
+ + + +
+ {{ 'VELOCITY' | translate}} +
+ + + + @if (cumulativeDisplacementSelectionEnabled) { + @if (displacementOverview === DispLayerTypes.VELOCITY) { + + + } + @else { + + + } + } + + +
+ {{ 'ROLLOUT' | translate}} +
+ + + @if (priorityEnabled) { +
+
1st
+
2nd
+
3rd
+
+ } + +
+ {{ 'WHAT_ARE_THESE?' | translate}} + + +
+
+ +
+
+ {{ 'MAP_LAYERS' | translate}} +
+
+
diff --git a/src/app/components/map/displacement-layers/displacement-layers.component.scss b/src/app/components/map/displacement-layers/displacement-layers.component.scss new file mode 100644 index 000000000..5405c02c1 --- /dev/null +++ b/src/app/components/map/displacement-layers/displacement-layers.component.scss @@ -0,0 +1,91 @@ +@import "asf-theme"; + +.disp-layers--layout { + height: 100%; + min-height: 100%; + width: 220px; + flex-direction: column; + box-sizing: border-box; + display: flex; +} + +.position { + z-index: 998; + margin-left: 0; + top: 20px; +} + +.layers-selector { + @include themify($themes) { + background-color: themed('primary-light'); + } + + padding-bottom: 4px; + padding-right: 10px; + pointer-events: auto; +} + +.selector-text { + font-weight: bold; +} + +.help-text { + padding-left: 10px; + font-size: small; +} + +.footer { + @include themify($themes) { + background-color: themed('primary'); + } + + width: calc(100% + 10px); + margin: 0 0 0 -10px; + height: 16px; +} + +.footer--text { + @include themify($themes) { + background-color: themed('primary'); + color: themed('light-secondary-text'); + } + + font-size: 12px; + margin-top: 0; + text-align: end; + padding-right: 10px; +} + +.rollout-checkbox { + margin: 4px 0; +} + +.priority-legend { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + margin-left: 5px; + margin-bottom: 5px +} + +.priority-box { + flex: 1; + margin: 0; + text-align: center; + vertical-align: middle; +} + +.first-priority { + background-color: rgba(127, 206, 255, 0.8); +} + +.second-priority { + color: white; + background-color: rgba(45, 128, 179, 0.7); +} + +.third-priority { + color: white; + background-color: rgba(0, 64, 103, 0.6); +} diff --git a/src/app/components/map/displacement-layers/displacement-layers.component.ts b/src/app/components/map/displacement-layers/displacement-layers.component.ts new file mode 100644 index 000000000..8a01d5e96 --- /dev/null +++ b/src/app/components/map/displacement-layers/displacement-layers.component.ts @@ -0,0 +1,104 @@ +import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core'; +import { SubSink } from 'subsink'; + +import { MapService } from '@services'; +import * as models from '@models'; +import { Store } from '@ngrx/store'; +import { AppState } from '@store'; +import { getFlightDirections } from '@store/filters'; +import { distinctUntilChanged, filter, map } from 'rxjs'; +import { MatCheckbox } from '@angular/material/checkbox'; + + +@Component({ + selector: 'app-displacement-layers', + templateUrl: './displacement-layers.component.html', + styleUrl: './displacement-layers.component.scss' +}) +export class DisplacementLayersComponent implements OnInit, OnDestroy { + @ViewChild("priorityRollout", { static: true }) priorityCheckbox: MatCheckbox; + public flightDir = models.FlightDirection.ASCENDING; + public displacementOverview: models.DisplacementLayerTypes | null = null; + public cumulativeDisplacementSelectionEnabled: boolean = false; + public DispLayerTypes = models.DisplacementLayerTypes; + public priorityEnabled = false; + private subs = new SubSink(); + + constructor( + private mapService: MapService, + private store$: Store, + ) { } + + ngOnInit() { + this.subs.add( + this.mapService.displacementOverview$.pipe( + filter(overview => !!overview) + ).subscribe( + t => { + this.displacementOverview = t; + this.cumulativeDisplacementSelectionEnabled = true + } + ) + ); + this.subs.add( + this.store$.select(getFlightDirections).pipe( + map(flightDirs => flightDirs[0] ?? models.FlightDirection.ASCENDING), + distinctUntilChanged(), + ).subscribe(flightDir => { + this.flightDir = flightDir; + if (!!this.displacementOverview) { + this.setDisplacementLayer(this.flightDir, this.displacementOverview) + } + if (this.priorityCheckbox.checked) { + this.mapService.disablePriority() + this.onUpdatePriority(this.priorityCheckbox.checked) + } + } + ) + ) + this.subs.add( + this.mapService.priorityEnabled$.subscribe(t => { + this.priorityEnabled = t !== null; + }) + ) + } + + public onUpdatePriority(isChecked: boolean): void { + if (isChecked) { + this.mapService.enablePriority(this.flightDir); + } + else { + this.mapService.disablePriority(); + } + } + + public onUpdateLayerType(layerType: models.DisplacementLayerTypes): void { + if (this.cumulativeDisplacementSelectionEnabled) { + this.clearDisplacementLayer(); + this.setDisplacementLayer(this.flightDir, layerType); + } + } + + + public onToggleCumulativeLayerDisplay(checked: boolean) { + this.cumulativeDisplacementSelectionEnabled = checked; + if (checked && this.displacementOverview) { + this.setDisplacementLayer(this.flightDir, this.displacementOverview) + } else { + this.clearDisplacementLayer() + this.displacementOverview = null; + } + } + + public setDisplacementLayer(direction: models.FlightDirection, type: models.DisplacementLayerTypes) { + this.mapService.setDisplacementOverview(direction, type); + } + + public clearDisplacementLayer() { + this.mapService.clearDisplacementOverview(); + } + + ngOnDestroy() { + this.subs.unsubscribe(); + } +} diff --git a/src/app/components/map/displacement-layers/displacement-layers.module.ts b/src/app/components/map/displacement-layers/displacement-layers.module.ts new file mode 100644 index 000000000..5f20a33be --- /dev/null +++ b/src/app/components/map/displacement-layers/displacement-layers.module.ts @@ -0,0 +1,34 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { MatMenuModule } from '@angular/material/menu'; +import { MatRadioModule } from '@angular/material/radio'; +import { MatCheckboxModule } from '@angular/material/checkbox'; + +import { DisplacementLayersComponent } from './displacement-layers.component'; +import { MapLegendComponent } from './map-legend/map-legend.component'; +import { DocsModalModule } from '@components/shared/docs-modal'; + +import { MatSharedModule } from '@shared'; +import { SharedModule } from "@shared"; + + +@NgModule({ + imports: [ + CommonModule, + MatMenuModule, + MatCheckboxModule, + MatRadioModule, + MatSharedModule, + SharedModule, + DocsModalModule, + MapLegendComponent + ], + declarations: [ + DisplacementLayersComponent + ], + exports: [ + DisplacementLayersComponent + ] +}) +export class DisplacementLayersModule { } diff --git a/src/app/components/map/displacement-layers/index.ts b/src/app/components/map/displacement-layers/index.ts new file mode 100644 index 000000000..36c35e61f --- /dev/null +++ b/src/app/components/map/displacement-layers/index.ts @@ -0,0 +1 @@ +export * from './displacement-layers.module'; diff --git a/src/app/components/map/displacement-layers/map-legend/map-legend.component.html b/src/app/components/map/displacement-layers/map-legend/map-legend.component.html new file mode 100644 index 000000000..6be758e11 --- /dev/null +++ b/src/app/components/map/displacement-layers/map-legend/map-legend.component.html @@ -0,0 +1,6 @@ +
+
+
{{ min }} {{ units }}
+
{{ max }} {{ units }}
+
+
diff --git a/src/app/components/map/displacement-layers/map-legend/map-legend.component.scss b/src/app/components/map/displacement-layers/map-legend/map-legend.component.scss new file mode 100644 index 000000000..3bea52db5 --- /dev/null +++ b/src/app/components/map/displacement-layers/map-legend/map-legend.component.scss @@ -0,0 +1,34 @@ +@import "asf-theme"; + +.map-legend { + width: -webkit-fill-available; + height: 20px; + margin: 0 4px; + padding: 0 4px; + color: white; + font-size: 12px; + background-image: linear-gradient(to right, + rgba(0, 18, 97), + rgba(3, 62, 125), + rgba(30, 111, 157), + rgba(113, 168, 196), + rgba(201, 221, 231), + rgba(234, 206, 189), + rgba(211, 151, 116), + rgba(190, 101, 51), + rgba(139, 39, 6), + rgba(89, 0, 8), + ); + border-radius: 4px; + display: flex; + align-items: center; + justify-content: space-between; +} + +.layout { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + margin-left: 5px; +} diff --git a/src/app/components/map/displacement-layers/map-legend/map-legend.component.ts b/src/app/components/map/displacement-layers/map-legend/map-legend.component.ts new file mode 100644 index 000000000..cb2861bd3 --- /dev/null +++ b/src/app/components/map/displacement-layers/map-legend/map-legend.component.ts @@ -0,0 +1,14 @@ +import { Component, Input } from '@angular/core'; + +@Component({ + selector: 'app-map-legend', + standalone: true, + imports: [], + templateUrl: './map-legend.component.html', + styleUrl: './map-legend.component.scss' +}) +export class MapLegendComponent { + @Input() min: number; + @Input() max: number; + @Input() units: string; +} diff --git a/src/app/components/map/map-controls/layer-selector/layer-selector.component.html b/src/app/components/map/map-controls/layer-selector/layer-selector.component.html index 114d1a6ba..7b1e315e4 100644 --- a/src/app/components/map/map-controls/layer-selector/layer-selector.component.html +++ b/src/app/components/map/map-controls/layer-selector/layer-selector.component.html @@ -38,31 +38,32 @@ - - - + + + + + }
- +
diff --git a/src/app/components/results-menu/scenes-list/scenes-list.component.html b/src/app/components/results-menu/scenes-list/scenes-list.component.html index 7e71cf581..b9f657411 100644 --- a/src/app/components/results-menu/scenes-list/scenes-list.component.html +++ b/src/app/components/results-menu/scenes-list/scenes-list.component.html @@ -16,7 +16,10 @@ searchType === SearchTypes.DATASET || searchType === SearchTypes.BASELINE || searchType === SearchTypes.LIST || - searchType === SearchTypes.CUSTOM_PRODUCTS"> + searchType === SearchTypes.CUSTOM_PRODUCTS || + searchType === SearchTypes.DISPLACEMENT + " + >
+ + + + + + + +
+ + @if(chartStates.length !== 0) { + +
+ + + + {{ 'ALL_AOIS' | translate }} + + + + +
    + @for (point of chartStates; track point.valid) { +
  • + @if (point.valid) { + + place + + {{'SERIES' | translate}} {{point.seriesNumber}} + + + + } @else { +
    + block + place + + {{'SERIES' | translate}} {{point.seriesNumber}} + +
    + + } +
    • + } +
+ +
+ } + @else { +
+ {{ 'NO_POINT_SELECTED' | translate }} +
+ } + +
+ + + + + +
+ +
+ + + +
+ +
+ + + + + + + +
+
+ + +
+
+ +
+
+ diff --git a/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.scss b/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.scss new file mode 100644 index 000000000..d78226168 --- /dev/null +++ b/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.scss @@ -0,0 +1,387 @@ +@use "@angular/material" as mat; + +@import "asf-theme"; + +.ts-chart-row { + display: flex; + flex-direction: row; + height: calc(100%); + margin-top: 12px; + margin-right: 12px; + position: relative; +} + +.ts-chart-card { + box-shadow: none; + height: 100%; + flex: 1 1 auto; + box-sizing: border-box; +} + +#ts-chart-column { + //flex: 1 1 auto; + width: 100%; + margin-left: 30px; +} +.ts-criteria-button-toggle-group { + flex: 0 1 149px !important; + margin-top: 5px; +} + +.ts-criteria-button-toggle { + background: red; + font-size: 14px; +} + +.criteria-button-group { + outline: none; + width: auto; + line-height: 26px !important; +} + +.ts-filter-row { + display: flex; + flex-direction: column; + width: 100%; + height: 137px; + margin-top: 10px; +} + +.select-button { + padding: 2px 10px; +} + +.ts-column-1 { + //flex-basis: 150px; + flex-shrink: 0; + flex-grow: 0; +} + +.ts-column-2 { + flex: 1 1 auto; +} + +.ts-list-card { + box-shadow: none !important; + box-sizing: border-box; + flex: 1 1 0%; +} + +.ts-layer-list { + //flex: 1 1 500px; + //flex-basis: 650px; + //flex-grow: 0; +} + +.ts-layer-list-header { + display: flex; + flex-direction: row; + justify-content: center; + align-items: flex-start; +} + +.ts-scene-list-header { + justify-content: flex-start; + align-items: center; + flex-basis: 130px; + flex-grow: 0; + max-height: 30px; +// max-width: 130px; +} + +.ts-metadata { + @include themify($themes) { + border-left: solid 1px themed('primary-light'); + border-right: solid 2px themed('primary-light'); + } + + overflow: auto; + height: 100%; +} + +.product-name { + word-break: break-all; +} + +.chart-resize-handle-left, +.chart-resize-handle-right { + @include themify($themes) { + background-color: themed('primary-light'); + } + + height: 100%; +} + +.mwlResizable { + box-sizing: border-box; // required for the enableGhostResize option to work +} + +.chart-draggable-handle { + @include themify($themes) { + background-color: themed('primary-light'); + border-color: themed('primary-light'); + color: themed('primary-light'); + } + + display: flex; + align-items: center; + cursor: ew-resize; + border-style: solid; + border-radius: 5px; + position: absolute; + left: 0; + top: 0; +} + +.ts-resize-handle-filler { + @include themify($themes) { + background-color: themed('primary-light'); + } + + width: 10px; + height: 100%; +} + +.vgrip-icon { + @include themify($themes) { + stroke: themed('dark-primary-text'); + } + + height: 33px; +} + +.ts-header { + @include themify($themes) { + background-color: themed('primary-light'); + color: themed('dark-primary-text') + } + + display: flex; + flex-direction: row; + justify-content: center; + height: 50px; + padding-top: 0; + padding-bottom: 5px; + margin-bottom: 0; + font-family: Roboto, + sans-serif; + font-weight: 400; + font-size: 16px; + text-align: center; + margin-top: -25px; + border-left: none; +} + +.control-icon { + @include themify($themes) { + color: themed('dark-primary-text'); + } + + margin-top: -4px; + + @include md-icon-size($asf-ribbon-icon-size); +} + +/* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ +.mat-button-toggle-disabled { + .control-icon { + @include themify($themes) { + color: themed('dark-disabled-text'); + } + } +} + +.ts-ribbon-group { + justify-content: center; + max-width: fit-content; +} + +.toggle-group-wrapper--layout { + flex-direction: row; + box-sizing: border-box; + display: flex; + place-content: stretch center; + align-items: stretch; +} + +.ts-button-group { + max-width: fit-content; + flex: 1 1 0%; + box-sizing: border-box; +} + +.ts-button-group-filler { + width: 10px; + max-width: 10px; +} + +.ts-toggle-group { + flex: 1 1 0%; + box-sizing: border-box; +} + +.button-group { + margin: 0 3px 3px 1px; + pointer-events: auto; +} + +.button-group-label { + @include themify($themes) { + color: themed('dark-primary-text'); + } + + white-space: nowrap; + text-align: center; + flex-direction: row; + box-sizing: border-box; + display: flex; + place-content: stretch center; + align-items: stretch; +} + +label { + font-size: 11px; +} + +.info-icon { + margin-left: 10px; + margin-top: 4px; +} + +/* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ +.control-mat-button-toggle { + @include themify($themes) { + background: themed('background-white') !important; + } +} + +.warn-icon { + @include themify($themes) { + color: darken(themed('dark-primary-text'), 25%); + } +} + +.gap-detected-area { + position: relative; + top: 15%; + left: 90%; + border-radius: 50%; + display: grid; + place-items: center; + width: 30px; + + @include themify($themes) { + background: darken(themed('background-white'), 15%); + } +} +.ts-column-2 { + margin: 25px; +} + +.ts-left-column-results { + overflow-x: auto; + margin-left: 10px; +} + +.ts-no-point-selected { + text-align: center; + padding-top: 60px; +} + +.ts-wkt-icon { + @include themify($themes) { + color: darken(themed('dark-primary-text'), 25%); + } + font-size: 18px; + line-height: 29px; + margin: 0 0; + width: 18px; +} + +.ts-wkt-label { + margin-left: 5px; + position: relative; + top: -5px; +} + +.ts-trash-can { +// margin-bottom: -4px; + font-size: 18px; +} + +.ts-add-points { + margin: 5px 0 20px 16px; +} + +.ts-wkt-text { + vertical-align: super; +} + +:host ::ng-deep .mdc-radio__inner-circle { + border-color: #236192 !important; /*change radio button color when selected*/ +} + +:host ::ng-deep .mdc-radio__outer-circle { + border-color: #ffcc33 !important; /*change radio button color when selected*/ +} + +.point-list-section { + +} + +.parent-checkbox-section { + margin: 0; +} + +.parent-checkbox-label { + font-weight: bold; +} + +.point-list-ul-section { + display: block; + margin-left: 0; +} + +ul { + list-style-type: none; + margin-top: 0; +} + +::ng-deep .mdc-checkbox { + height: 7px; +} + +::ng-deep .mat-mdc-checkbox .mdc-checkbox__background { + top: 4px +} + +.ts-buttons { + border: none; +} + +.invalid-aoi-icon { + display: inline-block; + padding-right: 10px; + padding-left: 6px; +} + +.invalid-aoi-text { + font-size: 14px; +} +.ts-highlighted { + @include themify($themes) { + background-color: lighten(themed('primary-light'),5%); + } + + .ts-wkt-label { + font-weight: bolder; + } +} + +.point-list-item { + display: flex; + align-items: center; + justify-content: space-between; + overflow: hidden; + height: 45px; +} \ No newline at end of file diff --git a/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.ts b/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.ts new file mode 100644 index 000000000..9c33ba6a7 --- /dev/null +++ b/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.ts @@ -0,0 +1,280 @@ +import { Component, OnInit, Input, OnDestroy, ViewChild, ElementRef, computed, signal } from '@angular/core'; +import { distinctUntilChanged, filter, first, map, Observable, Subject, withLatestFrom } from 'rxjs'; +import { ResizeEvent } from 'angular-resizable-element'; + +import { AppState } from '@store'; +import * as searchStore from '@store/search'; +import * as chartStore from '@store/charts'; + +import { + DrawService, + NetcdfService, + PointHistoryService, + ScreenSizeService, + WktService +} from '@services'; +import { Breakpoints, SearchType } from '@models'; + +import { SubSink } from 'subsink'; + +import { Point } from 'ol/geom'; +import { getTimeseriesChartStates } from '@store/charts'; +import * as filtersStore from '@store/filters'; +import * as models from '@models'; +import * as uiStore from '@store/ui'; +import {Store} from '@ngrx/store'; + +export interface Task { + aoi: string; + checked: boolean; + subtasks?: Task[]; +} + +export interface PointSeries { + bytes: number; + interferometric_correlation: number; + netcdf_uri: string; + persistent_scatterer_mask: number; + reference_datetime: string; + secondary_datetime: string; + short_wavelength_displacement: number; + temporal_baseline: number; + temporal_coherence: number; + x: number; + y: number; +} + +@Component({ + selector: 'app-timeseries-results-menu', + templateUrl: './timeseries-results-menu.component.html', + styleUrls: ['./timeseries-results-menu.component.scss', '../results-menu.component.scss'], +}) +export class TimeseriesResultsMenuComponent implements OnInit, OnDestroy { + + @ViewChild('listCard', {read: ElementRef}) listCardView: ElementRef; + @ViewChild('chartCard', {read: ElementRef}) chartCardView: ElementRef; + @ViewChild('radio-group', {read: ElementRef}) radioGroup: ElementRef; + + @Input() resize$: Observable; + public searchType: SearchType; + public isAddingPoints = false; + + public wktListMaxWidth = '225px'; + public listCardMaxWidth = '300px'; + public chartCardMaxWidth = '55%'; + private minChartWidth = 25.0; + + public tsPath: any + + public breakpoint: Breakpoints; + public breakpoints = Breakpoints; + private subs = new SubSink(); + private flightDirection: models.FlightDirection = models.FlightDirection.ASCENDING; + + public chartStates: models.timeseriesChartItemState[] = [] + public allSeriesChecked$ = this.store$.select(chartStore.getAreAllTimeseriesChecked) + public temporalRange: models.Range = {start: 0, end: 0}; + public temporalRangeValues$ = new Subject(); + public maxRange: models.Range = {start: 0, end: 0}; + public selectedSeries: number = -1; + + + public totalDisplacement = 0; + public dateRange = []; + public totalPoints = 0; + + constructor( + private store$: Store, + private screenSize: ScreenSizeService, + public pointHistoryService: PointHistoryService, + private drawService: DrawService, + private netcdfService: NetcdfService, + private wktService: WktService, + ) { } + + ngOnInit(): void { + this.pointHistoryService.clearPoints(); + + this.subs.add( + this.store$.select(uiStore.getActiveWkt).pipe(distinctUntilChanged()).subscribe(wkt => { + if (!wkt) + this.selectedSeries = null; + else + this.respondToActiveWkt(wkt); + })); + + this.subs.add( + this.store$.select(filtersStore.getFlightDirections).pipe( + map(flightDirs => flightDirs[0] ?? models.FlightDirection.ASCENDING), + distinctUntilChanged(), + ).subscribe( + flightDir => { + this.flightDirection = flightDir; + this.updateChart() + } + ) + ) + this.subs.add( + this.screenSize.breakpoint$.subscribe( + point => this.breakpoint = point + ) + ); + + this.subs.add( + this.store$.select(searchStore.getSearchType).subscribe( + searchType => this.searchType = searchType + ) + ); + + this.subs.add(this.store$.select(getTimeseriesChartStates).subscribe(chartStates => { + this.chartStates = Object.values(chartStates); + } + )); + + this.subs.add( + this.temporalRangeValues$.subscribe( + range => { + const action = new filtersStore.SetTemporalRange({ start: range[0], end: range[1] }); + this.store$.dispatch(action); + } + ) + ); + + + + let thing: string = localStorage.getItem('timeseries-points') + if (thing && thing.length > 0) { + let previous_points: any[] = thing?.split(';'); + if (previous_points.length > 0) { + previous_points = previous_points?.map(value => { + return this.wktService.wktToFeature(value, 'EPSG:4326'); + }) + previous_points?.forEach((point, idx) => { + let allPointsData = []; + this.pointHistoryService.addPoint(point.getGeometry(), idx + 1); + this.netcdfService.getTimeSeries(point.getGeometry(), this.flightDirection).pipe(first()).subscribe( data => { + if (!!data) { + allPointsData.push(data); + } + this.maxRange = this.temporalRange = this.getMaxRange(allPointsData); + }) + }); + } + } + + this.subs.add(this.drawService.polygon$.pipe( + filter(polygon => !!polygon), + withLatestFrom(this.store$.select(chartStore.getMinSeriesNumber)) + ).subscribe(([polygon, minSeriesNumber]) => { + if(!!polygon) { + let temp = polygon.getGeometry().clone() as Point; + temp.transform('EPSG:3857', 'EPSG:4326') + if (polygon.getGeometry().getType() === 'Point') { + this.pointHistoryService.addPoint(temp, minSeriesNumber); + // this.selectedPoint = temp; + } + this.updateChart(); + } + })) + + } + + public onResizeEnd(event: ResizeEvent): void { + const windowWidth = window.innerWidth + || document.documentElement.clientWidth + || document.body.clientWidth; + const newChartWidth = event.rectangle.width > windowWidth ? windowWidth : event.rectangle.width; + const newChartMaxWidth = Math.max( + this.minChartWidth, + Math.round((newChartWidth / windowWidth) * 100) + ); + const newListMaxWidth = 100 - newChartMaxWidth; + + this.listCardMaxWidth = newListMaxWidth.toString() + '%'; + this.chartCardMaxWidth = newChartMaxWidth.toString() + '%'; + } + + public onToggleFiltersMenu(): void { + this.store$.dispatch(new uiStore.OpenFiltersMenu()); + } + + public onOpenHelp(url: string): void { + window.open(url); + } + + public updateChart(): void { + let allPointsData = []; + for (const series of this.chartStates) { + this.netcdfService.getTimeSeries(series.geometry, this.flightDirection).pipe(first()).subscribe(data => { + if(!!data) { + allPointsData.push(data); + } + this.temporalRange = this.getMaxRange(allPointsData); + }) + } + this.maxRange = this.getMaxRange(allPointsData); + } + + readonly task = signal({ + aoi: 'ALL AOIs', + checked: false, + subtasks: [], + }); + + readonly partiallyComplete = computed(() => { + const task = this.task(); + if (!task.subtasks) { + return false; + } + return task.subtasks.some(t => t.checked) && !task.subtasks.every(t => t.checked); + }); + + public toggleAllSeries(checked: boolean) { + this.store$.dispatch(chartStore.setAllTimeseriesChecked({checked})); + } + + public getMaxRange(allSeries: PointSeries[]) { + let minDate = null; + let maxDate = null; + for (let points of allSeries) { + for (let key of Object.keys(points).filter(x => x !== 'mean' && x !== 'aoi')) { + let date = new Date(points[key].secondary_datetime); + if (minDate === null || date < minDate) { + minDate = date; + } + if (maxDate === null || date > maxDate) { + maxDate = date; + } + } + } + let dateRange: models.Range = {start: minDate, end: maxDate}; + this.temporalRangeValues$.next([dateRange.start, dateRange.end]); + return dateRange; + } + + public updateSeries(checked: boolean, index?: number) { + const wkt = this.chartStates[index]?.wkt + this.store$.dispatch(chartStore.setTimeseriesChecked({wkt, checked})) + } + + public respondToActiveWkt(wkt: string) { + this.chartStates.forEach((item) => { + if (item.wkt == wkt) { + this.selectedSeries = item.seriesNumber; + } + }); + } + + public setActiveWkt(wkt: string) { + this.store$.dispatch(new uiStore.SetActiveWkt(wkt)); + } + + public deletePoint(index: number) { + this.pointHistoryService.removePoint(index); + } + + ngOnDestroy() { + this.pointHistoryService.clearPoints(); + this.subs.unsubscribe(); + } +} diff --git a/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.module.ts b/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.module.ts new file mode 100644 index 000000000..33e62ef63 --- /dev/null +++ b/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.module.ts @@ -0,0 +1,54 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { MatMenuModule } from '@angular/material/menu'; +import { MatButtonToggleModule } from '@angular/material/button-toggle'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; + +import { MatSharedModule } from '@shared'; +import { TimeseriesResultsMenuComponent } from './timeseries-results-menu.component'; +import { SharedModule } from "@shared"; +import { MatIconModule } from '@angular/material/icon'; +import { ScenesListModule } from '../scenes-list'; +import { ScenesListHeaderModule } from '../scenes-list-header'; +import { SceneMetadataModule } from '@components/shared/scene-metadata'; +import { TimeseriesChartModule } from '@components/timeseries-chart/timeseries-chart.module'; +import { ResizableModule } from 'angular-resizable-element'; +import { MatRadioModule } from '@angular/material/radio'; +import { PipesModule } from '@pipes'; +import {MatTab, MatTabGroup} from '@angular/material/tabs'; +import { + TimeseriesChartTemporalSliderComponent +} from '@components/timeseries-chart/timeseries-chart-temporal-slider/timeseries-chart-temporal-slider.component'; +import {MatCheckbox} from '@angular/material/checkbox'; + + +@NgModule({ + declarations: [ + TimeseriesResultsMenuComponent + ], + imports: [ + CommonModule, + MatMenuModule, + MatIconModule, + MatSharedModule, + MatButtonToggleModule, + FontAwesomeModule, + SharedModule, + ScenesListModule, + ScenesListHeaderModule, + SceneMetadataModule, + TimeseriesChartModule, + ResizableModule, + MatRadioModule, + PipesModule, + MatTabGroup, + MatTab, + TimeseriesChartTemporalSliderComponent, + MatCheckbox + ], + exports: [ + TimeseriesResultsMenuComponent + ] +}) +export class TimeseriesResultsMenuModule { } diff --git a/src/app/components/shared/aoi-options/aoi-options.component.ts b/src/app/components/shared/aoi-options/aoi-options.component.ts index a6b4d3287..a881e9e6f 100644 --- a/src/app/components/shared/aoi-options/aoi-options.component.ts +++ b/src/app/components/shared/aoi-options/aoi-options.component.ts @@ -100,7 +100,7 @@ export class AoiOptionsComponent implements OnInit, OnDestroy { const polygon = (event.target as HTMLInputElement).value; const didLoad = this.mapService.loadPolygonFrom(polygon); - if (!didLoad) { + if (!didLoad || (this.searchtype === SearchType.DISPLACEMENT && !(polygon.toLowerCase().includes('point')))) { this.aoiErrors$.next(); } else { if (this.searchtype === SearchType.DATASET && this.isResultsMenuOpen && !this.isFiltersMenuOpen) { @@ -111,7 +111,7 @@ export class AoiOptionsComponent implements OnInit, OnDestroy { public onInputGeocodePolygon(event: {wkt: string, geocode: string}): void { const didLoad = this.mapService.loadPolygonFrom(event.wkt); this.store$.dispatch(new SetGeocode(event.geocode)); - if (!didLoad) { + if (!didLoad || (this.searchtype === SearchType.DISPLACEMENT && !(event.wkt.toLowerCase().includes('point')))) { this.aoiErrors$.next(); } else { if (this.searchtype === SearchType.DATASET && this.isResultsMenuOpen && !this.isFiltersMenuOpen) { diff --git a/src/app/components/shared/aoi-options/draw-selector/draw-selector.component.html b/src/app/components/shared/aoi-options/draw-selector/draw-selector.component.html index 9dd3bc86a..c993de17a 100644 --- a/src/app/components/shared/aoi-options/draw-selector/draw-selector.component.html +++ b/src/app/components/shared/aoi-options/draw-selector/draw-selector.component.html @@ -28,8 +28,9 @@ place {{ 'PLACE_A_POINT' | translate }} + @if(searchType !== searchTypes.DISPLACEMENT) { - + } diff --git a/src/app/components/shared/aoi-options/draw-selector/draw-selector.component.ts b/src/app/components/shared/aoi-options/draw-selector/draw-selector.component.ts index 6eb390697..887f1fbfc 100644 --- a/src/app/components/shared/aoi-options/draw-selector/draw-selector.component.ts +++ b/src/app/components/shared/aoi-options/draw-selector/draw-selector.component.ts @@ -5,9 +5,10 @@ import { Store } from '@ngrx/store'; import { AppState } from '@store'; import * as mapStore from '@store/map'; import * as uiStore from '@store/ui'; +import * as searchStore from '@store/search'; import { ScreenSizeService } from '@services'; -import { MapDrawModeType, MapInteractionModeType, Breakpoints } from '@models'; +import { MapDrawModeType, MapInteractionModeType, Breakpoints, SearchType } from '@models'; @Component({ selector: 'app-draw-selector', @@ -20,6 +21,8 @@ export class DrawSelectorComponent implements OnInit, OnDestroy { private subs = new SubSink(); public breakpoint: Breakpoints; + public searchType: SearchType; + public searchTypes = SearchType; public breakpoints = Breakpoints; constructor( @@ -39,6 +42,12 @@ export class DrawSelectorComponent implements OnInit, OnDestroy { breakpoint => this.breakpoint = breakpoint ) ); + this.subs.add( + this.store$.select(searchStore.getSearchType).subscribe( + searchType => this.searchType = searchType + ) + ); + } public onNewDrawMode(mode: MapDrawModeType): void { diff --git a/src/app/components/shared/aoi-options/interaction-selector/interaction-selector.component.html b/src/app/components/shared/aoi-options/interaction-selector/interaction-selector.component.html index 4576dbdbd..e136af517 100644 --- a/src/app/components/shared/aoi-options/interaction-selector/interaction-selector.component.html +++ b/src/app/components/shared/aoi-options/interaction-selector/interaction-selector.component.html @@ -19,6 +19,7 @@ draw + + +
+ +
+ +
+ diff --git a/src/app/components/shared/chart-modal/chart-modal.component.scss b/src/app/components/shared/chart-modal/chart-modal.component.scss new file mode 100644 index 000000000..56f6c18b9 --- /dev/null +++ b/src/app/components/shared/chart-modal/chart-modal.component.scss @@ -0,0 +1,56 @@ +@use "@angular/material" as mat; +@import "asf-theme"; +$config: mat.define-legacy-typography-config(); + +.mat-button-toggle-button { + border: 0; + background: none; + color: inherit; + padding: 0; + margin: 0; + font: inherit; + outline: none; + width: 100%; + cursor: pointer; +} + +.ts-criteria-button-toggle-group { + flex: 0 1 149px !important; + margin-top: 5px; +} + +.ts-criteria-button-toggle { + @include themify($themes) { + background-color: themed('background-white') !important; + } + font-size: 14px; +} + +.mdc-fab--mini { + width: 20px; + height: 20px; + text-align: center; + padding-top: 8px; + border-radius: 4px !important; +} + +.settings-icon { + @include themify($themes) { + color: themed('dark-primary-text') !important; + } + font-size: 16px !important; + margin-left: 0; +} + +.toggle-group-wrapper--layout { + flex-direction: row; + box-sizing: border-box; + display: flex; + place-content: stretch center; + align-items: stretch; +} + +.chart-config-menu-panel { + padding-left: 15px; + padding-right: 15px; +} diff --git a/src/app/components/shared/chart-modal/chart-modal.component.ts b/src/app/components/shared/chart-modal/chart-modal.component.ts new file mode 100644 index 000000000..72d42049d --- /dev/null +++ b/src/app/components/shared/chart-modal/chart-modal.component.ts @@ -0,0 +1,54 @@ +import { Component, OnDestroy, OnInit, Output, EventEmitter } from '@angular/core'; +import { MatDialog, MatDialogModule } from '@angular/material/dialog'; +import { MatIconModule } from '@angular/material/icon' +import { MatButtonModule } from '@angular/material/button' +import { TimeseriesChartConfigComponent } from '@components/timeseries-chart/timeseries-chart-config'; +import { AppState } from '@store'; +import { Store } from '@ngrx/store'; +import { SubSink } from 'subsink'; +import { getSearchType } from '@store/search'; +import { SearchType } from '@models'; +import { CommonModule } from '@angular/common'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatButtonToggleModule } from '@angular/material/button-toggle'; +@Component({ + selector: 'app-chart-modal', + standalone: true, + imports: [ + CommonModule, + MatDialogModule, + MatIconModule, + MatButtonModule, + TimeseriesChartConfigComponent, + MatMenuModule, + MatButtonToggleModule, +], + templateUrl: './chart-modal.component.html', + styleUrl: './chart-modal.component.scss' +}) + +export class ChartModalComponent implements OnInit, OnDestroy { + private subs = new SubSink() + public searchType: SearchType; + public SearchTypes = SearchType; + @Output() public resetReferenceEvent = new EventEmitter(); + + constructor(public dialog: MatDialog, + private $store: Store, + ) { + } + + ngOnInit(): void { + this.subs.add(this.$store.select(getSearchType).subscribe( + searchtype => this.searchType = searchtype + )) + } + public onResetReference() { + this.resetReferenceEvent.emit(); + } + + ngOnDestroy(): void { + this.subs.unsubscribe() + } + +} diff --git a/src/app/components/shared/docs-modal/docs-modal.component.html b/src/app/components/shared/docs-modal/docs-modal.component.html index 6b879f39a..02c19a3d0 100644 --- a/src/app/components/shared/docs-modal/docs-modal.component.html +++ b/src/app/components/shared/docs-modal/docs-modal.component.html @@ -1,10 +1,17 @@ - + {{ text }} - + + + description + + + - {{ icon }} + {{ icon }} - + + + diff --git a/src/app/components/shared/docs-modal/docs-modal.component.scss b/src/app/components/shared/docs-modal/docs-modal.component.scss index fe6b85403..7b5db041a 100644 --- a/src/app/components/shared/docs-modal/docs-modal.component.scss +++ b/src/app/components/shared/docs-modal/docs-modal.component.scss @@ -4,9 +4,24 @@ cursor: pointer; } +.icon-size { + height: 16px !important; + line-height: 16px !important; +} + .text-link { @include themify($themes) { color: themed('blue-link'); } text-decoration: underline; + +} + +.large-icon { + @include md-icon-size(30px); + min-height: 30px; + margin-right: 0; + @include themify($themes) { + color: themed('dark-primary-text'); + } } diff --git a/src/app/components/shared/docs-modal/docs-modal.component.ts b/src/app/components/shared/docs-modal/docs-modal.component.ts index c1b69618a..697dec0b3 100644 --- a/src/app/components/shared/docs-modal/docs-modal.component.ts +++ b/src/app/components/shared/docs-modal/docs-modal.component.ts @@ -38,8 +38,10 @@ export interface DialogData { export class DocsModalComponent implements OnInit, OnDestroy { @Input() url: string; @Input() text: string; - @Input() icon: string = 'info'; + @Input() icon: string = 'read_more'; + @Input() description: string; @Input() tooltip: string; + public docURL: string; public safeDocURL: any; diff --git a/src/app/components/shared/search-button/search-button.component.html b/src/app/components/shared/search-button/search-button.component.html index 757ae6ada..d5d668cf3 100644 --- a/src/app/components/shared/search-button/search-button.component.html +++ b/src/app/components/shared/search-button/search-button.component.html @@ -44,11 +44,11 @@ @@ -92,7 +92,7 @@ [matTooltipDisabled]="isLoggedIn" matTooltip="{{'SIGN_IN_TO_SEE_YOUR_SAVED_FILTERS' | translate}}" matTooltipPosition="after"> - -
+
+
+
@@ -21,91 +20,82 @@
- -
-
-
- {{ type.nameKey | translate}} + @for(type of searchTypeSelectors.search; track type.nameKey; let last = $last) { + +
+
+
+ {{ type.nameKey | translate}} +
+
+ + {{ key | translate }} + + +
-
- - {{ key | translate }} +
+ + {{ type.icon}} +
- - - -
-
- - {{ type.icon}} - - -
-
-
- - - + + @if(!last) { +
+ } + } +
+
-
+
{{'ON_DEMAND_PRODUCTS' | translate}} + {{'SIGN_IN_TO_ACCESS' | translate}} +
{{'ON_DEMAND_SEARCH_ALLOWS_YOU_TO_VIEW_YOUR_SUBMITTED_ON_DEMAND_JOBS' | translate}} -
- - + - +
-
+
- - -
-
-
- {{'DERIVED_DATASETS' | translate }} + +
+
+
+ {{'DERIVED_DATASETS' | translate }} +
+
+ {{'DERIVED_DATASETS_CONTAIN_A_COLLECTION_OF_DATASETS_AVAILABLE_TO_VIEW_AND_DOWNLOAD'| translate }} +
-
- {{'DERIVED_DATASETS_CONTAIN_A_COLLECTION_OF_DATASETS_AVAILABLE_TO_VIEW_AND_DOWNLOAD'| translate }} +
+ {{ 'DATASET_LINKED' | translate }}
-
- {{ 'DATASET_LINKED' | translate }} -
-
- +
+
+ (click)="onOpenDerivedDataset(dataset.info_url, dataset.name); $event.stopPropagation();">
-
+
{{ dataset.name | translate }}
@@ -113,18 +103,20 @@ {{ dataset.info | translate}}
- - + +
-
- +
+
-
diff --git a/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.scss b/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.scss index 46b44a4e0..0e4d83a10 100644 --- a/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.scss +++ b/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.scss @@ -9,9 +9,12 @@ .menu-item-icon { @include themify($themes) { color: themed("dark-primary-text"); + font-size: 50px !important; + height: 50px !important; + width: 50px !important; } - @include md-icon-size(70px); + @include md-icon-size(50px); margin-right: 0; } @@ -20,6 +23,11 @@ padding: 0; } +.category-hr { + padding: 0; + border-top: 2px solid; +} + .mat-mdc-menu-item { padding: 0; } @@ -28,10 +36,26 @@ display: flex; } +.menu-item-inner { + width: calc(100% - 20px) !important; + margin: 5px 5px 15px 15px; +} + +.menu-item-content { + min-width: 400px; +} + +.menu-item-aside { + //min-width: 130px; +} + .item-title { font-weight: bold; } +.item-content { +} + .mat-mdc-card-actions { padding: 0; margin: 0; @@ -47,7 +71,7 @@ } .limitTextHeight { - height: 37px; + height: 55px; overflow: hidden; } @@ -182,7 +206,6 @@ } } - .login-prompt { font-style: italic; } @@ -190,3 +213,8 @@ .login-hidden { display: none; } + +.read-more-icon { + position: relative; + top: 3px; +} diff --git a/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.ts b/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.ts index f60fb4e1f..2855b8bdf 100644 --- a/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.ts +++ b/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.ts @@ -44,7 +44,8 @@ export class SearchTypeSelectorComponent implements OnInit, OnDestroy { private subs = new SubSink(); public isReadMore = true; - public searchTypeSelectors: models.SearchTypeSelector[] = [ + public searchTypeSelectors: {'search':models.SearchTypeSelector[]; 'tools':models.SearchTypeSelector[] } = { + 'search':[ { searchType: models.SearchType.DATASET, nameKey:'GEOGRAPHIC', @@ -52,14 +53,67 @@ export class SearchTypeSelectorComponent implements OnInit, OnDestroy { helpUrl:'https://docs.asf.alaska.edu/vertex/manual/#geographic-search-options', icon:'travel_explore', iconType: models.IconType.MATERIAL, - }, { + }, + { searchType: models.SearchType.LIST, nameKey: 'LIST', descriptionKeys:['LIST_SEARCH_ALLOWS_YOU_TO_ENTER_OR_UPLOAD_A_LIST_OF_SCENE_OR_FILE_NAMES'], helpUrl:'https://docs.asf.alaska.edu/vertex/manual/#list-search-options', icon: 'list', iconType: models.IconType.MATERIAL, - }, { + }, + { + searchType: models.SearchType.SBAS, + nameKey:'SBAS', + descriptionKeys:[ + 'SBAS_SEARCH_PROVIDES_PERPENDICULAR_AND_TEMPORAL_BASELINE_DATA_AS_WELL_AS_SCENE_PAIRS_FOR_A_CHOSEN', + 'REFERENCE_SCENE', + ], + helpUrl:'https://docs.asf.alaska.edu/vertex/manual/#sbas-search-options', + icon:'assets/icons/sbas-chart.jpg', + iconType: models.IconType.IMAGE, + }, + { + searchType: models.SearchType.BASELINE, + nameKey:'BASELINE', + descriptionKeys:[ + 'BASELINE_SEARCH_PROVIDES_VISUALIZATION_OF_PERPENDICULAR_AND_TEMPORAL_BASELINE_DATA_FOR_A_CHOSEN', + ], + helpUrl:'https://docs.asf.alaska.edu/vertex/manual/#baseline-search-options', + icon:'assets/icons/baseline-chart.jpg', + iconType: models.IconType.IMAGE, + }, + { + searchType: models.SearchType.DISPLACEMENT, + nameKey:'DISPLACEMENT', + descriptionKeys:['DISPLACEMENT_DESCRIPTION'], + helpUrl:'https://docs.asf.alaska.edu/vertex/manual/#baseline-search-options', + icon:'track_changes', + iconType: models.IconType.MATERIAL, + }, + { + searchType: models.SearchType.SARVIEWS_EVENTS, + nameKey:'EVENT', + descriptionKeys:['EVENT_SEARCH_HARNESSES_THE_CAPABILITIES_OF_SAR_PROCESSING_TO_MONITOR_NATURAL_DISASTERS'], + helpUrl:'https://docs.asf.alaska.edu/vertex/manual/#event-search-options', + icon:'volcano', + iconType: models.IconType.MATERIAL, + }, + ], + +'tools':[ + { + searchType: models.SearchType.DISPLACEMENT, + nameKey:'DISPLACEMENT', + descriptionKeys:[ + 'BASELINE_SEARCH_PROVIDES_VISUALIZATION_OF_PERPENDICULAR_AND_TEMPORAL_BASELINE_DATA_FOR_A_CHOSEN', + 'REFERENCE_SCENE', + ], + helpUrl:'https://docs.asf.alaska.edu/vertex/manual/#baseline-search-options', + icon:'zoom', + iconType: models.IconType.MATERIAL, + }, + { searchType: models.SearchType.BASELINE, nameKey:'BASELINE', descriptionKeys:[ @@ -79,15 +133,8 @@ export class SearchTypeSelectorComponent implements OnInit, OnDestroy { helpUrl:'https://docs.asf.alaska.edu/vertex/manual/#sbas-search-options', icon:'assets/icons/sbas-chart.jpg', iconType: models.IconType.IMAGE, - }, { - searchType: models.SearchType.SARVIEWS_EVENTS, - nameKey:'EVENT', - descriptionKeys:['EVENT_SEARCH_HARNESSES_THE_CAPABILITIES_OF_SAR_PROCESSING_TO_MONITOR_NATURAL_DISASTERS'], - helpUrl:'https://docs.asf.alaska.edu/vertex/manual/#event-search-options', - icon:'volcano', - iconType: models.IconType.MATERIAL, } - ]; + ]}; constructor( public translate: TranslateService, diff --git a/src/app/components/sidebar/saved-searches/saved-search/search-filters/displacement-filters/displacement-filters.component.html b/src/app/components/sidebar/saved-searches/saved-search/search-filters/displacement-filters/displacement-filters.component.html new file mode 100644 index 000000000..00de67696 --- /dev/null +++ b/src/app/components/sidebar/saved-searches/saved-search/search-filters/displacement-filters/displacement-filters.component.html @@ -0,0 +1,27 @@ +
+ @if(!!filters.flightDirections[0]) { +
+ {{ 'FLIGHT_DIR' | translate }}: {{ filters.flightDirections[0] }} +
+ } + @if(!!filters.seriesStates) { +
+ {{ 'SERIES' | translate }}: +
    + @for(item of (filters.seriesStates | keyvalue); track item.key) { +
  • {{item.value.name}}: {{item.value.wkt}}
    • + } +
+
+ } + @if(filters.dateRange && filters.dateRange.start) { +
+ {{ 'START' | translate}}: {{ filters.dateRange.start | shortDate }} +
+ } + @if(filters.dateRange && filters.dateRange.end) { +
+ {{'END' | translate}}: {{ filters.dateRange.end | shortDate }} +
+ } +
diff --git a/src/app/components/sidebar/saved-searches/saved-search/search-filters/displacement-filters/displacement-filters.component.scss b/src/app/components/sidebar/saved-searches/saved-search/search-filters/displacement-filters/displacement-filters.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/components/sidebar/saved-searches/saved-search/search-filters/displacement-filters/displacement-filters.component.ts b/src/app/components/sidebar/saved-searches/saved-search/search-filters/displacement-filters/displacement-filters.component.ts new file mode 100644 index 000000000..7925edb50 --- /dev/null +++ b/src/app/components/sidebar/saved-searches/saved-search/search-filters/displacement-filters/displacement-filters.component.ts @@ -0,0 +1,13 @@ +import { Component, Input } from '@angular/core'; +import { DisplacementFiltersType } from '@models'; + +@Component({ + selector: 'app-displacement-filters', + standalone: false, + templateUrl: './displacement-filters.component.html', + styleUrl: './displacement-filters.component.scss' +}) +export class DisplacementFiltersComponent { + @Input() filters: DisplacementFiltersType; + +} diff --git a/src/app/components/sidebar/saved-searches/saved-search/search-filters/search-filters.component.html b/src/app/components/sidebar/saved-searches/saved-search/search-filters/search-filters.component.html index 7e8a4993c..502df2f02 100644 --- a/src/app/components/sidebar/saved-searches/saved-search/search-filters/search-filters.component.html +++ b/src/app/components/sidebar/saved-searches/saved-search/search-filters/search-filters.component.html @@ -18,4 +18,9 @@ *ngIf="search.searchType === SearchType.SBAS" [filters]="search.filters | SBASFilter"> + +
diff --git a/src/app/components/sidebar/saved-searches/saved-search/search-filters/search-filters.module.ts b/src/app/components/sidebar/saved-searches/saved-search/search-filters/search-filters.module.ts index 349951eaf..cd5b49475 100644 --- a/src/app/components/sidebar/saved-searches/saved-search/search-filters/search-filters.module.ts +++ b/src/app/components/sidebar/saved-searches/saved-search/search-filters/search-filters.module.ts @@ -7,6 +7,7 @@ import { GeographicSearchFiltersComponent } from './geographic-search-filters/ge import { ListSearchFiltersComponent } from './list-search-filters/list-search-filters.component'; import { BaselineSearchFiltersComponent } from './baseline-search-filters/baseline-search-filters.component'; import { SbasSearchFiltersComponent } from './sbas-search-filters/sbas-search-filters.component'; +import { DisplacementFiltersComponent } from './displacement-filters/displacement-filters.component'; import { SharedModule } from '@shared'; @NgModule({ @@ -15,12 +16,13 @@ import { SharedModule } from '@shared'; GeographicSearchFiltersComponent, ListSearchFiltersComponent, BaselineSearchFiltersComponent, - SbasSearchFiltersComponent + SbasSearchFiltersComponent, + DisplacementFiltersComponent ], imports: [ CommonModule, PipesModule, - SharedModule + SharedModule, ], exports: [ SearchFiltersComponent, diff --git a/src/app/components/timeseries-chart/index.ts b/src/app/components/timeseries-chart/index.ts new file mode 100644 index 000000000..16f9c5115 --- /dev/null +++ b/src/app/components/timeseries-chart/index.ts @@ -0,0 +1,2 @@ +export * from './timeseries-chart.component'; +export * from './timeseries-chart.module'; diff --git a/src/app/components/timeseries-chart/regression-line.ts b/src/app/components/timeseries-chart/regression-line.ts new file mode 100644 index 000000000..9276e33cd --- /dev/null +++ b/src/app/components/timeseries-chart/regression-line.ts @@ -0,0 +1,69 @@ +// imported from https://github.com/simple-statistics/simple-statistics + +export function linearRegression(data) { + let m; + let b; + + // Store data length in a local variable to reduce + // repeated object property lookups + const dataLength = data.length; + + //if there's only one point, arbitrarily choose a slope of 0 + //and a y-intercept of whatever the y of the initial point is + if (dataLength === 1) { + m = 0; + b = data[0][1]; + } else { + // Initialize our sums and scope the `m` and `b` + // variables that define the line. + let sumX = 0; + let sumY = 0; + let sumXX = 0; + let sumXY = 0; + + // Use local variables to grab point values + // with minimal object property lookups + let point; + let x; + let y; + + // Gather the sum of all x values, the sum of all + // y values, and the sum of x^2 and (x*y) for each + // value. + // + // In math notation, these would be SS_x, SS_y, SS_xx, and SS_xy + for (let i = 0; i < dataLength; i++) { + point = data[i]; + x = point[0]; + y = point[1]; + + sumX += x; + sumY += y; + + sumXX += x * x; + sumXY += x * y; + } + + // `m` is the slope of the regression line + m = + (dataLength * sumXY - sumX * sumY) / + (dataLength * sumXX - sumX * sumX); + + // `b` is the y-intercept of the line. + b = sumY / dataLength - (m * sumX) / dataLength; + } + + // Return both values as an object. + return { + m: m, + b: b + }; + } + export function linearRegressionLine(mb /*: { b: number, m: number }*/) { + // Return a function that computes a `y` value for each + // x value it is given, based on the values of `b` and `a` + // that we just computed. + return function (x) { + return mb.b + mb.m * x; + }; + } \ No newline at end of file diff --git a/src/app/components/timeseries-chart/timeseries-chart-config/index.ts b/src/app/components/timeseries-chart/timeseries-chart-config/index.ts new file mode 100644 index 000000000..033bfe83a --- /dev/null +++ b/src/app/components/timeseries-chart/timeseries-chart-config/index.ts @@ -0,0 +1 @@ +export * from './timeseries-chart-config.component'; diff --git a/src/app/components/timeseries-chart/timeseries-chart-config/timeseries-chart-config.component.html b/src/app/components/timeseries-chart/timeseries-chart-config/timeseries-chart-config.component.html new file mode 100644 index 000000000..26e4fb5f4 --- /dev/null +++ b/src/app/components/timeseries-chart/timeseries-chart-config/timeseries-chart-config.component.html @@ -0,0 +1,5 @@ +
+ {{ 'SHOW_LINES' | translate}} + {{ 'SHOW_LINEAR_FIT' | translate }} + +
diff --git a/src/app/components/timeseries-chart/timeseries-chart-config/timeseries-chart-config.component.scss b/src/app/components/timeseries-chart/timeseries-chart-config/timeseries-chart-config.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/components/timeseries-chart/timeseries-chart-config/timeseries-chart-config.component.ts b/src/app/components/timeseries-chart/timeseries-chart-config/timeseries-chart-config.component.ts new file mode 100644 index 000000000..9e68dc2f4 --- /dev/null +++ b/src/app/components/timeseries-chart/timeseries-chart-config/timeseries-chart-config.component.ts @@ -0,0 +1,61 @@ +import { Component, OnDestroy, OnInit, Output, EventEmitter } from '@angular/core'; +import { MatIconModule } from '@angular/material/icon'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCheckboxChange, MatCheckboxModule } from '@angular/material/checkbox'; +import { Store } from '@ngrx/store'; +import { AppState } from '@store'; +import { SubSink } from 'subsink'; +import * as chartsStore from '@store/charts' +import { SharedModule } from "@shared"; + +@Component({ + selector: 'app-timeseries-chart-config', + standalone: true, + imports: [MatIconModule, MatButtonModule, MatCheckboxModule,SharedModule,], + templateUrl: './timeseries-chart-config.component.html', + styleUrl: './timeseries-chart-config.component.scss' +}) + + + +export class TimeseriesChartConfigComponent implements OnInit, OnDestroy { + private subs = new SubSink() + public showLines: boolean = true + public showLinearFit = false; + @Output() public resetReferenceEvent = new EventEmitter(); + constructor(private store$: Store) { } + + + public onToggleLines(event: MatCheckboxChange) { + if (event.checked) { + this.store$.dispatch(chartsStore.showGraphLines()) + } else { + this.store$.dispatch(chartsStore.hideGraphLines()) + } + } + public onToggleLinearFit(event: MatCheckboxChange) { + if(event.checked) { + this.store$.dispatch(chartsStore.showLinearFit()); + } else { + this.store$.dispatch(chartsStore.hideLinearFit()); + } + } + + ngOnInit(): void { + this.subs.add(this.store$.select(chartsStore.getShowLines).subscribe( + showLines => this.showLines = showLines + ) + ); + this.subs.add(this.store$.select(chartsStore.getShowLinearFit).subscribe( + showLinearFit => this.showLinearFit = showLinearFit + )) + } + + public resetReference() { + this.resetReferenceEvent.emit(); + } + + ngOnDestroy(): void { + this.subs.unsubscribe() + } +} diff --git a/src/app/components/timeseries-chart/timeseries-chart-export/index.ts b/src/app/components/timeseries-chart/timeseries-chart-export/index.ts new file mode 100644 index 000000000..35d46c436 --- /dev/null +++ b/src/app/components/timeseries-chart/timeseries-chart-export/index.ts @@ -0,0 +1 @@ +export * from './timeseries-chart-export.component'; diff --git a/src/app/components/timeseries-chart/timeseries-chart-export/timeseries-chart-export.component.html b/src/app/components/timeseries-chart/timeseries-chart-export/timeseries-chart-export.component.html new file mode 100644 index 000000000..98a5f433b --- /dev/null +++ b/src/app/components/timeseries-chart/timeseries-chart-export/timeseries-chart-export.component.html @@ -0,0 +1,12 @@ +
+ + +
+ +
+ +
diff --git a/src/app/components/timeseries-chart/timeseries-chart-export/timeseries-chart-export.component.scss b/src/app/components/timeseries-chart/timeseries-chart-export/timeseries-chart-export.component.scss new file mode 100644 index 000000000..fa17726bb --- /dev/null +++ b/src/app/components/timeseries-chart/timeseries-chart-export/timeseries-chart-export.component.scss @@ -0,0 +1,56 @@ +@use "@angular/material" as mat; +@import "asf-theme"; +$config: mat.define-legacy-typography-config(); + +.mat-button-toggle-button { + border: 0; + background: none; + color: inherit; + padding: 0; + margin: 0; + font: inherit; + outline: none; + width: 100%; + cursor: pointer; +} + +.ts-criteria-button-toggle-group { + flex: 0 1 149px !important; + margin-top: 5px; +} + +.ts-criteria-button-toggle { + @include themify($themes) { + background-color: themed('background-white') !important; + } + font-size: 14px; +} + +.mdc-fab--mini { + width: 25px; + height: 20px; + text-align: center; + padding-top: 8px; + border-radius: 4px !important; +} + +.settings-icon { + @include themify($themes) { + color: themed('dark-primary-text') !important; + } + font-size: 16px !important; + margin-left: 0; +} + +.toggle-group-wrapper--layout { + flex-direction: row; + box-sizing: border-box; + display: flex; + place-content: stretch center; + align-items: stretch; +} + +.chart-config-menu-panel { + padding-left: 15px; + padding-right: 15px; +} diff --git a/src/app/components/timeseries-chart/timeseries-chart-export/timeseries-chart-export.component.ts b/src/app/components/timeseries-chart/timeseries-chart-export/timeseries-chart-export.component.ts new file mode 100644 index 000000000..ba265a4ea --- /dev/null +++ b/src/app/components/timeseries-chart/timeseries-chart-export/timeseries-chart-export.component.ts @@ -0,0 +1,54 @@ +import { CommonModule } from '@angular/common'; +import { Component, Input } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; +import { MatButtonToggleModule } from '@angular/material/button-toggle'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatIconModule } from '@angular/material/icon'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatTooltipModule } from '@angular/material/tooltip'; +import { TranslateModule } from '@ngx-translate/core'; +import * as FileSaver from 'file-saver'; +import moment from 'moment'; + +import { + NetcdfService +} from '@services'; +@Component({ + selector: 'app-timeseries-chart-export', + standalone: true, + imports: [ + CommonModule, + MatDialogModule, + MatIconModule, + MatIconModule, + MatButtonModule, + MatMenuModule, + MatButtonToggleModule, + MatTooltipModule, + TranslateModule + ], + templateUrl: './timeseries-chart-export.component.html', + styleUrl: './timeseries-chart-export.component.scss' +}) +export class TimeseriesChartExportComponent { + constructor(private netcdfService: NetcdfService) { } + + @Input() timeSeriesData: { [index: string]: {}[] } = {} + + + private currentDate(): string { + return moment().format('YYYY-MM-DD_hh-mm-ss'); + } + + public onExportCSV() { + + const output = this.netcdfService.toCSV(this.timeSeriesData) + const blob = new Blob([output], { type: 'text/csv' }); + // const url = window.URL.createObjectURL(blob); + FileSaver.saveAs(blob, + `asf-opera-displacement-${this.currentDate()}.csv` + ) + // window.open(url); + // console.log(output) + } +} diff --git a/src/app/components/timeseries-chart/timeseries-chart-flight-direction-toggle/index.ts b/src/app/components/timeseries-chart/timeseries-chart-flight-direction-toggle/index.ts new file mode 100644 index 000000000..c92fc4214 --- /dev/null +++ b/src/app/components/timeseries-chart/timeseries-chart-flight-direction-toggle/index.ts @@ -0,0 +1 @@ +export * from './timeseries-chart-flight-direction-toggle.component' diff --git a/src/app/components/timeseries-chart/timeseries-chart-flight-direction-toggle/timeseries-chart-flight-direction-toggle.component.html b/src/app/components/timeseries-chart/timeseries-chart-flight-direction-toggle/timeseries-chart-flight-direction-toggle.component.html new file mode 100644 index 000000000..abf6dca1c --- /dev/null +++ b/src/app/components/timeseries-chart/timeseries-chart-flight-direction-toggle/timeseries-chart-flight-direction-toggle.component.html @@ -0,0 +1,8 @@ + diff --git a/src/app/components/timeseries-chart/timeseries-chart-flight-direction-toggle/timeseries-chart-flight-direction-toggle.component.scss b/src/app/components/timeseries-chart/timeseries-chart-flight-direction-toggle/timeseries-chart-flight-direction-toggle.component.scss new file mode 100644 index 000000000..d660b2a88 --- /dev/null +++ b/src/app/components/timeseries-chart/timeseries-chart-flight-direction-toggle/timeseries-chart-flight-direction-toggle.component.scss @@ -0,0 +1,41 @@ +@import "asf-theme"; +@import "deluxe-menu"; +@import "deluxe-menu-2"; + +.button-label { + @include themify($themes) { + color: themed("dark-primary-text"); + } + cursor: pointer; + font-size: 14px; + font-weight: 400; + padding-right: 10px; + text-align: left; + transform: translateY(-1.2812em) scale(0.75) perspective(100px) tranlatez(0.0011px); +} + + +.control-icon { + @include themify($themes) { + color: themed('dark-primary-text'); + } + + transform: scale(1.5); + + margin-top: -4px; + + @include md-icon-size($asf-ribbon-icon-size); +} + +/* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ +.control-mat-button-toggle { + @include themify($themes) { + background-color: themed('background-white'); + } +} + +.button-display-container { + display: flex; + flex-direction: row; + align-items: center; +} diff --git a/src/app/components/timeseries-chart/timeseries-chart-flight-direction-toggle/timeseries-chart-flight-direction-toggle.component.ts b/src/app/components/timeseries-chart/timeseries-chart-flight-direction-toggle/timeseries-chart-flight-direction-toggle.component.ts new file mode 100644 index 000000000..a7fdddc85 --- /dev/null +++ b/src/app/components/timeseries-chart/timeseries-chart-flight-direction-toggle/timeseries-chart-flight-direction-toggle.component.ts @@ -0,0 +1,46 @@ +import { Component, OnInit } from '@angular/core'; +import { Store } from '@ngrx/store'; +import { AppState } from '@store'; +import { SubSink } from 'subsink'; +import * as filtersStore from '@store/filters'; +import * as models from '@models'; +import { map } from 'rxjs'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatButtonModule } from '@angular/material/button'; +import { MatIconModule } from '@angular/material/icon'; +import { MatButtonToggleModule } from '@angular/material/button-toggle'; +@Component({ + selector: 'app-timeseries-chart-flight-direction-toggle', + standalone: true, + imports: [TranslateModule, MatButtonModule, MatIconModule, MatButtonToggleModule], + templateUrl: './timeseries-chart-flight-direction-toggle.component.html', + styleUrl: './timeseries-chart-flight-direction-toggle.component.scss' +}) +export class TimeseriesChartFlightDirectionToggleComponent implements OnInit { + private subs = new SubSink() + public flightDirection: models.FlightDirection = models.FlightDirection.ASCENDING; + public FlightDirections = models.FlightDirection; + constructor(private store$: Store) {} + + ngOnInit(): void { + this.subs.add( + this.store$.select(filtersStore.getFlightDirections).pipe( + map(dir => dir[0] ?? this.flightDirection) + ).subscribe( + dir => this.flightDirection = dir + ) + ) + + } + + public onToggle(): void { + const outputDirection = this.flightDirection === this.FlightDirections.ASCENDING ? this.FlightDirections.DESCENDING : this.FlightDirections.ASCENDING + + const dir = outputDirection + .toUpperCase(); + + + const action = new filtersStore.SetFlightDirections([dir]); + this.store$.dispatch(action); + } +} diff --git a/src/app/components/timeseries-chart/timeseries-chart-temporal-slider/timeseries-chart-temporal-slider.component.html b/src/app/components/timeseries-chart/timeseries-chart-temporal-slider/timeseries-chart-temporal-slider.component.html new file mode 100644 index 000000000..de8eaa7d0 --- /dev/null +++ b/src/app/components/timeseries-chart/timeseries-chart-temporal-slider/timeseries-chart-temporal-slider.component.html @@ -0,0 +1 @@ + diff --git a/src/app/components/timeseries-chart/timeseries-chart-temporal-slider/timeseries-chart-temporal-slider.component.scss b/src/app/components/timeseries-chart/timeseries-chart-temporal-slider/timeseries-chart-temporal-slider.component.scss new file mode 100644 index 000000000..e821ffea6 --- /dev/null +++ b/src/app/components/timeseries-chart/timeseries-chart-temporal-slider/timeseries-chart-temporal-slider.component.scss @@ -0,0 +1,50 @@ +/* Contenedor principal del slider */ +.displacement-slider { + display: block; + margin: -10px 60px 20px 75px; /* Centra el slider horizontalmente */ + box-sizing: border-box; +} + +.noUi-connect { + background-color: #007BFF; /* Color principal */ + height: 6px; /* Ajusta el grosor de la barra conectada */ +} + +.noUi-handle { + background-color: #FFFFFF; + border: 2px solid #007BFF; /* Borde que combine con el color principal */ + border-radius: 50%; /* Hace que el control sea redondo */ + height: 20px; + width: 20px; +} + +.noUi-tooltip { + background-color: #333; + color: #fff; + border-radius: 4px; + font-size: 12px; +} + +/* Estilos de las etiquetas debajo del slider */ +.slider-labels { + display: flex; + justify-content: space-between; + width: 100%; /* Ocupa todo el ancho del slider */ + max-width: 95%; /* Limita el ancho para alinearse con el slider */ + margin: 10px auto 0; /* Centra y da espacio superior al slider */ + box-sizing: border-box; +} + +.slider-labels span { + font-size: 12px; + color: #666; /* Color de las etiquetas */ +} + +.noUi-vertical { + width: 8px; +} + +div.noUi-handle.noUi-handle-lower { + width: 16px !important; + right: -5px !important; +} diff --git a/src/app/components/timeseries-chart/timeseries-chart-temporal-slider/timeseries-chart-temporal-slider.component.ts b/src/app/components/timeseries-chart/timeseries-chart-temporal-slider/timeseries-chart-temporal-slider.component.ts new file mode 100644 index 000000000..35fdd405c --- /dev/null +++ b/src/app/components/timeseries-chart/timeseries-chart-temporal-slider/timeseries-chart-temporal-slider.component.ts @@ -0,0 +1,159 @@ +import {Component, ElementRef, OnDestroy, OnInit, ViewChild, Renderer2} from '@angular/core'; +import * as noUiSlider from 'nouislider'; +import {PipsMode} from 'nouislider'; +import {Store} from '@ngrx/store'; +import {AppState} from '@store'; +// import * as models from "@models"; +// import {Observable, Subject} from 'rxjs'; +// import {UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators} from "@angular/forms"; +// import * as filtersStore from "@store/filters"; +import {SubSink} from 'subsink'; +// import {debounceTime, distinctUntilChanged} from "rxjs/operators"; +// import wNumb from 'wnumb'; +import * as filtersStore from '@store/filters'; +import * as models from '@models'; +// import moment from 'moment/moment'; +import {Observable, Subject} from 'rxjs'; +import {debounceTime, distinctUntilChanged, withLatestFrom} from 'rxjs/operators'; + +// import {debounceTime, distinctUntilChanged} from 'rxjs/operators'; + +@Component({ + selector: 'app-timeseries-chart-temporal-slider', + standalone: true, + templateUrl: './timeseries-chart-temporal-slider.component.html', + styleUrls: ['./timeseries-chart-temporal-slider.component.scss'] +}) +export class TimeseriesChartTemporalSliderComponent implements OnInit, OnDestroy { + @ViewChild('ts_slider', { static: true }) sliderRef: ElementRef; + + private subs = new SubSink(); + + public tsSlider: noUiSlider.API; + public timeSeriesSlider: any; + public maxRange: models.Range = {start: 0, end: 100}; + public lastMaxRange: models.Range = {start: 0, end: 100}; + public selectedRange: models.Range = {start: 0, end: 100}; + public startDate$ = this.store$.select(filtersStore.getStartDate); + public endDate$ = this.store$.select(filtersStore.getEndDate); + public startDate: Date = new Date(); + public endDate: Date = new Date(); + private userChangedRange: boolean = false; + + constructor( + private store$: Store, + private renderer: Renderer2 + ){} + + ngOnInit() { + + this.timeSeriesSlider = this.makeTimeSeriesSlider(this.sliderRef); + this.tsSlider = this.timeSeriesSlider.slider; + + this.subs.add( + this.store$.select(filtersStore.getTemporalRange).pipe(withLatestFrom(this.store$.select(filtersStore.getDateRange))).subscribe( + ([temp,dateRange]) => { + if (!temp.start || !temp.end) { return; } + this.maxRange = {start: temp.start.valueOf(), end: temp.end.valueOf()}; + if (this.lastMaxRange.start !== this.maxRange.start || this.lastMaxRange.end !== this.maxRange.end) { + this.lastMaxRange.start = this.maxRange.start; + this.lastMaxRange.end = this.maxRange.end; + this.sliderRef.nativeElement.noUiSlider.updateOptions({ + range: { + 'min': this.maxRange.start, + 'max': this.maxRange.end + } + }); + if (!this.userChangedRange) { + this.sliderRef.nativeElement.noUiSlider.updateOptions({ + start: [dateRange.start ?? this.maxRange.start, dateRange.end ?? this.maxRange.end], + }); + } + this.renderer.setStyle(this.sliderRef.nativeElement, 'visibility', 'visible'); + } + } + ) + ); + + this.subs.add( + this.timeSeriesSlider.values$.subscribe( + ([start, end]) => { + if (!start || !end) { return; } + if (start === this.selectedRange.start && end === this.selectedRange.end) { + return; + } + this.selectedRange = {start: start, end: end}; + this.sliderRef.nativeElement.noUiSlider.updateOptions({ + start: [this.selectedRange.start, this.selectedRange.end] + }); + this.userChangedRange = true; + const action = new filtersStore.SetStartDate(new Date(start)); + this.store$.dispatch(action); + const action2 = new filtersStore.SetEndDate(new Date(end)); + this.store$.dispatch(action2); + } + ) + ); + + } + + private timestamp(str) { + return new Date(str).getTime(); + } + + // Create a string representation of the date. + public formatDate(date: any) :string { + let fDateStr = date.toLocaleDateString() + return ( fDateStr ); + } + + public toFormat(value: any) { + if (value == 0) return 0; + return new Date(value).toLocaleDateString(); + } + + public makeTimeSeriesSlider(filterRef: ElementRef): { slider: noUiSlider.API; values$: Observable } { + const self = this; + const values$ = new Subject(); + // Steps of one day + const increment = 24 * 60 * 60 * 1000; + const slider = noUiSlider.create(filterRef.nativeElement, { + start: [1, 100], + behaviour: 'tap-drag', + tooltips: [{to: (d) => self.toFormat(d)}, {to: (d) => self.toFormat(d)}], + connect: true, + step: increment, + range: { + 'min': 1, + 'max': 100 + }, + pips: { + mode: PipsMode.Count, + values: 5, + stepped: true, + density: 4, + format: { + from: (value) => {return self.timestamp(value);}, + to: self.toFormat + } + }, + }); + + slider.on('update', (values: any[], _: any) => { + values$.next(values.map(v => +v)); + }); + + return { + slider, + values$: values$.asObservable().pipe( + debounceTime(500), + distinctUntilChanged() + ) + }; + + } + + ngOnDestroy(){ + this.subs.unsubscribe(); + } +} diff --git a/src/app/components/timeseries-chart/timeseries-chart-voronoi.ts b/src/app/components/timeseries-chart/timeseries-chart-voronoi.ts new file mode 100644 index 000000000..321d7252b --- /dev/null +++ b/src/app/components/timeseries-chart/timeseries-chart-voronoi.ts @@ -0,0 +1,179 @@ +import {Component, ElementRef, OnDestroy, OnInit, ViewChild} from '@angular/core'; +import { HttpClient } from '@angular/common/http'; + + +import * as d3 from 'd3'; + +@Component({ + selector: 'app-timeseries-chart', + templateUrl: './timeseries-chart.component.html', + styleUrl: './timeseries-chart.component.scss' +}) +export class TimeseriesChartComponent implements OnInit, OnDestroy { + @ViewChild('timeseriesChart', {static: true}) timeseriesChart: ElementRef; + public url: string = '/assets/unemployment.json'; + public unemploymentData: any; + public svg?: d3.Selection; + public showVoronoi = false; + + + constructor(private http: HttpClient) { + } + + public ngOnInit(): void { + this.http.get(this.url).subscribe(res => { + this.unemploymentData = res; + console.log('this.unemploymentData',this.unemploymentData); + this.makeChartFromFile(); + }); + } + + public makeChartFromFile() { + this.makeChart(d3, this.unemploymentData, this.showVoronoi); + } + + public toggleVoronoi() { + this.showVoronoi = !this.showVoronoi; + this.makeChartFromFile(); + } + + public makeChart(d3,unemployment,voronoi){ + console.log('***** makeChart *****'); + console.log('d3', d3); + console.log('unemployment', unemployment); + console.log('voronoi', voronoi); + + if (this.svg) { + d3.selectAll('#timeseries-chart > svg').remove(); + d3.selectAll('.tooltip').remove(); + } + + const element = document.getElementById("timeseriesChart"); + element.innerHTML = ''; + // Specify the chart’s dimensions. + const width = 928; + const height = 600; + const marginTop = 20; + const marginRight = 20; + const marginBottom = 30; + const marginLeft = 30; + + // Create the positional scales. + const x = d3.scaleUtc() + .domain(d3.extent(unemployment, d => new Date(d.date))) + .range([marginLeft, width - marginRight]); + + const y = d3.scaleLinear() + .domain([0, d3.max(unemployment, d => d.unemployment)]).nice() + .range([height - marginBottom, marginTop]); + + // Create the SVG container. + this.svg = d3.select("#timeseriesChart").append("svg") + .attr("width", width) + .attr("height", height) + .attr("viewBox", [0, 0, width, height]) + .attr("style", "max-width: 100%; height: auto; overflow: visible; font: 10px sans-serif;"); + + // Add the horizontal axis. + this.svg.append("g") + .attr("transform", `translate(0,${height - marginBottom})`) + .call(d3.axisBottom(x).ticks(width / 80).tickSizeOuter(0)); + + // Add the vertical axis. + this.svg.append("g") + .attr("transform", `translate(${marginLeft},0)`) + .call(d3.axisLeft(y)) + .call(g => g.select(".domain").remove()) + .call(voronoi ? () => {} : g => g.selectAll(".tick line").clone() + .attr("x2", width - marginLeft - marginRight) + .attr("stroke-opacity", 0.1)) + .call(g => g.append("text") + .attr("x", -marginLeft) + .attr("y", 10) + .attr("fill", "currentColor") + .attr("text-anchor", "start") + .text("↑ Unemployment (%)")); + + + // Compute the points in pixel space as [x, y, z], where z is the name of the series. + const points = unemployment.map((d) => [x(new Date(d.date)), y(d.unemployment), d.division]); + console.log('points', points); + console.log('unemployment', unemployment); + + // An optional Voronoi display (for fun). + if (voronoi) this.svg.append("path") + .attr("fill", "none") + .attr("stroke", "#ccc") + .attr("d", d3.Delaunay + .from(points) + .voronoi([0, 0, width, height]) + .render()); + + // Group the points by series. + const groups = d3.rollup(points, v => Object.assign(v, {z: v[0][2]}), d => d[2]); + console.log('groups', groups); + + // Draw the lines. + const line = d3.line(); + const path = this.svg.append("g") + .attr("fill", "none") + .attr("stroke", "steelblue") + .attr("stroke-width", 1.5) + .attr("stroke-linejoin", "round") + .attr("stroke-linecap", "round") + .selectAll("path") + .data(groups.values()) + .join("path") + .style("mix-blend-mode", "multiply") + .attr("d", line); + + // Add an invisible layer for the interactive tip. + const dot = this.svg.append("g") + .attr("display", "none"); + + dot.append("circle") + .attr("r", 2.5); + + dot.append("text") + .attr("text-anchor", "middle") + .attr("y", -8); + + this.svg + .on("pointerenter", pointerEntered) + .on("pointermove", pointerMoved) + .on("pointerleave", pointerLeft) + .on("touchstart", event => event.preventDefault()); + + return; + + // When the pointer moves, find the closest point, update the interactive tip, and highlight + // the corresponding line. Note: we don't actually use Voronoi here, since an exhaustive search + // is fast enough. + function pointerMoved(event) { + const [xm, ym] = d3.pointer(event); + const i = d3.leastIndex(points, ([x, y]) => Math.hypot(x - xm, y - ym)); + const [x, y, k] = points[i]; + path.style("stroke", ({z}) => z === k ? null : "#ddd").filter(({z}) => z === k).raise(); + dot.attr("transform", `translate(${x},${y})`); + dot.select("text").text(k); + // this.svg.property("value", unemployment[i]).dispatch("input", {bubbles: true}); + } + + function pointerEntered() { + path.style("mix-blend-mode", null).style("stroke", "#ddd"); + dot.attr("display", null); + } + + function pointerLeft() { + path.style("mix-blend-mode", "multiply").style("stroke", null); + dot.attr("display", "none"); + // this.svg.node().value = null; + // this.svg.dispatch("input", {bubbles: true}); + } + + } + + ngOnDestroy() { + // this.subs.unsubscribe(); + } +} diff --git a/src/app/components/timeseries-chart/timeseries-chart-zoom/timeseries-chart-zoom.component.html b/src/app/components/timeseries-chart/timeseries-chart-zoom/timeseries-chart-zoom.component.html new file mode 100644 index 000000000..7232920b9 --- /dev/null +++ b/src/app/components/timeseries-chart/timeseries-chart-zoom/timeseries-chart-zoom.component.html @@ -0,0 +1,22 @@ +
+
+
+ + + add + + + + aspect_ratio + + + + remove + + +
+
+
diff --git a/src/app/components/timeseries-chart/timeseries-chart-zoom/timeseries-chart-zoom.component.scss b/src/app/components/timeseries-chart/timeseries-chart-zoom/timeseries-chart-zoom.component.scss new file mode 100644 index 000000000..f30a18101 --- /dev/null +++ b/src/app/components/timeseries-chart/timeseries-chart-zoom/timeseries-chart-zoom.component.scss @@ -0,0 +1,17 @@ +@use "@angular/material" as mat; +@import "asf-theme"; + +.ts-toggle-group { + height: 20px !important; + box-shadow: rgba(0, 0, 0, 0.2) 0px 3px 5px -1px, + rgba(0, 0, 0, 0.14) 0px 6px 10px 0px, + rgba(0, 0, 0, 0.12) 0px 1px 18px 0px; +} + +.control-icon { + font-size: 16px; +} + +:host ::ng-deep .mat-button-toggle-appearance-standard .mat-button-toggle-label-content { + padding: 0 5px !important; +} diff --git a/src/app/components/timeseries-chart/timeseries-chart-zoom/timeseries-chart-zoom.component.ts b/src/app/components/timeseries-chart/timeseries-chart-zoom/timeseries-chart-zoom.component.ts new file mode 100644 index 000000000..d95651d2e --- /dev/null +++ b/src/app/components/timeseries-chart/timeseries-chart-zoom/timeseries-chart-zoom.component.ts @@ -0,0 +1,38 @@ +import {Component, EventEmitter, Output} from '@angular/core'; +import {MatButtonToggle, MatButtonToggleGroup} from '@angular/material/button-toggle'; +import {MatIcon} from '@angular/material/icon'; +import {MatTooltip} from '@angular/material/tooltip'; +import {TranslateModule} from '@ngx-translate/core'; + +@Component({ + selector: 'app-timeseries-chart-zoom', + standalone: true, + imports: [ + MatButtonToggle, + MatButtonToggleGroup, + MatIcon, + MatTooltip, + TranslateModule + ], + templateUrl: './timeseries-chart-zoom.component.html', + styleUrl: './timeseries-chart-zoom.component.scss' +}) +export class TimeseriesChartZoomComponent { + @Output() zoomInEvent = new EventEmitter(); + @Output() zoomOutEvent = new EventEmitter(); + @Output() zoomToFitEvent = new EventEmitter(); + + public zoomIn(): void { + console.log('zoomIn'); + this.zoomInEvent.emit(); + } + + public zoomOut(): void { + this.zoomOutEvent.emit(); + } + + public zoomToFit(): void { + this.zoomToFitEvent.emit(); + } + +} diff --git a/src/app/components/timeseries-chart/timeseries-chart.component.html b/src/app/components/timeseries-chart/timeseries-chart.component.html new file mode 100644 index 000000000..d43c6451d --- /dev/null +++ b/src/app/components/timeseries-chart/timeseries-chart.component.html @@ -0,0 +1,70 @@ +
+
+ +
+
+ +
+
{{item.seriesNumber}}
+
+
{{item.formula}}
+
+
+ +
+
+ +
+
+ +
+
+
+ + + + @if(isLoading && this.dataSource.length <= 0){ + + } + + + + + +
+ + + +
+
+ {{ 'NO_AREA_ON_INTEREST_SPECIFIED' | translate }}
+ {{ 'PLEASE_SELECT_A_POINT_ON_THE_MAP' | translate }} +
+ + +
+ place +
+ +
+ + diff --git a/src/app/components/timeseries-chart/timeseries-chart.component.scss b/src/app/components/timeseries-chart/timeseries-chart.component.scss new file mode 100644 index 000000000..371fb25f8 --- /dev/null +++ b/src/app/components/timeseries-chart/timeseries-chart.component.scss @@ -0,0 +1,166 @@ +@import "asf-theme"; + +$chart-ctrl-top: 60px; +$chart-ctrl-top-x: 62px; + +.chart-wrapper { + height: calc(100% - 50px); + width: 100%; + display: flex; +} + +#timeseriesChart { + height: 100%; + width: 100%; +} + +.ts-chart-details { +// position: absolute; + display: flex; + flex-direction: row; + background-color: #f5f5f5; + margin: 0 25px 0 45px; + padding: 5px; + color: #65665c; + font-size: 14px; + font-style: italic; +} + +.ts-best-fit-nav { + flex: 0 1 auto; + width: 40px; + min-width: 0; + margin-top: -2px; +} + +.ts-best-fit-formulas { + flex: 1 1 auto +} + +.ts-best-fit-formulas .ts-best-fit-viewport { + height: 35px; + width: 100%; + border: none; +} + +.ts-best-fit-formulas .ts-best-fit-viewport .cdk-virtual-scroll-content-wrapper { + display: flex; + flex-direction: row; +} + +.ts-best-fit-item { + width: 120px; + height: 100%; + //writing-mode: vertical-lr; + display: flex; + align-items: center; + margin-left: 10px; + margin-right: 10px; +} + +.ts-color-swatch { + width: 15px; + height: 15px; + margin-right: 5px; + text-align: center; + color: black; + font-weight: bolder; +} + +::ng-deep .cdk-virtual-scrollable { + overflow-x: auto; + overflow-y: clip; + will-change: scroll-position; + contain: strict; + -webkit-overflow-scrolling: touch; +} +::ng-deep .timeseries-base { + @include themify($themes) { + fill: themed('blue-link'); + } +} + +::ng-deep .baseline-selected { + @include themify($themes) { + fill: themed('err'); + } +} + +::ng-deep .ts-chart-label { + @include themify($themes) { + fill: themed('dark-primary-text'); + overflow-x: visible; + font-size: 14px; + } +} + +.ts-axis-title { + font-size: 15px; +} + +.ts-chart-config-button { + position: absolute; + top: $chart-ctrl-top-x; + right: 65px; +} + +.ts-chart-export-button { + position: absolute; + top: $chart-ctrl-top-x; + right: 210px; +} + +::ng-deep .loading-rect { + @include themify($themes) { + fill: lighten(themed('dark-secondary-text'),20%); + } + fill-opacity: 40%; +} +.disp-spinner { + position: absolute; + display:grid; + height: 75%; + width: 100%; + place-items: center; +} +.ts-chart-zoom { + position: absolute; + top: $chart-ctrl-top; + right: 95px; +} +:host ::ng-deep .ts-reference-point { + fill: red !important; +} + +.message-container{ + text-align: center; + padding-top: 50px; + font-size: 18px; +} + +.icon-container { + display: flex; + justify-content: center; + align-items: center; + margin: 20px auto; + padding: 10px; + width: auto; + height: auto; + max-width: 150px; + max-height: 150px; + border-radius: 10px; +} + +.icon-container mat-icon { + font-size: 200px; + color: lightgray; + width: auto; + height: auto; + line-height: 1; + overflow: visible; +} + +.no-data { + display: none; + +} diff --git a/src/app/components/timeseries-chart/timeseries-chart.component.ts b/src/app/components/timeseries-chart/timeseries-chart.component.ts new file mode 100644 index 000000000..0b395b63b --- /dev/null +++ b/src/app/components/timeseries-chart/timeseries-chart.component.ts @@ -0,0 +1,786 @@ +import {Component, ElementRef, Input, OnDestroy, OnInit, QueryList, ViewChild, ViewChildren, ViewEncapsulation} from '@angular/core'; +import * as d3 from 'd3'; +// import * as models from '@models'; +import { + debounceTime, distinctUntilChanged, map, Observable, withLatestFrom, + // Subject +} from 'rxjs'; + +import { Store } from '@ngrx/store'; +import * as filtersStore from '@store/filters'; +import { AppState } from '@store'; +// import * as sceneStore from '@store/scenes'; +import * as chartsStore from '@store/charts'; +import { SubSink } from 'subsink'; +import { AsfLanguageService } from "@services/asf-language.service"; +import { NetcdfService } from '@services'; +import * as models from '@models'; +import {CdkVirtualScrollViewport} from '@angular/cdk/scrolling'; +import * as uiStore from '@store/ui'; +// import {hidden} from '@services/map/polygon.style'; +// import {style} from '@angular/animations'; +import {linearRegression, linearRegressionLine} from './regression-line' +import {types} from 'sass'; + + +interface TimeSeriesFit { + seriesNumber: number, + color: string, + formula: string +} + +interface DataReady { + name: string, + values: models.TimeSeriesData[], + opacity: number, + color: string, +} + +const unSelectedColor = '#9F9F9F9F'; + +@Component({ + selector: 'app-timeseries-chart', + templateUrl: './timeseries-chart.component.html', + styleUrl: './timeseries-chart.component.scss', + encapsulation: ViewEncapsulation.None, +}) +export class TimeseriesChartComponent implements OnInit, OnDestroy { + // @ViewChild(CdkVirtualScrollViewport) scroll: CdkVirtualScrollViewport; + scrollIndex = 1; + @ViewChildren(CdkVirtualScrollViewport) + viewPorts: QueryList + @ViewChild('tsChartWrapper', { static: true }) tsChartWrapper: ElementRef; + @ViewChild('timeseriesChart', { static: true }) timeseriesChart: ElementRef; + @ViewChild('tsBestFitFormulas', { static: true }) tsBestFitFormulas: ElementRef; + // @ViewChild(CdkVirtualScrollViewport) virtualScroll: CdkVirtualScrollViewport; + @Input() zoomIn$: Observable; + @Input() zoomOut$: Observable; + @Input() zoomToFit$: Observable; + + // @Input() chartData: models.timeseriesChartItemState[]; + + // public scrollIndex = 1; + // public viewPorts: QueryList; + + + public json_data: string = ''; + private svg?: d3.Selection; + public dataSource: models.TimeSeriesChartPoint[] = []; + public dataReadyForChart: DataReady[] = []; + public timeSeriesData: models.TimeSeriesData[] = []; + public averageData = {}; + public displayedColumns: string[] = ['position', 'short_wavelength_displacement', 'interferometric_correlation', 'temporal_coherence'] + private currentTransform: d3.ZoomTransform; + private zoom: d3.ZoomBehavior; + private clipContainer: d3.Selection; + + private width = 640; + private height = 400; + + private x: d3.ScaleTime; + private y: d3.ScaleLinear; + public xAxis: d3.Selection; + private yAxis: d3.Selection; + private dots: d3.Selection; + private lineGraph: d3.Selection; + private toolTip: d3.Selection + public margin = { top: 10, right: 30, bottom: 60, left: 65 }; + private thing: d3.Selection + private hoveredElement; + public hoveredData; + public hoveredDate; + public data: any; + private lines; + private points; + public startDate: Date = new Date(); + public endDate: Date = new Date(); + public lastStartDate: Date = new Date(); + public lastEndDate: Date = new Date(); + public items = Array.from({length: 100000}).map((_, i) => `Item #${i}`); + public formulaOverflow = false; + private flightDirection = models.FlightDirection.ASCENDING; + // Tyler this is where you would put the series and their best fit formulas + public bestFitItems: TimeSeriesFit[] = [ + + ]; + private linearFitLine; + private showLinearFit = false; + + public exportableData: { [index:string]: {}[]} = {} + + + // private selectedScene: string; + @Input() isLoading: boolean = true; + private showLines = true; + private xAxisTitle = ''; + private yAxisTitle = ''; + private dotToolTipText = ''; + + private subs = new SubSink(); + // private allGroup: string[]; + private baseData: models.TimeSeriesData; + + constructor( + private store$: Store, + private language: AsfLanguageService, + private netcdfService: NetcdfService + + ) { } + + public ngOnInit(): void { + + this.translateChartText(); + this.createSVG(); + + this.subs.add( + this.store$.select(chartsStore.getIsChartOutOfDate).subscribe( + + ) + ) + + this.subs.add( + this.netcdfService.cacheUpdated.pipe( + debounceTime(1000), + withLatestFrom(this.store$.select(chartsStore.getTimeseriesChartStates)) + ).subscribe(([_updated_id, chartStates]) => { + this.isLoading = false; + this.refreshChart(chartStates); + })); + + this.subs.add( + this.store$.select(chartsStore.getTimeseriesChartStates).subscribe( + chartStates => { + this.refreshChart(chartStates); + } + ) + ); + + this.subs.add( + this.store$.select(chartsStore.getShowLines).subscribe( + showLines => { + this.showLines = showLines; + if (this.showLines) { + // this.pointGraph = this.clipContainer.append("pointGraph") + this.lineGraph = this.clipContainer.append("path"); + this.formulaOverflow = true; + } else { + this.lineGraph.remove(); + } + this.initChart(this.data); + } + ) + ); + + this.subs.add( + this.store$.select(chartsStore.getShowLinearFit).subscribe( + showLinearFit => { + this.showLinearFit = showLinearFit; + this.initChart(this.data); + } + ) + ) + + this.subs.add( + this.language.translate.onLangChange.subscribe(() => { + this.language.translate.get('SCENE').subscribe((_translated: string) => { + this.translateChartText(); + this.createSVG(); + }); + } + ) + ); + + this.subs.add( + this.store$.select(filtersStore.getStartDate).subscribe( + start => { + this.startDate = start; + if (this.lastStartDate !== this.startDate) { + this.lastStartDate = this.startDate; + this.initChart(this.data); + } + } + ) + ); + + this.subs.add( + this.store$.select(filtersStore.getEndDate).subscribe( + end => { + this.endDate = end; + if (this.lastEndDate !== this.endDate) { + this.lastEndDate = this.endDate; + this.initChart(this.data); + } + } + ) + ); + + this.subs.add( + this.store$.select(filtersStore.getFlightDirections).pipe( + map(dir => dir[0] ?? this.flightDirection) + ).subscribe( + dir => this.flightDirection = dir + ) + ) + + this.subs.add( + this.store$.select(chartsStore.getTimeseriesReference).subscribe( + data => { + this.baseData = data; + this.initChart(this.data); + } + ) + ) + + this.subs.add( + this.store$.select(uiStore.getActiveWkt).pipe(distinctUntilChanged()).subscribe(wkt => { + if (wkt) + this.highlightSeries(wkt); + else + this.resetHighlight() + })); + + + } + + private refreshChart(chartStates: { [key: string]: models.timeseriesChartItemState }): void { + const cache = this.netcdfService.getCache(this.flightDirection) + + const allPointsData: { point: {}, state: models.timeseriesChartItemState }[] = Object.keys(chartStates) + .filter( + wkt => chartStates[wkt].valid + ) + .map( + wkt => ({ point: cache[wkt], state: chartStates[wkt] }) + ); + if(this.baseData) { + const missingBaseSeries = Object.keys(chartStates).findIndex( + wkt => {return chartStates[wkt].seriesNumber === this.baseData.seriesNumber}); + if(missingBaseSeries === -1) { + this.baseData = null; + } + } + this.data = allPointsData; + this.initChart(this.data) + } + + public isOverflowing(): boolean { + return (this.bestFitItems.length > 5); + } + + public translateChartText() { + this.xAxisTitle = this.language.translate.instant('SCENE') + ' ' + + this.language.translate.instant('DATE'); + this.yAxisTitle = this.language.translate.instant('SHORTWAVE_DISPLACEMENT') + ' (' + + this.language.translate.instant('METERS') + ')'; + this.dotToolTipText = this.language.translate.instant('RIGHT_CLICK_SET_BASELINE'); + } + + public onButtonClickPlus() { + this.viewPorts + .toArray() + .forEach((el) => el.scrollToIndex(this.scrollIndex, 'smooth')); + //this.viewPort.scrollToIndex(100, 'smooth'); + this.scrollIndex += 1; + } + + onButtonClickMinus() { + if (this.scrollIndex <= 2) { + this.scrollIndex = 1; + } + this.scrollIndex -= 1; + this.viewPorts + .toArray() + .forEach((el) => el.scrollToIndex(this.scrollIndex, 'smooth')); + //this.viewPort.scrollToIndex(100, 'smooth'); + } + + public onZoomIn(): void { + this.thing.transition().call(this.zoom.scaleBy, 2); + this.updateChart(); + } + + public onZoomOut(): void { + this.thing.transition().call(this.zoom.scaleBy, .5); + this.updateChart(); + } + + public onZoomToFit(): void { + this.thing.transition().call(this.zoom.transform, d3.zoomIdentity); + this.updateChart(); + } + + public initChart(data: {point: {}, state: models.timeseriesChartItemState}[]): void { + this.dataSource = [] + this.dataReadyForChart = [] + this.exportableData = {} + if (data?.[Symbol.iterator]) { + let aoi: string = ''; + for (let result of data) { + aoi = ''; + // pre-process data, remove test v_2 files from results + // won't be necessary in production + if (!!result.point) { + for (let key of Object.keys(result.point)) { + if (key.startsWith('v_2_')) { + delete result.point[key]; + } + if (key.startsWith('aoi')) { + aoi = result.point[key]; + } + } + this.timeSeriesData = []; + for (let key of Object.keys(result.point).filter(x => x !== 'mean' && x !== 'aoi')) { + let daDate = new Date(result.point[key].secondary_datetime).valueOf(); + if (daDate < this.startDate?.valueOf() || daDate > this.endDate?.valueOf()) { continue; } + this.dataSource.push({ + 'aoi': aoi, + 'short_wavelength_displacement': result.point[key].short_wavelength_displacement, + 'interferometric_correlation': result.point[key].interferometric_correlation, + 'temporal_coherence': result.point[key].temporal_coherence, + 'date': result.point[key].secondary_datetime, + 'file_name': key, + 'id': key, + 'temporal_baseline': result.point[key].temporal_baseline, + }) + this.timeSeriesData.push({ + 'short_wavelength_displacement': result.point[key].short_wavelength_displacement - (this.baseData?.base ?? 0), + 'date': result.point[key].secondary_datetime, + 'seriesNumber': result.state.seriesNumber, + 'color': result.state.color, + 'base': result.point[key].short_wavelength_displacement, + 'id': key + result.point[key].short_wavelength_displacement, + }); + + if (result.state.checked) { + const series_key = result.state.seriesNumber.toString() + if (!!!this.exportableData[series_key]) { + this.exportableData[series_key] = [] + } + const slice = { + 'short_wavelength_displacement': result.point[key].short_wavelength_displacement - (this.baseData?.base ?? 0), + 'date': result.point[key].secondary_datetime, + 'wkt': aoi, + 'fileName': key, + + } + this.exportableData[series_key].push(slice) + } + } + this.timeSeriesData.sort((a, b) => { + if(a.date < b.date) { + return -1 + } else { + return 1 + } + }) + this.dataReadyForChart.push({ + name: aoi, + values: this.timeSeriesData, + color: result.state.color, + opacity: result.state.checked ? 1.0 : 0.2, + }); + } + } + } else { + this.dataSource = []; + this.averageData = {}; + } + + this.drawChart(); + } + + private drawChart() { + + this.svg.selectChildren().remove(); + + // Determine scale extents + // const marginBottom = 40; + const short_wavelength_displacements = this.dataSource.map(p => Math.round(((p['short_wavelength_displacement'] as number) + + Number.EPSILON) * 10000) / 10000); + // const short_wavelength_displacements = this.dataSource.map(p => p['short_wavelength_displacement'] as number) + const dates = this.dataSource.map(p => Date.parse(p['date'])).filter(d => !isNaN(d)) + const inner_margins = 1.25 + const min_y = Math.min(...short_wavelength_displacements) * inner_margins + const min_x = Math.min(...dates) + const max_y = Math.max(...short_wavelength_displacements) * inner_margins + const max_x = Math.max(...dates) + + // Create scales + this.x = d3.scaleUtc() + .domain([min_x, max_x]) + .range([0, this.width]) + .nice() + this.xAxis = this.svg.append('g') + .attr('transform', `translate(0, ${this.height})`); + this.y = d3.scaleLinear() + .domain([min_y, max_y]) + .range([this.height, 0]) + .nice(); + this.yAxis = this.svg.append('g'); + this.svg.append("g") + // .attr("transform", `translate(0,${this.height - marginBottom})`) + .attr("transform", `translate(0,${this.height})`) + + this.svg.append('text') + .attr('transform', `rotate(-90)`) + .attr('y', -this.margin.left + 12) + .attr('x', -this.height / 2) + .style('text-anchor', 'middle') + .attr('class', 'ts-chart-label ts-axis-title') + .text(this.yAxisTitle); + + this.clipContainer = this.svg.append('g') + .attr('clip-path', 'url(#clip)'); + + const toolTip = d3.select('body').append('div') + .attr('class', 'tooltip') + .style('opacity', 0); + if (this.toolTip) { + this.toolTip.remove(); + } + this.toolTip = toolTip + this.toolTip.attr('transform', `translate(0, 0)`).style('text-anchor', 'middle').style('z-index', 100).style('opacity', 0) + + // this.allGroup = [...new Set(this.dataReadyForChart.map(d => d.name))]; + + // this.pointGraph = this.clipContainer.append("pointGraph"); + this.lineGraph = this.clipContainer.append("path"); + + const self = this; + + this.points = this.dataSource.map((d) => [this.x(new Date(d.date)), this.y(d.short_wavelength_displacement), d.aoi]); + // this.points = this.dataSource.map((d) => [this.x(new Date(d.date)), + // Math.round((this.y(d.short_wavelength_displacement) + Number.EPSILON) * 10000) / 10000, + // d.aoi]); + + this.zoom = d3.zoom() + .extent([[0, 0], [this.width, this.height]]) + .on('zoom', (eve: d3.D3ZoomEvent) => { + this.currentTransform = eve.transform; + this.updateChart(); + }); + this.thing = d3.select('#timeseriesChart').selectChild() + this.thing.call(this.zoom) + + this.svg.append('defs').append('SVG:clipPath') + .attr('id', 'clip') + .append('SVG:rect') + .attr('width', this.width) + .attr('height', this.height) + .attr('x', 0) + .attr('y', 0); + + if (this.dataSource.length <= 0) { + this.svg.append('rect') + .attr('width', this.width) + .attr('height', this.height) + .attr('x', 0) + .attr('y', 0) + .attr('class', 'loading-rect'); + } + + this.svg.append('text') + .attr('transform', `translate(${this.width / 2}, ${this.height + this.margin.bottom - 20})`) + .style('text-anchor', 'middle') + .attr('class', 'ts-chart-label') + .text(this.xAxisTitle); + + this.svg + .on("pointermove", () => this.pointerMoved(event, this.lines, this.dots, this.points)) + .on("pointerenter", () => this.pointerEntered(this.lines, this.dots)) + .on("pointerleave", () => this.pointerLeft(this.lines, this.dots)) + .on("touchstart", event => event.preventDefault()); + + // Add the lines + if (this.showLines) { + + let line = d3.line() + .x(function (d) { return self.x(Date.parse(d.date)); }) + .y(function (d) { return self.y(d.short_wavelength_displacement); }) + + this.lines = this.svg.append('g') + .attr('id', 'linesParent') + .selectAll('myLines') + .data(this.dataReadyForChart) + .enter() + .append('path') + .attr('clip-path', 'url(#clip)') + .attr('d', function (d) { // @ts-ignore + return line(d.values) + }) + // @ts-ignore + .attr('stroke', function (d: DataReady) { return d.color }) + .style('opacity', (d: DataReady) => d.opacity) + .style('stroke-width', 1) + .style('fill', 'none') + .style('shape-rendering', 'geometricprecision') + } + + // add the dots + this.dots = this.svg.append('g') + .attr('id', 'dotsParent') + .attr('class', 'dotsParent') + .selectAll('myDots') + .data(this.dataReadyForChart) + .enter() + .append('g') + .attr('clip-path', 'url(#clip)') + .style('fill', (d) : string=> { return d.color }) + .style('opacity', (d) => d.opacity) + .attr('class', (d): string => { return d.name.replace(/\W/g, '') + ' dotsChildren' }) + .selectAll('circle') + .data(d => d.values) + .enter() + .append('circle') + .attr('cx', (d) => this.x(Date.parse(d.date))) + .attr('cy', (d) => this.y(d.short_wavelength_displacement)) + .attr('class', (d): string => { + if (this.baseData && this.baseData.id === d.id) { + return 'ts-reference-point' + } + }) + .on('mouseover', function (_event: any, p: models.TimeSeriesData) { + self.hoveredElement = this; + self.hoveredData = p; + self.hoveredDate = new Date(p.date); + toolTip.interrupt(); + toolTip + .style('opacity', .9); + toolTip.html(`
+ ${self.language.translate.instant('SERIES')} ${p.seriesNumber}:  ${self.tooltipDateFormat(self.hoveredDate)},  + ${p.short_wavelength_displacement.toFixed(4)} ${self.language.translate.instant('METERS')}
+ ${self.dotToolTipText}
`); + self.updateTooltip(); + }) + .on('mouseleave', function (_) { + self.hoveredData = null; + self.hoveredDate = null; + toolTip.transition() + .duration(500) + .style('opacity', 0); + }) + .attr('r', 5); + this.bestFitItems = []; + if(this.dataReadyForChart.length > 0 && this.showLinearFit) { + this.linearFitLine = this.svg.append('g') + .attr('id', 'linesParent2') + .attr('clip-path', 'url(#clip)') + for(let linearFitData of this.dataReadyForChart) { + + let regression = linearRegression(linearFitData.values.map((x,i) => [i, x.short_wavelength_displacement])); + this.bestFitItems.push({ + seriesNumber: linearFitData.values[0].seriesNumber, + color: linearFitData.values[0].color, + formula: `y = ${regression.m.toFixed(4)}x ${regression.b < 0 ? '-' : '+'} ${Math.abs(regression.b).toFixed(4)}` + }) + let lineregression = linearRegressionLine(regression); + + let line = d3.line() + .x((d) => { return this.x(d[0]) }) + .y((d) => { return this.y(d[1]) }); + this.linearFitLine.append("path") + .datum([regression.m, regression.b]) + .attr("d", (_d) => { + return line([ + [this.x.domain()[0].getTime(), lineregression(0)], [this.x.domain()[1].getTime(), lineregression(1)]]) + }) + .attr("stroke", linearFitData.color) + .style("stroke-width", 1) + .attr('stroke-dasharray', '4') + .style("fill", "none") + .style("shape-rendering", "geometricprecision"); + } + } + this.updateChart(); + } + + public setReference(reference) { + this.store$.dispatch(chartsStore.setReferenceData({data:reference})) + } + + private highlightSeries(wkt) { + let colorName: string; + let dClassName: string; + this.lines.style('stroke', (d: DataReady) => { + if (d.name === wkt) { + dClassName = '.' + d.name.replace(/\W/g, ''); + colorName = d.color; + this.store$.dispatch(new uiStore.SetActiveWkt(d.name)); + return colorName; + } + return unSelectedColor; + }); + + // increase width of selected series + this.lines.style('stroke-width', (d: DataReady) => { + if (d.name === wkt) { + return 2; + } + return 1; + }); + + // sort the lines so that the selected series is on top + this.lines.sort(function (a, _b) { + if (a.dname === wkt) return 1; + else return -1; + }); + + this.svg.selectAll('circle').style("fill", unSelectedColor).attr('r', 5); + this.svg.selectAll(dClassName + ' ' + 'circle').style("fill", colorName).attr('r', 6); + this.svg.selectAll('.dotsChildren').sort(function (a, _b) { + // @ts-ignore + if (a.name === wkt) return 1; + else return -1; + }); + this.dots.select("text").text(wkt); + + } + private resetHighlight() { + let dClassName: string; + this.lines.style("stroke", (d: DataReady) => { + dClassName = '.' + d.name.replace(/\W/g, ''); + this.svg.selectAll(dClassName + ' ' + 'circle').style("fill", d.color).attr('r', 5); + return d.color; + }); + this.lines.style("stroke-width", 1); + } + + // When the pointer moves, find the closest point, update the interactive tip, and highlight + // the corresponding line. + private pointerMoved(event, _lines, dots, points) { + this.dots = dots; + if (typeof points === 'undefined') { return; } + if (points == null) { return; } + const [xm, ym] = d3.pointer(event); + const i = d3.leastIndex(points, ([x, y]) => Math.hypot(Number(x) - xm, Number(y) - ym)); + if (typeof points[i] === 'undefined') { return; } + const [_x, _y, k] = points[i]; + return; + // TODO: Fix this to grab the correct series all the time. + this.highlightSeries(k); + } + + private pointerEntered(lines, dots) { + return + lines.style("mix-blend-mode", null).style("stroke", unSelectedColor); + dots.attr("display", null); + } + + private pointerLeft(lines, _dots) { + return + let dClassName: string; + lines.style("stroke", (d: DataReady) => { + dClassName = '.' + d.name.replace(/\W/g, ''); + this.svg.selectAll(dClassName + ' ' + 'circle').style("fill", d.color).attr('r', 5); + return d.color; + }); + lines.style("stroke-width", 1); + this.store$.dispatch(new uiStore.SetActiveWkt(null)); + } + + private updateChart() { + const newX = this.currentTransform?.rescaleX(this.x) ?? this.x; + const newY = this.currentTransform?.rescaleY(this.y) ?? this.y; + const smallChart = this.width > 400; + this.xAxis.call( + d3.axisBottom(newX) + .tickSize(-this.height) + ); + this.yAxis.call( + d3.axisLeft(newY) + .tickSize(-this.width) + .ticks(smallChart ? 5 : 2, '.1f') + .tickFormat( + (val: number, _index) => `${val}m` + ) + ); + + this.dots + .attr('cx', d => newX(Date.parse(d.date))) + .attr('cy', d => newY(d.short_wavelength_displacement)) + + const line = d3.line() + .x(function (d) { return newX(Date.parse(d.date)); }) + .y(function (d) { return newY(d.short_wavelength_displacement); }) + + this.lines + .attr("d", function (d) { // @ts-ignore + return line(d.values) + }) + .style('opacity', (d: DataReady) => d.opacity) + + if(this.linearFitLine && this.showLinearFit) { + let line2 = d3.line() + .x( (d) => { return newX(d[0]) }) + .y( (d) => { return newY(d[1]) }); + this.linearFitLine.selectChildren().each(function () { + d3.select(this).attr('d', (d: Array) => { + + let lineregression = linearRegressionLine({ m: d[0], b: d[1] }); + return line2([ + [newX.domain()[0].getTime(), lineregression(0)], [newX.domain()[1].getTime(), lineregression(1)]]) + }); + }) + } + + } + + private updateTooltip() { + const bounding = this.hoveredElement.getBoundingClientRect(); + const a = bounding.x > document.body.clientWidth - 200; + this.toolTip.style('left', `${bounding.x + (a ? -150 : 20)}px`) + .style('top', `${bounding.y - 10}px`); + } + + public onResized() { + this.createSVG(); + } + + private createSVG() { + if (this.svg) { + d3.selectAll('#timeseries-chart > svg').remove(); + d3.selectAll('.tooltip').remove(); + } + + const element = document.getElementById("timeseriesChart"); + element.innerHTML = ''; + + this.height = this.timeseriesChart.nativeElement.offsetHeight - this.margin.top - this.margin.bottom; + this.width = this.timeseriesChart.nativeElement.offsetWidth - this.margin.left - this.margin.right; + this.svg = d3.select(this.timeseriesChart.nativeElement).append('svg') + .attr('width', this.width + this.margin.left + this.margin.right) + .attr('height', this.height + this.margin.top + this.margin.bottom) + .append('g') + .attr('transform', `translate(${this.margin.left}, ${this.margin.top})`); + + this.drawChart(); + } + + public tooltipDateFormat(_date) { + if (!_date) { return; } + function join(t, a, s) { + function format(m) { + const f = new Intl.DateTimeFormat('en', m); + return f.format(t); + } + return a.map(format).join(s); + } + + const dateFormat = [{ month: 'short' }, { day: 'numeric' }, { year: 'numeric' }]; + return join(_date, dateFormat, ' '); + } + + public resetBasePoint() { + this.store$.dispatch(chartsStore.resetReferenceData()) + } + + public ngOnDestroy(): void { + this.subs.unsubscribe(); + } + + protected readonly Date = Date; + + protected readonly length = length; + protected readonly types = types; + protected readonly Number = Number; +} diff --git a/src/app/components/timeseries-chart/timeseries-chart.module.ts b/src/app/components/timeseries-chart/timeseries-chart.module.ts new file mode 100644 index 000000000..a45ae0ab2 --- /dev/null +++ b/src/app/components/timeseries-chart/timeseries-chart.module.ts @@ -0,0 +1,50 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { MatSharedModule } from '@shared'; + +import { TranslateModule } from "@ngx-translate/core"; +import { TimeseriesChartComponent } from './timeseries-chart.component'; +import { MatIconModule } from '@angular/material/icon'; +import { MatTableModule } from '@angular/material/table'; +import { ResizedEventModule } from '@directives/resized.directive'; +import { TimeseriesChartConfigComponent } from './timeseries-chart-config' +import { ChartModalComponent } from '@components/shared/chart-modal/chart-modal.component' +import {TimeseriesChartZoomComponent} from '@components/timeseries-chart/timeseries-chart-zoom/timeseries-chart-zoom.component'; +import { TimeseriesChartExportComponent } from '@components/timeseries-chart/timeseries-chart-export'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatMenuModule } from '@angular/material/menu'; +import { ContextMenuTriggerDirective } from '@directives/context-menu.directive'; +import { ScrollingModule } from '@angular/cdk/scrolling'; +import { + TimeseriesChartTemporalSliderComponent +} from '@components/timeseries-chart/timeseries-chart-temporal-slider/timeseries-chart-temporal-slider.component'; + + +@NgModule({ + declarations: [TimeseriesChartComponent, + ContextMenuTriggerDirective + + ], + imports: [ + CommonModule, + MatSharedModule, + TranslateModule, + MatTableModule, + MatIconModule, + ResizedEventModule, + MatSharedModule, + ChartModalComponent, + TimeseriesChartConfigComponent, + TimeseriesChartZoomComponent, + TimeseriesChartExportComponent, + MatProgressSpinnerModule, + MatMenuModule, + ScrollingModule, + TimeseriesChartTemporalSliderComponent + ], + exports: [ + TimeseriesChartComponent, + ] +}) +export class TimeseriesChartModule { } diff --git a/src/app/directives/context-menu.directive.ts b/src/app/directives/context-menu.directive.ts new file mode 100644 index 000000000..10cb5a2a8 --- /dev/null +++ b/src/app/directives/context-menu.directive.ts @@ -0,0 +1,59 @@ +import { MatMenuPanel, MatMenuTrigger } from '@angular/material/menu'; +import { Directive, ElementRef, HostListener, Input, OnInit } from '@angular/core'; + +@Directive({ + selector: '[contextMenuTriggerFor]', +}) +export class ContextMenuTriggerDirective extends MatMenuTrigger implements OnInit { + private readonly anchorElement = document.createElement('div'); + + @Input('contextMenuTriggerFor') + public get contextMenuTriggerFor() { + return this.menu; + } + public set contextMenuTriggerFor(menu: MatMenuPanel | null) { + this.menu = menu; + } + + @Input('contextMenuTriggerData') + public get contextMenuData() { + return this.menuData; + } + public set contextMenuData(menuData: any) { + this.menuData = menuData; + } + + public ngOnInit(): void { + this.anchorElement.style.position = 'fixed'; + this.anchorElement.style.width = '0px'; + this.anchorElement.style.height = '0px'; + this.anchorElement.style.visibility = 'hidden'; + (this as any)._element = new ElementRef(this.anchorElement); + } + + public override _handleClick() { + + } + + public override openMenu() { + if(!this.menuData.tooltipData) { + return + } + document.body.appendChild(this.anchorElement); + super.openMenu(); + } + + public override closeMenu() { + this.anchorElement.remove(); + super.closeMenu(); + } + + @HostListener('contextmenu', ['$event']) + public handleContextMenu(event: MouseEvent) { + event.preventDefault(); + this.anchorElement.style.top = `${ event.clientY }px`; + this.anchorElement.style.left = `${ event.clientX }px`; + super._handleClick(event); + } + +} \ No newline at end of file diff --git a/src/app/models/chart-config.model.ts b/src/app/models/chart-config.model.ts new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/models/index.ts b/src/app/models/index.ts index 5dbf6da79..f68878104 100644 --- a/src/app/models/index.ts +++ b/src/app/models/index.ts @@ -28,3 +28,5 @@ export * from './download.model'; export * from './event-product-sort.model'; export * from './asf-website.model'; export * from './mapbox.model'; +export * from './timeseries.model'; +export * from './layers.model'; diff --git a/src/app/models/layers.model.ts b/src/app/models/layers.model.ts new file mode 100644 index 000000000..458bf704e --- /dev/null +++ b/src/app/models/layers.model.ts @@ -0,0 +1,4 @@ +export enum DisplacementLayerTypes { + DISPLACEMENT = 'DISP', + VELOCITY = 'VEL', +} diff --git a/src/app/models/map.model.ts b/src/app/models/map.model.ts index ba0279429..99533d8a3 100644 --- a/src/app/models/map.model.ts +++ b/src/app/models/map.model.ts @@ -27,10 +27,12 @@ export enum MapInteractionModeType { UPLOAD = 'Upload', NONE = 'None', CLEAR = 'Clear', + TIMERSERIES = 'TimeSeries', } export enum DrawPolygonStyle { VALID = 'Valid', + VALID_DISPLACEMENT = 'ValidDisplacement', INVALID = 'Invalid', OMITTED = 'Omitted' } diff --git a/src/app/models/search-type.model.ts b/src/app/models/search-type.model.ts index 05ed2712b..83b7920ee 100644 --- a/src/app/models/search-type.model.ts +++ b/src/app/models/search-type.model.ts @@ -4,6 +4,7 @@ export enum SearchType { BASELINE = 'Baseline Search', SBAS = 'SBAS Search', CUSTOM_PRODUCTS = 'On Demand', + DISPLACEMENT = 'Displacement', SARVIEWS_EVENTS = 'Event Search', DERIVED_DATASETS = 'Derived Datasets', } @@ -12,6 +13,7 @@ export const SearchTypeTranslation = { 'Geographic Search' : 'GEOGRAPHIC_SEARCH', 'List Search' : 'LIST_SEARCH', 'Baseline Search' : 'BASELINE_SEARCH', + 'Displacement' : 'DISPLACEMENT', 'SBAS Search' : 'SBAS_SEARCH', 'On Demand' : 'ON_DEMAND', 'Event Search' : 'EVENT_SEARCH', diff --git a/src/app/models/search.model.ts b/src/app/models/search.model.ts index b8c4422b3..ca46aa874 100644 --- a/src/app/models/search.model.ts +++ b/src/app/models/search.model.ts @@ -4,7 +4,7 @@ import { Range } from './range.model'; import { FlightDirection } from './cmr-product.model'; import * as fromDatasets from './dataset.model'; import { Hyp3JobStatusCode } from './hyp3.model'; -import { SarviewsEventType, SBASOverlap } from '@models'; +import { SarviewsEventType, SBASOverlap, timeseriesChartItemState } from '@models'; // import { SarviewsEventType } from './sarviews-event.model'; export interface Search { @@ -20,7 +20,9 @@ export type FilterType = BaselineFiltersType | CustomProductFiltersType | SbasFiltersType | - SarviewsFiltersType; + TimeseriesFiltersType | + SarviewsFiltersType | + DisplacementFiltersType; export interface ListFiltersType { listType: ListSearchType; @@ -98,3 +100,12 @@ export interface SarviewsFiltersType { pinnedProductIDs: string[]; selectedEventID: string; } + +export interface DisplacementFiltersType { + seriesStates: { [key: string]: timeseriesChartItemState } + flightDirections: FlightDirection[]; + dateRange: Range; +} +export interface TimeseriesFiltersType { + fullBurstIDs: string[]; +} \ No newline at end of file diff --git a/src/app/models/timeseries.model.ts b/src/app/models/timeseries.model.ts new file mode 100644 index 000000000..834fd9d5d --- /dev/null +++ b/src/app/models/timeseries.model.ts @@ -0,0 +1,31 @@ +import { SimpleGeometry } from "ol/geom" + +export interface timeseriesChartItemState { + checked: boolean, + color?: string, + name: string, + wkt: string, + geometry: SimpleGeometry, + seriesNumber: number, + linearFit: boolean, + valid: boolean, +} + +export interface TimeSeriesChartPoint { + aoi: string + short_wavelength_displacement: number + interferometric_correlation: number + temporal_coherence: number + date: string + file_name: string, + temporal_baseline: number + id: string +} +export interface TimeSeriesData { + short_wavelength_displacement: number + date: string, + id: string, + base: number, + seriesNumber: number, + color: string, + } \ No newline at end of file diff --git a/src/app/models/user.model.ts b/src/app/models/user.model.ts index 8ff1be983..f8c3d79e6 100644 --- a/src/app/models/user.model.ts +++ b/src/app/models/user.model.ts @@ -14,7 +14,8 @@ export interface UserProfile { defaultFilterPresets: { 'Baseline Search': string, 'Geographic Search': string, - 'SBAS Search': string + 'SBAS Search': string, + 'Displacement': string }; hyp3BackendUrl: string; theme: string; diff --git a/src/app/pipes/filter-type.pipe.ts b/src/app/pipes/filter-type.pipe.ts index 2f95bfbc2..41e3d78c2 100644 --- a/src/app/pipes/filter-type.pipe.ts +++ b/src/app/pipes/filter-type.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { BaselineFiltersType, FilterType, GeographicFiltersType, ListFiltersType, SbasFiltersType } from '@models'; +import { BaselineFiltersType, FilterType, GeographicFiltersType, ListFiltersType, SbasFiltersType, TimeseriesFiltersType, DisplacementFiltersType } from '@models'; @Pipe({ name: 'baselineFilter' @@ -19,6 +19,14 @@ export class SBASFilterPipe implements PipeTransform { } } +@Pipe({ + name: 'TimeseriesFilter' +}) +export class TimeseriesFilterPipe implements PipeTransform { + transform(input: FilterType): TimeseriesFiltersType { + return input as TimeseriesFiltersType; + } +} @Pipe({ name: 'geographicFilter' }) @@ -36,4 +44,11 @@ export class ListFilterPipe implements PipeTransform { return input as ListFiltersType; } } - +@Pipe({ + name: 'displacementFilter' +}) +export class DisplacementFilterPipe implements PipeTransform { + transform(input: FilterType): DisplacementFiltersType { + return input as DisplacementFiltersType; + } +} diff --git a/src/app/pipes/float-precision.pipe.ts b/src/app/pipes/float-precision.pipe.ts new file mode 100644 index 000000000..5f43c4c7e --- /dev/null +++ b/src/app/pipes/float-precision.pipe.ts @@ -0,0 +1,10 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ + name: 'floatPrecision' +}) +export class FloatPrecisionPipe implements PipeTransform { + transform(input: Number, precision=2): string { + return input.toFixed(precision); + } +} diff --git a/src/app/pipes/pipes.module.ts b/src/app/pipes/pipes.module.ts index 1eb649c4a..2449634db 100644 --- a/src/app/pipes/pipes.module.ts +++ b/src/app/pipes/pipes.module.ts @@ -5,10 +5,11 @@ import { ReadableSizeFromBytesPipe } from './readable-size-from-bytes.pipe'; import { ShortDatePipe, ShortDateTimePipe, FullDatePipe, ShortDateSeasonPipe } from './short-date.pipe'; import { MomentPipe} from "@pipes/dynamic-moment"; import { JoinPipe } from './join.pipe'; -import { BaselineFilterPipe, SBASFilterPipe, GeographicFilterPipe, ListFilterPipe } from './filter-type.pipe'; +import { BaselineFilterPipe, SBASFilterPipe, GeographicFilterPipe, ListFilterPipe, DisplacementFilterPipe } from './filter-type.pipe'; import { HTMLInputValuePipe } from './html-input-value.pipe'; import { QuakePipe, VolcanoPipe } from './sarviews-event.pipe'; import { FilterExtensionPipe } from './filter-extension.pipe'; +import { FloatPrecisionPipe } from './float-precision.pipe'; @NgModule({ declarations: [ ReadableSizeFromBytesPipe, @@ -22,11 +23,12 @@ import { FilterExtensionPipe } from './filter-extension.pipe'; SBASFilterPipe, GeographicFilterPipe, ListFilterPipe, + DisplacementFilterPipe, HTMLInputValuePipe, QuakePipe, VolcanoPipe, - FilterExtensionPipe - // floodPipe + FilterExtensionPipe, + FloatPrecisionPipe ], imports: [ CommonModule @@ -38,6 +40,7 @@ import { FilterExtensionPipe } from './filter-extension.pipe'; ShortDateSeasonPipe, FullDatePipe, MomentPipe, + DisplacementFilterPipe, JoinPipe, BaselineFilterPipe, SBASFilterPipe, @@ -47,7 +50,7 @@ import { FilterExtensionPipe } from './filter-extension.pipe'; QuakePipe, VolcanoPipe, FilterExtensionPipe, - // floodPipe, + FloatPrecisionPipe ] }) export class PipesModule { } diff --git a/src/app/services/browse-overlay.service.ts b/src/app/services/browse-overlay.service.ts index 517b0bf81..a583b1cc7 100644 --- a/src/app/services/browse-overlay.service.ts +++ b/src/app/services/browse-overlay.service.ts @@ -139,7 +139,7 @@ export class BrowseOverlayService { return output; } - private getPolygonFromFeature(feature: Feature, wkt: string): Polygon { + public getPolygonFromFeature(feature: Feature, wkt: string): Polygon { const polygon: Polygon = feature.getGeometry() as Polygon; this.fixPolygonAntimeridian(feature, wkt); diff --git a/src/app/services/index.ts b/src/app/services/index.ts index 07ed8c0b1..53c5e6d59 100644 --- a/src/app/services/index.ts +++ b/src/app/services/index.ts @@ -34,3 +34,5 @@ export { BrowseOverlayService } from './browse-overlay.service'; export { ThemingService } from './theming.service'; export { ExportService } from './export.service'; export { PossibleHyp3JobsService } from './possible-hyp3-jobs.service'; +export { NetcdfService } from './netcdf-service.service'; +export { PointHistoryService } from './point-history.service'; diff --git a/src/app/services/map/draw.service.ts b/src/app/services/map/draw.service.ts index ebafd8e4c..635f4325a 100644 --- a/src/app/services/map/draw.service.ts +++ b/src/app/services/map/draw.service.ts @@ -70,17 +70,17 @@ export class DrawService { map.addInteraction(this.snap); map.addInteraction(this.modify); - this.modify.on('modifystart', () => { - map.getViewport().style.cursor = 'pointer'; - }); + this.modify.on('modifystart', () => { + map.getViewport().style.cursor = 'pointer'; + }); - this.modify.on('modifyend', () => { - map.getViewport().style.cursor = 'default'; - }); + this.modify.on('modifyend', () => { + map.getViewport().style.cursor = 'default'; + }); - map.once('pointermove', (_) => { - map.getViewport().style.cursor = 'default'; - }); + map.once('pointermove', (_) => { + map.getViewport().style.cursor = 'default'; + }); } } @@ -102,6 +102,10 @@ export class DrawService { this.setValidStyle(); break; } + case models.DrawPolygonStyle.VALID_DISPLACEMENT: { + this.setValidDisplacementStyle(); + break; + } case models.DrawPolygonStyle.INVALID: { this.setInvalidStyle(); break; @@ -200,6 +204,11 @@ export class DrawService { this.layer.setStyle(this.defaultStyle); } + private setValidDisplacementStyle(): void { + this.defaultStyle = polygonStyle.validDisplacement; + this.layer.setStyle(this.defaultStyle); + } + private setOmittedStyle() { this.defaultStyle = polygonStyle.omitted; this.layer.setStyle(this.defaultStyle); diff --git a/src/app/services/map/map.service.ts b/src/app/services/map/map.service.ts index 1b28831d8..677705a1b 100644 --- a/src/app/services/map/map.service.ts +++ b/src/app/services/map/map.service.ts @@ -1,11 +1,12 @@ -import { Injectable } from '@angular/core'; +import { Injectable, OnDestroy } from '@angular/core'; import { BehaviorSubject, Subject } from 'rxjs'; -import { map, sampleTime, tap } from 'rxjs/operators'; +import {first, map, sampleTime, tap} from 'rxjs/operators'; +import {SubSink} from 'subsink'; import { Collection, Feature, Map, View } from 'ol'; import { Layer, Vector as VectorLayer } from 'ol/layer'; -import { Vector as VectorSource } from 'ol/source'; +import { Vector as VectorSource, XYZ } from 'ol/source'; import * as proj from 'ol/proj'; import Point from 'ol/geom/Point'; import { OverviewMap, ScaleLine } from 'ol/control'; @@ -22,16 +23,17 @@ import * as sceneStore from '@store/scenes'; import { HttpClient } from "@angular/common/http"; import * as polygonStyle from './polygon.style'; +// import * as tileStyle from 'ol/style' import * as views from './views'; import { SarviewsEvent } from '@models'; import { EventEmitter } from '@angular/core'; import { Store } from '@ngrx/store'; import { AppState } from '@store'; -import { Icon, Style } from 'ol/style'; +import { Circle as CircleStyle, Fill, Icon, Stroke, Style, Text as olText } from 'ol/style'; import Geometry from 'ol/geom/Geometry'; import LayerGroup from 'ol/layer/Group'; import { PinnedProduct } from '@services/browse-map.service'; -import { BrowseOverlayService } from '@services'; +import {BrowseOverlayService, PointHistoryService} from '@services'; import { ViewOptions } from 'ol/View'; import { Type as GeometryType } from 'ol/geom/Geometry'; import booleanPointInPolygon from '@turf/boolean-point-in-polygon'; @@ -45,21 +47,27 @@ import SimpleGeometry from 'ol/geom/SimpleGeometry'; import { SetGeocode } from '@store/filters'; import { Extent } from 'ol/extent'; import { MultiPolygon } from 'ol/geom'; +import GeoJSON from 'ol/format/GeoJSON.js'; +import WKT from 'ol/format/WKT'; +import * as uiStore from '@store/ui'; +import * as searchStore from '@store/search'; @Injectable({ providedIn: 'root' }) -export class MapService { +export class MapService implements OnDestroy { public isDrawing$ = this.drawService.isDrawing$.pipe( tap(isDrawing => this.map.getViewport().style.cursor = isDrawing ? 'crosshair' : 'default') ); + private subs = new SubSink(); private mapView: views.MapView; private map: Map; private scaleLine: ScaleLine; private polygonLayer: VectorLayer; private sarviewsEventsLayer: VectorLayer; + public displacmentLayer: VectorLayer; private browseImageLayer: Layer; private gridLinesVisible: boolean; @@ -71,10 +79,57 @@ export class MapService { private localBrowseImageURL: string; + private displacementOverview: TileLayer; + public displacementOverview$ = new BehaviorSubject(null); + private priorityOverview: VectorLayer; + public priorityEnabled$ = new BehaviorSubject(null); + public searchType: models.SearchType; + + constructor( + private wktService: WktService, + private legacyAreaFormat: LegacyAreaFormatService, + private drawService: DrawService, + private store$: Store, + private browseOverlayService: BrowseOverlayService, + private layerService: LayerService, + private http: HttpClient, + private pointHistoryService: PointHistoryService + ) { + this.subs.add( + this.store$.select(searchStore.getSearchType).subscribe( + searchType => { + this.searchType = searchType; + } + ) + ); + } + private selectClick = new Select({ condition: click, style: polygonStyle.hidden, - layers: l => l.get('selectable') || false + layers: l => l.get('selectable') + }); + + private timeseriesClick = new Select({ + condition: click, + style: null, + layers: l => { + if (l.get('displacement-layer')) { + return true; + } + return false + } + }); + + private timeseriesHover = new Select({ + condition: pointerMove, + style: null, + layers: l => { + if (l.get('displacement-layer')) { + return true; + } + return false + } }); private selectHover = new Select({ @@ -123,12 +178,13 @@ export class MapService { public selectedSarviewEvent$: EventEmitter = new EventEmitter(); public mapInit$: EventEmitter = new EventEmitter(); - + public timeseriesPixelSelected$ = new EventEmitter(); public mousePosition$ = this.mousePositionSubject$.pipe( sampleTime(100) ); public newSelectedScene$ = new Subject(); + public newSelectedDisplacement$ = new Subject(); public searchPolygon$ = this.drawService.polygon$.pipe( map( @@ -138,16 +194,6 @@ export class MapService { ) ); - constructor( - private wktService: WktService, - private legacyAreaFormat: LegacyAreaFormatService, - private drawService: DrawService, - private store$: Store, - private browseOverlayService: BrowseOverlayService, - private layerService: LayerService, - private http: HttpClient - ) { } - public epsg(): string { return this.mapView.projection.epsg; } @@ -169,6 +215,9 @@ export class MapService { this.selectSarviewEventHover.setActive(true); this.selectClick.setActive(true); this.searchPolygonHover.setActive(true); + this.timeseriesClick.setActive(true); + this.timeseriesHover.setActive(true); + } public disableInteractions(): void { @@ -176,6 +225,8 @@ export class MapService { this.selectSarviewEventHover.setActive(false); this.selectClick.setActive(false); this.searchPolygonHover.setActive(false); + this.timeseriesClick.setActive(false); + this.timeseriesHover.setActive(false); } private zoom(amount: number): void { @@ -189,7 +240,6 @@ export class MapService { if (this.legacyAreaFormat.isValid(polygon)) { polygon = this.legacyAreaFormat.toWkt(polygon); } - return this.loadWKT(polygon); } @@ -201,7 +251,6 @@ export class MapService { polygon, this.epsg() ); - this.setDrawFeature(features); } catch (e) { didLoad = false; @@ -210,7 +259,6 @@ export class MapService { return didLoad; } - public setLayer(layer: VectorLayer): void { if (!!this.polygonLayer) { this.map.removeLayer(this.polygonLayer); @@ -229,6 +277,10 @@ export class MapService { this.map.addLayer(layer); } + public addLayer(layer: Layer) { + this.map.addLayer(layer) + } + public sarviewsEventsToFeatures(events: SarviewsEvent[], projection: string): Feature[] { const currentDate = new Date(); const features = events @@ -283,7 +335,11 @@ export class MapService { } public setDrawStyle(style: models.DrawPolygonStyle): void { - this.drawService.setDrawStyle(style); + if (this.searchType == 'Displacement') { + this.drawService.setDrawStyle(models.DrawPolygonStyle.VALID_DISPLACEMENT); + }else { + this.drawService.setDrawStyle(style); + } } public setDrawFeature(feature): void { @@ -424,12 +480,10 @@ export class MapService { this.setDrawFeature(features); } - public onMapReady(m: Map) { this.mapInit$.next(m); } - public zoomToExtent(extent: Extent): void { this.map .getView() @@ -478,14 +532,41 @@ export class MapService { }); newMap.addInteraction(this.selectClick); + newMap.addInteraction(this.timeseriesClick); + newMap.addInteraction(this.timeseriesHover); newMap.addInteraction(this.selectHover); newMap.addInteraction(this.selectSarviewEventHover); this.selectClick.on('select', e => { + // netcdf-layer + // if (this.drawService.in) + this.timeseriesPixelSelected$.emit(null) e.target.getFeatures().forEach( feature => this.newSelectedScene$.next(feature.get('filename')) ); }); + this.timeseriesClick.on('select', e => { + let selectedPoint = e.selected[0].get('point'); + const format = new WKT(); + const wkt = format.writeGeometry(selectedPoint); + this.store$.dispatch(new uiStore.SetActiveWkt(wkt)); + e.preventDefault(); + }); + + this.timeseriesHover.on('select', e => { + let selectedPoint = e.selected[0]?.get('point'); + if(!selectedPoint) { + // TODO: not sure if we want to keep the point active or unselect it + this.store$.dispatch(new uiStore.SetActiveWkt(null)); + e.preventDefault() + return + } + const format = new WKT(); + const wkt = format.writeGeometry(selectedPoint); + this.store$.dispatch(new uiStore.SetActiveWkt(wkt)); + e.preventDefault(); + }); + this.selectHover.on('select', e => { this.map.getViewport().style.cursor = e.selected.length > 0 ? 'pointer' : 'default'; @@ -530,6 +611,7 @@ export class MapService { this.focusLayer.setZIndex(99); this.selectedLayer.setZIndex(98); + newMap.on('moveend', e => { const currentMap = e.map; @@ -660,7 +742,7 @@ export class MapService { this.map.removeLayer(this.browseImageLayer); } if (!url.endsWith('.tif')) { - if(url.includes('OPERA')) { + if (url.includes('OPERA')) { this.trimImage(url).then((imageBlob: Blob) => { let url = URL.createObjectURL(imageBlob); URL.revokeObjectURL(this.localBrowseImageURL) @@ -702,6 +784,155 @@ export class MapService { this.hasCoherenceLayer$.next(months); } + public setDisplacementOverview(direction: models.FlightDirection, type: models.DisplacementLayerTypes) { + const apiDirValues = { + [models.FlightDirection.ASCENDING]: 'ASC', + [models.FlightDirection.DESCENDING]: 'DESC' + } + const apiDispValues = { + [models.DisplacementLayerTypes.DISPLACEMENT]: 'DISP', + [models.DisplacementLayerTypes.VELOCITY]: 'VEL' + } + const dir = apiDirValues[direction]; + const layerType = apiDispValues[type]; + + let base_url = `https://d3g9emy65n853h.cloudfront.net/main/${dir.toLowerCase()}/${layerType.toLowerCase()}`; + this.displacementOverview$.next(type); + + this.http.get(`${base_url}/extent.json`).pipe( + first() + ).subscribe((response: any) => { + if (this.displacementOverview) { + this.map.removeLayer(this.displacementOverview); + this.displacementOverview = null; + } + + const overview_source = new XYZ({ + 'url': `${base_url}/{z}/{x}/{y}.png`, + wrapX: models.mapOptions.wrapX, + tileSize: [256, 256] + }); + + // Eventually let users define this part somehow + let defined_stops: (number | number[])[][] = [ + // [Stop, Color[R,G,B]] + [1.0, [0, 18, 97]], + [29.0, [3, 62, 125]], + [58.0, [30, 111, 157]], + [86.0, [113, 168, 196]], + [114.0, [201, 221, 231]], + [143.0, [234, 206, 189]], + [171.0, [211, 151, 116]], + [199.0, [190, 101, 51]], + [228.0, [139, 39, 6]], + [256.0, [89, 0, 8]], + // [0.0, [89,0,8]], + // [0.5, [255,255,255]], + // [1.0, [0,18,97]], + ]; + + let parsed_color_stops = defined_stops.flat().map(x => { + if(Array.isArray(x)) { + return ['color', ...x, ['band', 4]] + } else { + return x + } + }) + + this.displacementOverview = new TileLayer({ + 'style': { + color: [ + 'interpolate', + ['linear'], + ['*', ['band', 1], 255], + ...parsed_color_stops + ] + }, + 'source': overview_source, + 'extent': response['extent'], + }); + + this.map.addLayer(this.displacementOverview); + }) + + } + public clearDisplacementOverview() { + this.map.removeLayer(this.displacementOverview); + this.displacementOverview = null; + this.displacementOverview$.next(null); + } + public setDisplacementType(type) { + this.displacementOverview$.next(type) + } + + + public setDisplacementLayer(points: { point: Point, seriesNumber: number, color: string }[]) { + if (!!this.displacmentLayer) { + this.map.removeLayer(this.displacmentLayer); + this.displacmentLayer = null; + } + let self = this; + + let source = new VectorSource(); + let pointFeatures = points.map(dataPoint => { + let temp = dataPoint.point.clone() as Point; + temp.transform('EPSG:4326', 'EPSG:3857') + let temp_feature = new Feature(temp) + temp_feature.set('point', dataPoint.point) + temp_feature.set('seriesNumber', dataPoint.seriesNumber) + temp_feature.set('seriesColor', dataPoint.color); + return temp_feature; + }); + source.addFeatures(pointFeatures); + + const stylize = function StyleFunction(feature: Feature) { + + const textFunction = function (f: Feature) { + let labelContent = f.get('seriesNumber'); + return labelContent.toString(); + } + + const textColorFunction = function (f: Feature) { + let color: string = f.get('seriesColor') ?? "#000000"; + return color; + } + + let selected = (feature.get('seriesNumber') === self.pointHistoryService.selectedPoint); + + let layerStyle = new Style({ + image: new CircleStyle({ + stroke: new Stroke({ + color: (selected) ? 'red' : '#ffcc33', + width: (selected) ? 3 : 2, + }), + radius: (selected) ? 12 : 10, + fill: new Fill({ + color: textColorFunction(feature), + }), + }), + text: new olText({ + overflow: true, + font: (selected) ? 'bold 16px sans-serif' : '13px sans-serif', + fill: new Fill({ + color: '#000000', + }), + text: textFunction(feature) + }) + }) + + return layerStyle + } + + this.displacmentLayer = new VectorLayer({ + source: source, + style: stylize + }); + + this.displacmentLayer.set('displacement-layer', 'true'); + + this.map.addLayer(this.displacmentLayer); + } + public clearCoherence(): void { if (!this.layerService.coherenceLayer) { return; @@ -712,6 +943,59 @@ export class MapService { this.hasCoherenceLayer$.next(null); } + public enablePriority(flight_dir: models.FlightDirection): void { + const source = new VectorSource({ + url: `/assets/priority_rollout_${flight_dir}.geojson`, + format: new GeoJSON({}) + }, + ) + this.priorityEnabled$.next(flight_dir); + + const colorTable = [ + 'rgba(174, 174, 174, 0.6)', + 'rgba(127, 206, 255, 0.8)', + 'rgba(45, 128, 179, 0.7)', + 'rgba(0, 64, 103, 0.6)', + ] + this.priorityOverview = new VectorLayer({ + source: source, + style: function (feature, _resolution) { + const test = feature.getProperties(); + const priority = +test['priority']; + let color = '#FF0000'; + if (priority === 1) { + color = colorTable[1]; + } else if (priority === 2) { + color = colorTable[2]; + } else if (priority === 3) { + color = colorTable[3]; + } else { + color = colorTable[0] + } + return new Style({ + fill: new Fill({ + color: color + }), + stroke: new Stroke({ + color: 'black', + }) + }); + } + }) + this.map.addLayer(this.priorityOverview) + } + + public disablePriority(): void { + this.map.removeLayer(this.priorityOverview); + this.priorityOverview = null; + this.priorityEnabled$.next(null); + + } + + public isPriorityEnabled(): boolean { + return !!this.priorityOverview; + } + public createBrowseRasterCanvas(scenes: models.CMRProduct[]) { const scenesWithBrowse = scenes.filter(scene => scene.browses?.length > 0).slice(0, 10); @@ -733,6 +1017,10 @@ export class MapService { this.map.removeLayer(this.browseImageLayer); } } + public clearTimeseriesOverlay() { + this.map.removeLayer(this.displacmentLayer); + this.displacmentLayer = null; + } public updateBrowseOpacity(opacity: number) { this.browseImageLayer?.setOpacity(opacity); @@ -806,4 +1094,8 @@ export class MapService { ); } + ngOnDestroy() { + this.subs.unsubscribe(); + } + } diff --git a/src/app/services/map/polygon.style.ts b/src/app/services/map/polygon.style.ts index 51cad93c5..78cd1eea1 100644 --- a/src/app/services/map/polygon.style.ts +++ b/src/app/services/map/polygon.style.ts @@ -5,14 +5,39 @@ export const valid = new Style({ color: 'rgba(255, 255, 255, 0.2)' }), stroke: new Stroke({ - color: '#ffcc33', - width: 4 + color: '#236192', + width: 2 }), image: new CircleStyle({ - radius: 7, + stroke: new Stroke({ + color: '#ffcc33', + width: 2 + }), + radius: 10, fill: new Fill({ - color: '#ffcc33' - }) + color: '#236192', + }), + }) +}); + +export const validDisplacement = new Style({ + fill: new Fill({ + color: 'rgba(255, 255, 255, 0.2)' + }), + stroke: new Stroke({ + color: '#236192', + width: 2 + }), + image: new CircleStyle({ + stroke: new Stroke({ + color: '#ffcc33', + width: 2 + }), + radius: 10, + fill: new Fill({ + // color: '#236192', + color: 'rgba(0,0,0,0.25)', + }), }) }); @@ -34,6 +59,14 @@ export const scene = new Style({ fill, }); + export const staticAOI = new Style({ + stroke: new Stroke({ + color: '#ff5555', + width: 4 + }), + fill, + }); + export const icon = new Style({ stroke, fill, diff --git a/src/app/services/map/views/equatorial.ts b/src/app/services/map/views/equatorial.ts index 4f9554143..9a737a59e 100644 --- a/src/app/services/map/views/equatorial.ts +++ b/src/app/services/map/views/equatorial.ts @@ -76,7 +76,7 @@ function equatorialView(url: string): MapView { projection: projection.epsg, zoom: 3, minZoom: 3, - maxZoom: 13, + maxZoom: 17, extent: proj.transformExtent( [-Number.MAX_VALUE, -90, Number.MAX_VALUE, 90], 'EPSG:4326', projection.epsg diff --git a/src/app/services/netcdf-service.service.ts b/src/app/services/netcdf-service.service.ts new file mode 100644 index 000000000..73a0b6a19 --- /dev/null +++ b/src/app/services/netcdf-service.service.ts @@ -0,0 +1,171 @@ +import { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { BrowseOverlayService, NotificationService, WktService } from '@services'; +import { Observable, Subject, catchError, first, map, of, tap } from 'rxjs'; +// import WebGLTileLayer from 'ol/layer/WebGLTile'; +import ImageLayer from 'ol/layer/Image'; +// import Static from 'ol/source/ImageStatic'; +// import { TimeSeriesResult } from '@models'; +import ImageSource from 'ol/source/Image'; +import Feature from 'ol/Feature'; +import Geometry from 'ol/geom/Geometry'; +import WKT from 'ol/format/WKT'; +import { FlightDirection } from '@models'; +import { Store } from '@ngrx/store'; +import { AppState } from '@store'; +import { setTimeseriesValid } from '@store/charts'; +// import { timeseriesChartItemState } from '@models'; + +@Injectable({ + providedIn: 'root' +}) +export class NetcdfService { + private url: string = 'https://dly8dsparg.execute-api.us-west-2.amazonaws.com/prod/' + // private url: string = 'http://127.0.0.1:8000/' + private bucket: string = 'kfbx-opera-disp-test-bucket-v0.6' + private itemsEndpoint: string = 'items/' + private timeSeriesEndpoint: string = 'timeseries' + private files: string[] = [""] //, "20221107_20230130.unw.nc", "20221107_20230106.unw.nc", "20221107_20230729.unw.nc", "20221107_20230319.unw.nc", "20221107_20221213.unw.nc", "20221107_20230530.unw.nc", "20221107_20230717.unw.nc", "20221107_20230412.unw.nc", "20221107_20230506.unw.nc", "20221107_20230223.unw.nc", "20221107_20230211.unw.nc", "20221107_20230331.unw.nc", "20221107_20230705.unw.nc"] + public layers: { feature: Feature, browse: ImageLayer }[] = [] + // private data = [] + + private ascendingCache = {} + private descendingCache = {} + private totalKeys = []; + private maxCacheSize = 10; + private csvHeaders = 'name, geometry, date (mm/dd/yr), short wavelength displacement, source file' + + constructor( + private http: HttpClient, + private browseOverlayService: BrowseOverlayService, + private notificationService: NotificationService, + private store$: Store, + private wktService: WktService, + ) { + } + + public cacheUpdated = new Subject(); + private getTargetCache(flightDir: FlightDirection) { + return flightDir === FlightDirection.ASCENDING ? this.ascendingCache : this.descendingCache; + } + public getCache(flightDir: FlightDirection = FlightDirection.ASCENDING) { + return this.getTargetCache(flightDir) + } + + public removeFromCache(wkt: string): void { + for (const cache of [this.ascendingCache, this.descendingCache]) { + if (cache.hasOwnProperty(wkt)) { + delete cache[wkt]; + } + } + this.cacheUpdated.next(wkt); + } + + public get_layers(): Observable<{ feature: Feature, browse: ImageLayer }>[] { + let output: Observable<{ feature: Feature, browse: ImageLayer }>[] = [] + for (let file of this.files) { + output.push( + // this.http.get(`${this.url}${this.itemsEndpoint}${file}/wkt`, { + // withCredentials: false, + // }) + of({ + "wkt": "POLYGON ((-120.6615251969388 38.10092445232182, -120.718418876677 38.10897042852191, -120.7687981867154 38.11607699567575, -120.8223842116076 38.12360668069909, -120.8733089224232 38.13074101176107, -120.9255974694615 38.13804006716389, -120.9782363367441 38.14536236026648, -121.0303471231114 38.15258680544186, -121.0823814204628 38.15977601859417, -121.1336652680372 38.16683812087351, -121.1849693782792 38.17387895092786, -121.2361602677623 38.18088039984787, -121.2869646120337 38.18780577716645, -121.3375229031567 38.19467458653498, -121.3879319144246 38.20150001584902, -121.4380928806928 38.2082691440719, -121.48505251800194 38.21458511223616, -121.4979189941239 38.15679508985913, -121.5451257107823 38.16313218201496, -121.592953840566 38.16953126137506, -121.6404964543046 38.17587181120622, -121.6879444908994 38.1821794169493, -121.7350806171162 38.18842560862485, -121.7821901201844 38.19464818602976, -121.8289374351079 38.2008033803675, -121.875497410779 38.20691448140832, -121.9218859632967 38.21298372468529, -121.9680833288035 38.21900871960997, -122.0140702787725 38.22498738060301, -122.0599206670441 38.23092929858424, -122.1059585738455 38.2368761405194, -122.1514735133781 38.24273717717463, -122.1979014546924 38.2486952346684, -122.244615989063 38.2546698823656, -122.286885062221 38.26006503505684, -122.3317752679495 38.26577302739613, -122.3775723820507 38.27157630911835, -122.42123453427 38.27709387365238, -122.3875484561343 38.44335751378058, -122.3549566790437 38.6091213367138, -122.3229758544996 38.77533736367074, -122.29313500149443 38.91965939725944, -122.2931986677531 38.91966733273354, -122.2925627865127 38.9224268526602, -122.2887701098792 38.94076971988311, -122.28834812101118 38.940717144457984, -122.2502498419884 39.10605141358776, -122.2157782644292 39.27170293253297, -122.1815283061143 39.43725346107452, -122.1472572267041 39.60305289383881, -122.1130639748912 39.76873358401883, -122.0675701389326 39.76315681176509, -122.0218481032378 39.75753305709504, -121.9760196548119 39.75187713956733, -121.929864512371 39.74616200405372, -121.8837690847976 39.74043466811828, -121.8374203210423 39.73465661582819, -121.791211744151 39.72887631552463, -121.7456899474469 39.72316180449544, -121.6988471023898 39.71726355714952, -121.6533751032039 39.71151676131318, -121.6061895206761 39.70553583833315, -121.5603292645533 39.69970149217903, -121.5127856827611 39.69363502046918, -121.4664710460075 39.68770372009153, -121.4210645773518 39.68186845835792, -121.3729669321757 39.67567034603585, -121.3268498223454 39.66970500286652, -121.275596174204 39.66305914356388, -121.23604272872647 39.6579045935206, -121.2244640164199 39.71534629800334, -121.1784594023133 39.70934267871426, -121.1276064970944 39.70268952197334, -121.0780739102677 39.69618461629537, -121.0267410574926 39.68942175169576, -120.975085191874 39.68259220041627, -120.9257537225777 39.67604419625462, -120.8710135065594 39.66875876119759, -120.8167165953291 39.66150454807043, -120.7705437611066 39.655305079238, -120.7176097793887 39.64818263591323, -120.6649687279217 39.64107360222791, -120.6114321199584 39.63381832569695, -120.5594923473139 39.62675237603518, -120.5017828883486 39.6188789551781, -120.4472491145715 39.6114071370957, -120.3883242038642 39.60330747049631, -120.3370092612197 39.59621997052633, -120.2813999384972 39.58851678688196, -120.2296104188867 39.58131287068803, -120.22944381151437 39.581289630071666, -120.2154569393103 39.63790533909514, -120.1742797139164 39.63216231050976, -120.1264443170872 39.62547816133655, -120.072273265767 39.61788967347653, -120.024290579522 39.6111395653885, -119.9754892816819 39.60425317248164, -119.9226048246936 39.5967696967055, -119.8731093519402 39.58973912438189, -119.8197276782546 39.58213470378855, -119.7699163707657 39.57501170734424, -119.7193222676103 39.56775386481531, -119.6698443969075 39.56063207891211, -119.6184971557052 39.5532188145865, -119.5676596282832 39.54585444187427, -119.5143635424045 39.53811032041745, -119.461759438467 39.53044018027278, -119.4139297776831 39.52343940206701, -119.356057273174 39.51494998815573, -119.3020700177219 39.50699916810786, -119.2442911438907 39.49846293635978, -119.1888385758543 39.49023910183713, -119.2300434137396 39.32442476692368, -119.2716392184819 39.15867317919636, -119.3174163145565 38.99367643664652, -119.3574470593102 38.82744683629423, -119.409616202118 38.66354573964197, -119.46623702603758 38.48339749975689, -119.501495001161 38.33326947583445, -119.5494293311593 38.16837794988868, -119.5779561966781 38.0008324836028, -119.6348456449869 38.00942356847073, -119.6879196360585 38.01741453952543, -119.7374828222481 38.0248563990352, -119.7896505275019 38.03266239553314, -119.8369373080383 38.0397205504928, -119.8846690370325 38.04682381711567, -119.9356320210271 38.05438160775212, -119.9856804211096 38.06178126103737, -120.0311350097279 38.06848591194525, -120.0809769358709 38.07581137535976, -120.1288388771053 38.08282613650103, -120.1786866033086 38.09010748671172, -120.2231158906922 38.09658324791623, -120.2668607950306 38.1029422520851, -120.3150668664364 38.10992452733352, -120.3589122145552 38.11626087708805, -120.4065289496206 38.12311818553922, -120.4536899639952 38.12988977175748, -120.48657862159999 38.134597931356474, -120.4983048166556 38.07766913680384, -120.5540463445464 38.0856371455415, -120.6068805405367 38.09316629131492, -120.6615251969388 38.10092445232182))", + "epsg": "32610" + }) + .pipe( + map(wkt_response => { + const wkt = wkt_response['wkt'] + const feature = this.wktService.wktToFeature(wkt, 'EPSG:3857'); + // const polygon = this.browseOverlayService.getPolygonFromFeature(feature, wkt); + return { feature, browse: this.browseOverlayService.createNormalImageLayer(`http://127.0.0.1:8080/${this.itemsEndpoint}layers?file_name=${file}&layer=short_wavelength_displacement`, wkt, 'ol-layer', 'current-overlay') } + } + // this.browseOverlayService.createGeotiffLayer(response, wkt_response['wkt'], 'ol-layer', 'current-overlay') + ), + first(), + tap(output => { + output.browse.set('file', this.files[0]); + + // browseImageLayer.on('select', (_) => console.log(browseImageLayer.get('file'))) + })), + ) + } + + return output + } + + public getTimeSeries(geometry, flightDirection =FlightDirection.ASCENDING): Observable { + + let format = new WKT(); + let wktRepresenation = format.writeGeometry(geometry); + let index_id = wktRepresenation; + + let target_cache = this.getTargetCache(flightDirection) + + + if (target_cache.hasOwnProperty(index_id)) { + return of(target_cache[index_id]) + } else { + return this.http.post(`${this.url}${this.timeSeriesEndpoint}`, { + "wkt": wktRepresenation, + "bucket": this.bucket, + "polarization": "VV", + }, { responseType: 'json' }).pipe( + first(), + catchError(error => { + this.notificationService.error(error.error.detail, 'Timeseries Service Error') + this.store$.dispatch(setTimeseriesValid({wkt: wktRepresenation, valid: false})) + return of(null) + }), + map(response => { + if (!!response) { + (response as any).aoi = wktRepresenation; + } + target_cache[index_id] = response; + this.totalKeys.push(index_id); + if (this.totalKeys.length > this.maxCacheSize) { + let deleted = this.totalKeys.splice(0); + delete target_cache[deleted[0]]; + } + this.cacheUpdated.next(index_id) + return response + } + )) + } + + } + + // series, longitude, latitude, date (mm/dd/yr), short wavelength displacement, source file + // series 1, 1.0, 2.0, 05/14/2020, 0.500, granule1.nc + // ... + public toCSV(seriesData: { [index:string]: {}[]}): string { + let output = `${this.csvHeaders}\n` + const sortedSeriesKeys = Object.keys(seriesData).sort((s1, s2) => s1 < s2 ? -1 : 1) + for (const seriesNumber of sortedSeriesKeys) { + + for (const timestep of seriesData[seriesNumber]) { + if (timestep !== 'aoi') { + let dateDisplay = '' + if (timestep !== 'mean') { + + const d = new Date(timestep['date']) + + let month = d.getUTCMonth() + 1 + let monthDisplay = month.toString() + if (month < 10) { + monthDisplay = `0${monthDisplay}` + } + let day = d.getUTCDate() + let dayDisplay = day.toString() + if (day < 10) { + dayDisplay = `0${dayDisplay}` + } + dateDisplay = `${monthDisplay}/${dayDisplay}/${d.getUTCFullYear()}` + } + output += `Series ${seriesNumber}, ${timestep['wkt']}, ${dateDisplay}, ${timestep['short_wavelength_displacement']}, ${timestep['fileName']}\n` + } + } + } + return output + } + +} diff --git a/src/app/services/point-history.service.ts b/src/app/services/point-history.service.ts new file mode 100644 index 000000000..100ff8086 --- /dev/null +++ b/src/app/services/point-history.service.ts @@ -0,0 +1,98 @@ +import { Injectable } from '@angular/core'; +import { timeseriesChartItemState } from '@models'; +import { Store } from '@ngrx/store'; +import { AppState } from '@store'; +import { addTimeseriesState, removeTimeseriesState, resetTimeseriesStates } from '@store/charts'; +import WKT from 'ol/format/WKT'; + +import { Point } from 'ol/geom'; +import { Subject } from 'rxjs'; + + +@Injectable({ + providedIn: 'root' +}) +export class PointHistoryService { + private history : {point: Point, wkt: string}[] = []; + public history$ = new Subject<{point: Point, wkt: string}[]>(); + public passDraw: boolean = false; + public selectedPoint: number = 0; + + constructor( + private store$: Store, + ) { } + + public getHistory(): {point: Point, wkt: string}[] { + return this.history; + } + + public findPoint(wkt: string){ + return this.history.find( (value, _index) => { + if (value.wkt === wkt) + return { + point: value.point, + wkt: wkt + }; + }) + } + + public addPoint(point: Point, seriesNumber: number) { + if(this.passDraw) { + this.passDraw = false + return + } + const format = new WKT() + const wkt = format.writeGeometry(point) + if (!!!this.history.find(x => x.wkt == wkt)) { + this.history.push({point, wkt}); + this.store$.dispatch(addTimeseriesState({item: {geometry: point, checked: true, seriesNumber, wkt: wkt, name: `Series ${seriesNumber}`, linearFit: false, valid: true}})) + this.history$.next(this.history); + this.savePoints(); + } + } + + public addPoints(states: timeseriesChartItemState[]) { + if(states.length <= 0) { + return + } + for(let state of states) { + const point = state.geometry as Point; + this.history = [...this.history,{point, wkt: state.wkt} ] + this.store$.dispatch(addTimeseriesState({item: state})) + } + this.history$.next(this.history); + this.savePoints(); + } + + public clear() { + this.history = []; + this.history$.next(this.history); + this.store$.dispatch(resetTimeseriesStates()) + this.selectedPoint = -1; + this.savePoints(); + } + public removePoint(index) { + // const format = new WKT() + const wkt = this.history[index].wkt + this.history.splice(index,1); + this.history$.next(this.history) + this.store$.dispatch(removeTimeseriesState({wkt})) + this.savePoints(); + + } + + public clearPoints() { + this.history = []; + this.history$.next(this.history); + } + + private savePoints() { + let converted = this.history.map((value) => { + return value.wkt + }) + localStorage.setItem('timeseries-points', converted.join(';')) + } + + + +} diff --git a/src/app/services/polygon-validation.service.ts b/src/app/services/polygon-validation.service.ts index e4dcd677e..79d8c49da 100644 --- a/src/app/services/polygon-validation.service.ts +++ b/src/app/services/polygon-validation.service.ts @@ -50,6 +50,11 @@ export class PolygonValidationService { ).subscribe(_ => _); } + public validateTimeseriesSelection(_sceneWKt: string) { + this.mapService.searchPolygon$.pipe( + ) + } + private getErrorFrom(resp) { if (resp.error) { return resp.error; diff --git a/src/app/services/saved-search.service.ts b/src/app/services/saved-search.service.ts index 691137bb5..a552a8b79 100644 --- a/src/app/services/saved-search.service.ts +++ b/src/app/services/saved-search.service.ts @@ -8,6 +8,7 @@ import {v1 as uuid} from 'uuid'; import { MapService } from './map/map.service'; import { AppState } from '@store'; import * as filtersStore from '@store/filters'; +import * as chartsStore from '@store/charts'; import * as scenesStore from '@store/scenes'; import { getSearchType } from '@store/search/search.reducer'; import { UpdateSearchWithFilters, UpdateSearchName, DeleteSavedSearch, @@ -127,6 +128,19 @@ export class SavedSearchService { ) ); + private currentDisplacementSearch$ = combineLatest([ + this.store$.select(chartsStore.getTimeseriesChartStates), + this.store$.select(filtersStore.getFlightDirections), + this.store$.select(filtersStore.getDateRange), + ] + ).pipe( + map(([seriesStates, flightDirections, dateRange]) => ({ + seriesStates, + flightDirections, + dateRange + })) + ); + private searchType$ = this.store$.select(getSearchType); public currentSearch$ = this.searchType$.pipe( @@ -138,6 +152,7 @@ export class SavedSearchService { [models.SearchType.CUSTOM_PRODUCTS]: this.currentCustomProductSearch$, [models.SearchType.SARVIEWS_EVENTS]: this.currentSarviewsEventSearch$, [models.SearchType.DERIVED_DATASETS]: this.currentSarviewsEventSearch$, + [models.SearchType.DISPLACEMENT]: this.currentDisplacementSearch$ })[searchType] ) ); diff --git a/src/app/services/search-params.service.ts b/src/app/services/search-params.service.ts index 6f51c8ab0..d6ee85569 100644 --- a/src/app/services/search-params.service.ts +++ b/src/app/services/search-params.service.ts @@ -224,6 +224,19 @@ export class SearchParamsService { ) ); + private timeseriesParams$ = combineLatest([ + this.searchPolygon$, + this.burstParams$, + this.maxResults$, + this.selectedDataset$, + ]).pipe( + map((params: any[]) => params + .reduce( + (total, param) => ({ ...total, ...param }), + {}) + ) + ) + public getParams = combineLatest([ this.store$.select(getSearchType), @@ -231,8 +244,9 @@ export class SearchParamsService { ).pipe( withLatestFrom(this.listParam$), withLatestFrom(this.filterSearchParams$), + withLatestFrom(this.timeseriesParams$), map( - ([[[searchType, baselineParams], listParam], filterParams]) => { + ([[[[searchType, baselineParams], listParam], filterParams], timeseriesParams]) => { switch (searchType) { case models.SearchType.LIST: { return listParam; @@ -249,6 +263,9 @@ export class SearchParamsService { case models.SearchType.CUSTOM_PRODUCTS: { return listParam; } + case models.SearchType.DISPLACEMENT: { + return timeseriesParams; + } default: { return filterParams; } diff --git a/src/app/services/search.service.ts b/src/app/services/search.service.ts index 81866ed76..fd1a09304 100644 --- a/src/app/services/search.service.ts +++ b/src/app/services/search.service.ts @@ -12,6 +12,7 @@ import * as models from '@models'; import { MapService, } from './map/map.service'; import { WktService } from './wkt.service'; import { PinnedProduct } from './browse-map.service'; +import { PointHistoryService } from './point-history.service'; @Injectable({ providedIn: 'root' @@ -22,6 +23,7 @@ export class SearchService { private store$: Store, private mapService: MapService, private wktService: WktService, + private pointHistoryService: PointHistoryService, ) { } public clear(searchType: models.SearchType): void { @@ -106,6 +108,11 @@ export class SearchService { )); } } + if(search.searchType === models.SearchType.DISPLACEMENT) { + const filters = search.filters; + const seriesStates = filters.seriesStates; + this.pointHistoryService.addPoints(Object.values(seriesStates)) + } this.store$.dispatch(new filterStore.SetSavedSearch(search)); } diff --git a/src/app/services/url-state.service.ts b/src/app/services/url-state.service.ts index 7e4ce24a7..24280b177 100644 --- a/src/app/services/url-state.service.ts +++ b/src/app/services/url-state.service.ts @@ -7,11 +7,12 @@ import { filter, map, skip, debounceTime, take, distinctUntilChanged } from 'rxj import { AppState } from '@store'; import * as hyp3Store from '@store/hyp3'; +import * as chartsStore from '@store/charts'; import * as scenesStore from '@store/scenes'; import * as mapStore from '@store/map'; import * as filterStore from '@store/filters'; import * as uiStore from '@store/ui'; -import { SetSearchType, MakeSearch } from '@store/search/search.action'; +import { SetSearchType, MakeSearch, setSearchKioskMode } from '@store/search/search.action'; import { getSearchType } from '@store/search/search.reducer'; import * as models from '@models'; @@ -21,21 +22,27 @@ import { WktService } from './wkt.service'; import { RangeService } from './range.service'; import { PropertyService } from './property.service'; import { ThemingService } from './theming.service'; +import { PointHistoryService } from './point-history.service'; +import WKT from 'ol/format/WKT'; +import { Point } from 'ol/geom'; @Injectable({ providedIn: 'root' }) export class UrlStateService { - private urlParamNames: string[]; + private urlParamNames: string[] = []; private urlParams: {[id: string]: models.UrlParameter}; - private loadLocations: {[paramName: string]: models.LoadTypes}; + private loadLocations: {[paramName: string]: models.LoadTypes} = {}; private params = {}; private shouldDoSearch = false; private defaultbooleanParams = { 'useCalibrationData': false } + private kioskMode = false; // for opera displacement + private displacementHostNames = [ 'displacement.asf.alaska.edu', 'search-displacement.asf.alaska.edu']; + public isDefaultSearch$ = this.activatedRoute.queryParams.pipe( map(params => { const keys = Object.keys(params) @@ -55,18 +62,31 @@ export class UrlStateService { private router: Router, private prop: PropertyService, private themeService: ThemingService, + private pointHistoryService: PointHistoryService ) { - const params = [ - ...this.datasetParam(), - ...this.mapParameters(), - ...this.uiParameters(), - ...this.filtersParameters(), - ...this.missionParameters(), - ...this.baselineParameters(), - ...this.sbasParameters(), - ...this.onDemandParameters(), - ...this.eventMonitorParameters(), - ]; + + this.kioskMode = this.displacementHostNames.includes(window.location.hostname); + let params = []; + if(this.kioskMode) { + this.store$.dispatch(new setSearchKioskMode(true)); + params = [ + ...this.displacementParameters(), + ...this.displacementKioskParameters$() + ] + } else { + params = [ + ...this.datasetParam(), + ...this.mapParameters(), + ...this.uiParameters(), + ...this.filtersParameters(), + ...this.missionParameters(), + ...this.baselineParameters(), + ...this.sbasParameters(), + ...this.onDemandParameters(), + ...this.eventMonitorParameters(), + ...this.displacementParameters(), + ]; + } this.urlParamNames = params.map(param => param.name); this.loadLocations = this.urlParamNames.reduce((locations, paramName) => { @@ -79,11 +99,14 @@ export class UrlStateService { return res; }, {}); - this.updateShouldSearch(); + } public load(): void { + if (this.kioskMode) { + this.store$.dispatch(new SetSearchType(models.SearchType.DISPLACEMENT)) + } this.activatedRoute.queryParams.pipe( skip(1), take(1), @@ -108,7 +131,6 @@ export class UrlStateService { .filter(key => params[key] !== '' && params[key] !== this.defaultbooleanParams?.[key]) .reduce((res, key) => (res[key] = params[key], res), {}); - this.params = paramsWithValues; this.router.navigate(['.'], { @@ -156,28 +178,32 @@ export class UrlStateService { } public setDefaults(profile: models.UserProfile): void { - if (this.loadLocations['dataset'] !== models.LoadTypes.URL) { - if (this.loadLocations['productTypes'] !== models.LoadTypes.URL) { - this.store$.dispatch(new filterStore.SetSelectedDataset(profile.defaultDataset)); + if (!this.kioskMode) { + if (this.loadLocations['dataset'] !== models.LoadTypes.URL) { + if (this.loadLocations['productTypes'] !== models.LoadTypes.URL) { + this.store$.dispatch(new filterStore.SetSelectedDataset(profile.defaultDataset)); + } } - } - if (this.loadLocations['maxResults'] !== models.LoadTypes.URL) { - this.store$.dispatch(new filterStore.SetMaxResults(profile.maxResults)); - } + if (this.loadLocations['maxResults'] !== models.LoadTypes.URL) { + this.store$.dispatch(new filterStore.SetMaxResults(profile.maxResults)); + } - if (profile.theme && profile.theme !== 'System Preferences') { - this.themeService.setTheme(`theme-${profile.theme}`); - } else if (profile.theme) { - this.themeService.theme$.pipe( - take(1) - ).subscribe( - themePreference => { - this.themeService.setTheme(`theme-${themePreference}`); - } - ); + if (profile.theme && profile.theme !== 'System Preferences') { + this.themeService.setTheme(`theme-${profile.theme}`); + } else if (profile.theme) { + this.themeService.theme$.pipe( + take(1) + ).subscribe( + themePreference => { + this.themeService.setTheme(`theme-${themePreference}`); + } + ); + } else { + this.themeService.setTheme('theme-light'); + } } else { - this.themeService.setTheme('theme-light'); + this.store$.dispatch(new scenesStore.SetResultsLoaded(true)) } const action = profile.mapLayer === models.MapLayerTypes.STREET ? new mapStore.SetStreetView() : @@ -297,6 +323,105 @@ export class UrlStateService { }]; } + private displacementParameters() { + return [ + { + name: 'series', + source: this.store$.select(chartsStore.getTimeseriesChartStates).pipe( + map(seriesState => { + return {'series': Object.values(seriesState).map(x => [x.wkt, x.seriesNumber].join(';')).join(',')} + }), + ), + loader: this.loadSeriesState + }, + { + name: 'dispOverview', + source: this.mapService.displacementOverview$.pipe( + map(dispOverview => ({dispOverview})), + ), + loader: this.loadDispOverview + }, + { + name: 'isPriorityEnabled', + source: this.mapService.priorityEnabled$.pipe( + map(isPriorityEnabled => ({isPriorityEnabled})), + ), + loader: this.loadDispPriority + }, + { + name: 'isShowLinesEnabled', + source: this.store$.select(chartsStore.getShowLines).pipe( + map(isShowLinesEnabled => ({isShowLinesEnabled})), + ), + loader: this.loadDispShowLines + }, + { + name: 'isLinearFitEnabled', + source: this.store$.select(chartsStore.getShowLinearFit).pipe( + map(isLinearFitEnabled => ({isLinearFitEnabled})), + ), + loader: this.loadDispShowLinearFit + }, + { + name: 'referencePoint', + source: this.store$.select(chartsStore.getTimeseriesReference).pipe( + map(referencePoint => ({referencePoint: encodeURIComponent(JSON.stringify(referencePoint))})) + ), + loader: this.loadDispReferencePoint + } + ] + } + + private displacementKioskParameters$() { + return [ + { + name: 'view', + source: this.store$.select(mapStore.getMapView).pipe( + map(view => ({ view })) + ), + loader: this.loadMapView + }, { + name: 'center', + source: this.mapService.center$.pipe( + map( + ({ lon, lat }) => ({ + lon: lon.toFixed(3), + lat: lat.toFixed(3) + }) + ), + map(({ lon, lat }) => ({ center: `${lon},${lat}` })) + ), + loader: this.loadMapCenter + }, { + name: 'zoom', + source: this.mapService.zoom$.pipe( + map(zoom => ({ zoom: zoom.toFixed(3) })) + ), + loader: this.loadMapZoom + }, { + name: 'flightDirs', + source: this.store$.select(filterStore.getFlightDirections).pipe( + map(dirs => dirs.join(',')), + map(flightDirs => ({ flightDirs })) + ), + loader: this.loadFlightDirections + }, + { + name: 'start', + source: this.store$.select(filterStore.getStartDate).pipe( + map(start => ({ start: start === null ? '' : moment.utc( start ).format() })) + ), + loader: this.loadStartDate + }, { + name: 'end', + source: this.store$.select(filterStore.getEndDate).pipe( + map(end => ({ end: end === null ? '' : moment.utc( end ).format() })) + ), + loader: this.loadEndDate + }, + ] + } + private missionParameters(): models.UrlParameter[] { return [{ @@ -728,12 +853,14 @@ export class UrlStateService { private loadFlightDirections = (dirsStr: string): Action => { const directions: models.FlightDirection[] = dirsStr .split(',') - .filter(direction => !Object.values(models.FlightDirection).includes(direction)) + .filter(direction => !Object.values(models.FlightDirection).includes(this.capitalizeFirstLetter(direction.toLowerCase()))) .map(direction => direction); - return new filterStore.SetFlightDirections(directions); }; + private capitalizeFirstLetter(str) { + return str.charAt(0).toUpperCase() + str.slice(1); + } private loadSelectedMission = (mission: string): Action => { return new filterStore.SelectMission(mission); }; @@ -868,4 +995,48 @@ export class UrlStateService { private loadUseCalibrationData = (usingCalibrationData: string): Action => { return new filterStore.setUseCalibrationData(!!usingCalibrationData) } + + private loadSeriesState = (seriesState)=> { + let states: models.timeseriesChartItemState[] = []; + seriesState.split(',').forEach(x => { + const format = new WKT() + let thing = x.split(';') + const point = format.readFeature(thing[0]) as unknown as Point; + states.push({ geometry: point, checked: true, seriesNumber: thing[1], wkt: thing[0], name: `Series ${thing[1]}`, linearFit: false, valid: true }) + }) + this.pointHistoryService.addPoints(states) + return; + } + private loadDispOverview = (dispOverview) => { + this.mapService.setDisplacementType(dispOverview); + return; + } + private loadDispPriority = (isDispPriorityEnabled) => { + if(isDispPriorityEnabled) { + this.mapService.enablePriority(isDispPriorityEnabled); + } + return; + } + private loadDispShowLines = (isShowLinesEnabled) => { + if(isShowLinesEnabled === 'true') { + this.store$.dispatch(chartsStore.showGraphLines()) + } else { + this.store$.dispatch(chartsStore.hideGraphLines()) + } + return; + } + private loadDispShowLinearFit = (isLinearFitEnabled) => { + if(isLinearFitEnabled === 'true') { + this.store$.dispatch(chartsStore.showLinearFit()) + } else { + this.store$.dispatch(chartsStore.hideLinearFit()) + } + return; + } + private loadDispReferencePoint = (referencePoint) => { + let fixedString = decodeURIComponent(referencePoint)//referencePoint.slice(1,referencePoint.length-1).replace('\"','"') + let pointObject = JSON.parse(fixedString) + this.store$.dispatch(chartsStore.setReferenceData({data: pointObject})) + return; + } } diff --git a/src/app/store/app.effect.ts b/src/app/store/app.effect.ts index d64b170e4..bc4719fb5 100644 --- a/src/app/store/app.effect.ts +++ b/src/app/store/app.effect.ts @@ -6,6 +6,7 @@ import { UIEffects } from './ui'; import { UserEffects } from './user'; import { Hyp3Effects } from './hyp3'; import { MapEffects } from './map'; +import { ChartsEffects } from './charts'; export const appEffects = [ FiltersEffects, @@ -16,4 +17,5 @@ export const appEffects = [ UserEffects, Hyp3Effects, MapEffects, + ChartsEffects, ]; diff --git a/src/app/store/app.reducer.ts b/src/app/store/app.reducer.ts index 9d34b8a86..156c3ebed 100644 --- a/src/app/store/app.reducer.ts +++ b/src/app/store/app.reducer.ts @@ -9,6 +9,7 @@ import { SearchState, searchReducer } from './search'; import { QueueState, queueReducer } from './queue'; import { UserState, userReducer } from './user'; import { Hyp3State, hyp3Reducer } from './hyp3'; +import { chartsReducer, ChartsState } from './charts'; export interface AppState { @@ -20,6 +21,7 @@ export interface AppState { queue: QueueState; user: UserState; hyp3: Hyp3State; + charts: ChartsState; } export const reducers: ActionReducerMap = { @@ -31,6 +33,7 @@ export const reducers: ActionReducerMap = { queue: queueReducer, user: userReducer, hyp3: hyp3Reducer, + charts: chartsReducer }; export const metaReducers: MetaReducer[] = diff --git a/src/app/store/charts/charts.action.ts b/src/app/store/charts/charts.action.ts new file mode 100644 index 000000000..7bb17128a --- /dev/null +++ b/src/app/store/charts/charts.action.ts @@ -0,0 +1,20 @@ +import { createAction, props } from '@ngrx/store'; +import * as models from '@models'; + +export const showGraphLines = createAction('[Chart] show lines') +export const hideGraphLines = createAction('[Chart] hide lines') +export const reset = createAction('[Chart] reset chart options') +export const setTimeseriesStates = createAction('[Chart] sets the checked timeseries', props<{'items': models.timeseriesChartItemState[]}>()) +export const resetTimeseriesStates = createAction('[Chart] Reset timeseries states') +export const addTimeseriesState = createAction('[Chart] add checked timeseries', props<{'item': models.timeseriesChartItemState}>()) +export const removeTimeseriesState = createAction('[Chart] removes timeseries by wkt', props<{'wkt': string}>()) +export const setTimeseriesChecked = createAction('[Chart] set single timeseries as checked/unchecked', props<{'wkt': string, 'checked': boolean}>()) +export const setAllTimeseriesChecked = createAction('[Chart] set all timeseries as checked/unchecked', props<{'checked': boolean}>()) +export const setTimeseriesColor = createAction('[Chart] set the color of a single timeseries', props<{'wkt': string, 'color': string}>()) +export const setTimeseriesValid = createAction('[Chart] mark a timeseries aoi as invalid', props<{'wkt': string, 'valid': boolean}>()) +export const setChartOutOfDate = createAction('[Chart] mark chart as out of date') +export const setChartUpToDate = createAction('[Chart], mark chart as up to date') +export const showLinearFit = createAction('[Chart] show all linear fit lines') +export const hideLinearFit = createAction('[Chart] hide all linear fit lines') +export const setReferenceData = createAction('[Chart] set reference point data', props<{'data': models.TimeSeriesData}>()) +export const resetReferenceData = createAction('[Chart] Reset chart reference point data') \ No newline at end of file diff --git a/src/app/store/charts/charts.effect.ts b/src/app/store/charts/charts.effect.ts new file mode 100644 index 000000000..c87862a95 --- /dev/null +++ b/src/app/store/charts/charts.effect.ts @@ -0,0 +1,31 @@ +import { Injectable } from '@angular/core'; +import { Actions, createEffect, ofType } from '@ngrx/effects'; +import * as chartActions from './charts.action'; +import { NetcdfService } from '@services'; +import { + filter, + // filter, + map, tap } from 'rxjs'; +import * as d3 from 'd3'; +@Injectable() +export class ChartsEffects { + private colorPalette = d3.scaleOrdinal() + .range(d3.schemeCategory10); + + updateTimeseriesCache = createEffect(() => this.actions$.pipe( + ofType(chartActions.removeTimeseriesState), + tap(({wkt}) => this.netcdfService.removeFromCache(wkt)), + ), {dispatch: false}); + + assignColor = createEffect(() => this.actions$.pipe( + ofType(chartActions.addTimeseriesState), + filter(action => action.item.color !== null), + map((new_series) => { + return chartActions.setTimeseriesColor({'wkt': new_series.item.wkt, 'color': this.colorPalette(new_series.item.seriesNumber.toString()) as string}) + }) + )) + constructor( + private actions$: Actions, + private netcdfService: NetcdfService + ) {} +} diff --git a/src/app/store/charts/charts.reducer.ts b/src/app/store/charts/charts.reducer.ts new file mode 100644 index 000000000..33e6e55ce --- /dev/null +++ b/src/app/store/charts/charts.reducer.ts @@ -0,0 +1,91 @@ +import { createReducer, on } from '@ngrx/store'; +import * as chartActions from './charts.action'; +import * as models from '@models'; + +export interface ChartsState { + showLines: boolean; + showLinearFit: boolean; + seriesStates: { [key: string]: models.timeseriesChartItemState }; + outOfDate: boolean; + baseReferenceDate: models.TimeSeriesData; +} + + +export const initialState: ChartsState = { + showLines: true, + showLinearFit: false, + seriesStates: {}, + outOfDate: false, + baseReferenceDate: null +}; + +export const chartsReducer = createReducer( + initialState, + on(chartActions.showGraphLines, (state) => ({ ...state, showLines: true })), + on(chartActions.hideGraphLines, (state) => ({ ...state, showLines: false })), + on(chartActions.setTimeseriesChecked, (state, { wkt, checked }) => { + // const output = { ...state }; + // if (wkt in output.seriesStates) { + // output.seriesStates[wkt].checked = checked; + // } + + const seriesState = { ...state.seriesStates, [wkt]: { ...state.seriesStates[wkt], checked } } + return { ...state, seriesStates: seriesState } + // return output; + }), + on(chartActions.setTimeseriesStates, (state, { items }) => ({ + ...state, seriesStates: items.reduce((prev: { [key: string]: models.timeseriesChartItemState }, curr) => { + prev[curr.wkt] = { checked: true, color: curr.color, seriesNumber: curr.seriesNumber, name: curr.name, wkt: curr.wkt, geometry: curr.geometry, linearFit: curr.linearFit, valid: true } + return prev + }, {}) + } + )), + on(chartActions.resetTimeseriesStates, (state) => { + return {...state, seriesStates: {}} + }), + on(chartActions.addTimeseriesState, (state, { item }) => { + + const seriesState = { ...state.seriesStates, [item.wkt]: item } + return { ...state, seriesStates: seriesState } + }), + on(chartActions.setAllTimeseriesChecked, (state, { checked }) => { + const seriesStates = Object.values(state.seriesStates).reduce((prev, curr) => { + prev[curr.wkt] = { ...curr, checked } + return prev + }, {}); + return { ...state, seriesStates } + }), + on(chartActions.setChartOutOfDate, (state) => ({ ...state, outOfDate: true })), + on(chartActions.setChartUpToDate, (state) => ({ ...state, outOfDate: false })), + on(chartActions.removeTimeseriesState, (state, { wkt }) => { + const seriesStates = { ...state.seriesStates } + delete seriesStates[wkt] + return { ...state, seriesStates } + }), + on(chartActions.setTimeseriesColor, (state, { wkt, color }) => { + const seriesStates = { ...state.seriesStates }; + seriesStates[wkt] = { ...seriesStates[wkt], color }; + + return { ...state, seriesStates }; + }), + on(chartActions.showLinearFit, (state) => { + return {...state, showLinearFit: true} + }), + on(chartActions.hideLinearFit, (state) => { + return {...state, showLinearFit: false} + }), + on(chartActions.setReferenceData, (state, {data}) => { + return {...state, baseReferenceDate: data} + }), + on(chartActions.resetReferenceData, (state) => { + return {...state, baseReferenceDate: null} + }), + on(chartActions.setTimeseriesValid, (state, {wkt, valid}) => { + const seriesStates = Object.values(state.seriesStates).reduce((prev, curr) => { + prev[curr.wkt] = { ...curr, valid: curr.wkt == wkt ? valid : curr.valid} + return prev + }, {}); + return { ...state, seriesStates } + }), + on(chartActions.reset, (_) => initialState) +); diff --git a/src/app/store/charts/charts.selectors.ts b/src/app/store/charts/charts.selectors.ts new file mode 100644 index 000000000..30e54705e --- /dev/null +++ b/src/app/store/charts/charts.selectors.ts @@ -0,0 +1,68 @@ +import { createFeatureSelector, createSelector } from '@ngrx/store'; +import { ChartsState } from './charts.reducer'; + + +export const getChartsState = createFeatureSelector('charts'); +export const getShowLines = createSelector( + getChartsState, + (state: ChartsState) => state.showLines +); +export const getShowLinearFit = createSelector( + getChartsState, + (state: ChartsState) => state.showLinearFit +) + +export const getTimeseriesChartStates = createSelector( + getChartsState, + (state: ChartsState) => state.seriesStates +); + +export const getCheckedTimeseries = createSelector( + getTimeseriesChartStates, + (chartStates) => { + const output = {}; + for (const key of Object.keys(chartStates)) { + if (chartStates[key].checked) { + output[key] = chartStates[key]; + } + } + + return output; + } +); + +export const getAreAllTimeseriesChecked = createSelector( + getTimeseriesChartStates, + getCheckedTimeseries, + (checked, all) => { + return Object.keys(checked).length === Object.keys(all).length + } +) + +export const getTimeseriesReference = createSelector( + getChartsState, + (state: ChartsState) => state.baseReferenceDate +) + +export const getIsChartOutOfDate = createSelector( + getChartsState, + (state) => state.outOfDate +) + +export const getChartWKTs = createSelector( + getTimeseriesChartStates, + (chartStates) => Object.keys(chartStates) +) + +export const getMinSeriesNumber = createSelector( + getTimeseriesChartStates, + (seriesStates) => { + const taken = new Set(Object.values(seriesStates).map(state => state.seriesNumber)) + + let output = 1; + while (taken.has(output)) { + output++ + } + return output; + } +); \ No newline at end of file diff --git a/src/app/store/charts/index.ts b/src/app/store/charts/index.ts new file mode 100644 index 000000000..9856bb5b6 --- /dev/null +++ b/src/app/store/charts/index.ts @@ -0,0 +1,4 @@ +export * from './charts.action'; +export * from './charts.reducer'; +export * from './charts.effect'; +export * from './charts.selectors'; diff --git a/src/app/store/filters/filters.action.ts b/src/app/store/filters/filters.action.ts index 988ee8aff..65f54d5e3 100644 --- a/src/app/store/filters/filters.action.ts +++ b/src/app/store/filters/filters.action.ts @@ -408,7 +408,8 @@ export class SetDefaultFilters implements Action { constructor(public payload: { 'Baseline Search': string, 'Geographic Search': string, - 'SBAS Search': string + 'SBAS Search': string, + 'Displacement': string }) {} } diff --git a/src/app/store/filters/filters.reducer.ts b/src/app/store/filters/filters.reducer.ts index 934d0b383..bfb1a1813 100644 --- a/src/app/store/filters/filters.reducer.ts +++ b/src/app/store/filters/filters.reducer.ts @@ -595,7 +595,12 @@ export function filtersReducer(state = initState, action: FiltersActions): Filte // TODO: Don't make geosearch default case or handle no // savable searches better return {...state}; - } else { + } else if(search.searchType === models.SearchType.DISPLACEMENT) { + const filters = search.filters; + + return {...state, flightDirections: new Set(filters.flightDirections), dateRange: filters.dateRange}; + } + else { const filters = search.filters; const dataset = models.datasetList.filter( diff --git a/src/app/store/map/map.effect.ts b/src/app/store/map/map.effect.ts index 7ef686b74..a3cd5a75e 100644 --- a/src/app/store/map/map.effect.ts +++ b/src/app/store/map/map.effect.ts @@ -52,6 +52,16 @@ export class MapEffects { tap(action => this.mapService.updateCoherenceOpacity(action.payload)) ), {dispatch: false}) + public onSearchTypeChanged2 = createEffect( () => this.actions$.pipe( + ofType(SearchActionType.SET_SEARCH_TYPE), + withLatestFrom(this.store$.select(getSearchType)), + tap(([action, search_type]) => { + if(search_type === SearchType.DISPLACEMENT && action.payload !== SearchType.DISPLACEMENT) { + this.mapService.clearTimeseriesOverlay(); + } + }) + ), {dispatch: false}) + public onSetSelectedScene = createEffect(() => this.actions$.pipe( ofType(ScenesActionType.SET_SELECTED_SCENE), map(action => action.payload), diff --git a/src/app/store/scenes/scenes.action.ts b/src/app/store/scenes/scenes.action.ts index 67c0ee523..4fdca0b18 100644 --- a/src/app/store/scenes/scenes.action.ts +++ b/src/app/store/scenes/scenes.action.ts @@ -8,6 +8,7 @@ export enum ScenesActionType { CLEAR = '[Granules] Clear Scenes', SET_SARVIEWS_EVENTS = '[SARViews] Set SARViews Events', SET_SARVIEWS_EVENT_PRODUCTS = '[SARViews] Set Selected SARViews Event Products', + SET_DISPLACEMENT_PRODUCTS = '[Timeseries] Set Selected Timeseries Products', SET_IMAGE_BROWSE_PRODUCTS = '[Products-Browse] Set product browse image view', diff --git a/src/app/store/scenes/scenes.reducer.ts b/src/app/store/scenes/scenes.reducer.ts index ac1e387dc..7073b57ea 100644 --- a/src/app/store/scenes/scenes.reducer.ts +++ b/src/app/store/scenes/scenes.reducer.ts @@ -19,6 +19,7 @@ export interface ScenesState { selectedPair: string[] | null; areResultsLoaded: boolean; scenes: {[id: string]: string[]}; + timeseriesResults: any; unzipped: {[id: string]: UnzippedFolder[]}; openUnzippedProduct: string | null; productUnzipLoading: string | null; @@ -49,6 +50,7 @@ export const initState: ScenesState = { openUnzippedProduct: null, products: {}, areResultsLoaded: false, + timeseriesResults: {}, selected: null, master: null, @@ -381,6 +383,7 @@ export function scenesReducer(state = initState, action: ScenesActions): ScenesS }; } + case ScenesActionType.SET_SELECTED_SARVIEW_PRODUCT: { return { ...state, diff --git a/src/app/store/search/search.action.ts b/src/app/store/search/search.action.ts index 08d206d25..9bd1b2b88 100644 --- a/src/app/store/search/search.action.ts +++ b/src/app/store/search/search.action.ts @@ -23,9 +23,11 @@ export enum SearchActionType { LOAD_ON_DEMAND_SCENES_LIST = '[Search] Load on Demand Scenes List', SARVIEWS_SEARCH_RESPONSE = '[Search] SARViews Search Response', + DISPLACEMENT_SEARCH_RESPONSE = '[Search] Timeseries Search Response', MAKE_EVENT_PRODUCT_CMR_SEARCH = '[Search] Make a search for CMR Products with SARVIEWS Products', EVENT_PRODUCT_CMR_RESPONSE = '[Search] Event Monitoring CMR Search Response', - SET_SEARCH_OUT_OF_DATE = '[Search] Set if Search is Out of Date' + SET_SEARCH_OUT_OF_DATE = '[Search] Set if Search is Out of Date', + SET_SEARCH_KIOSK_MODE = '[Search] Set Vertex to kiosk mode for Opera Displacement', } export class MakeSearch implements Action { @@ -74,6 +76,12 @@ export class SarviewsEventsResponse implements Action { constructor(public payload: {events: SarviewsEvent[]}) {} } +export class TimeseriesSearchResponse implements Action { + public readonly type = SearchActionType.DISPLACEMENT_SEARCH_RESPONSE; + + constructor(public payload: {}) {} +} + export class SearchError implements Action { public readonly type = SearchActionType.SEARCH_ERROR; @@ -116,6 +124,12 @@ export class SetSearchOutOfDate implements Action { constructor(public payload: boolean) {} } +export class setSearchKioskMode implements Action { + public readonly type = SearchActionType.SET_SEARCH_KIOSK_MODE; + + constructor(public payload: boolean) {} +} + export type SearchActions = | MakeSearch | SetSearchAmount @@ -132,4 +146,6 @@ export type SearchActions = | LoadOnDemandScenesList | SetSearchTypeAfterSave | SarviewsEventsResponse - | SetSearchOutOfDate; + | TimeseriesSearchResponse + | SetSearchOutOfDate + | setSearchKioskMode; diff --git a/src/app/store/search/search.effect.ts b/src/app/store/search/search.effect.ts index 847f00214..b415e29ec 100644 --- a/src/app/store/search/search.effect.ts +++ b/src/app/store/search/search.effect.ts @@ -10,12 +10,15 @@ import { map, withLatestFrom, switchMap, catchError, filter, first, tap, debounc import { AppState } from '../app.reducer'; import { SetSearchAmount, EnableSearch, DisableSearch, SetSearchType, SetNextJobsUrl, - Hyp3BatchResponse, SarviewsEventsResponse, SetSearchOutOfDate + Hyp3BatchResponse, SarviewsEventsResponse, SetSearchOutOfDate, + TimeseriesSearchResponse, + setSearchKioskMode } from './search.action'; import * as scenesStore from '@store/scenes'; import * as filtersStore from '@store/filters'; import * as mapStore from '@store/map'; import * as uiStore from '@store/ui'; +import moment2 from 'moment'; import * as services from '@services'; @@ -103,6 +106,11 @@ export class SearchEffects { if (searchType === SearchType.CUSTOM_PRODUCTS) { return this.customProductsQuery$(); } + if (searchType === SearchType.DISPLACEMENT) { + return this.timeseriesQuery$(); + } + + this.logCountries(); return this.asfApiQuery$; @@ -219,6 +227,64 @@ export class SearchEffects { ]) )); + + public timeseriesSearchResponse = createEffect(() => this.actions$.pipe( + ofType(SearchActionType.DISPLACEMENT_SEARCH_RESPONSE), + withLatestFrom(this.store$.select(getSearchType)), + filter(([_, searchType]) => searchType === SearchType.DISPLACEMENT), + switchMap(([_action, _]) => { + return [ + new scenesStore.SetScenes({ + products: [{ + name: "20221107_20221213.unw.nc", + productTypeDisplay: "20221107_20221213.unw.nc", + file: "20221107_20221213.unw.nc", + id: "20221107_20221213.unw.nc", + downloadUrl: "", + bytes: 1234, + browses: [], + thumbnail: "string", + dataset: "sentinel-1", + groupId: "string", + isUnzippedFile: false, + isDummyProduct: false, + metadata: { + date: moment2(), + stopDate: moment2(), + polygon: "POLYGON ((-120.6596489990334 38.10046393341369, -120.7165475579197 38.10851198053945, -120.766930740861 38.11562044217759, -120.8205210213509 38.12315205210022, -120.8714495693995 38.13028813229113, -120.9237420515751 38.13758904376237, -120.9763848233747 38.14491322663075, -121.0284993874585 38.15213949038783, -121.0805374061872 38.15933042899581, -121.1317842372317 38.16638876359664, -121.1831324092139 38.17343685331883, -121.2343267090171 38.1804400907544, -121.2851343767767 38.18736716519965, -121.3356959243903 38.19423758535788, -121.3861081098637 38.20106467487116, -121.4362721727969 38.20783544395677, -121.48323466170885 38.21415300334824, -121.4961042842803 38.15636388218255, -121.5433137463578 38.16270254678292, -121.5911446754841 38.1691031129965, -121.6386899947014 38.17544523556456, -121.6861407154369 38.18175427917799, -121.7332794261246 38.18800202289999, -121.7803915044837 38.19422601057961, -121.827141292521 38.20038272861196, -121.8737037166488 38.20649520761842, -121.9200946535652 38.21256588219698, -121.9662943385527 38.21859236147657, -122.0122835841423 38.22457236130022, -122.0581361973249 38.23051573928061, -122.1041763492786 38.23646390681441, -122.149693424194 38.24232638029159, -122.1961235981019 38.24828575950047, -122.242840340764 38.25426186141181, -122.2851111656349 38.25965821461571, -122.3300033441712 38.2653676014464, -122.3758025278513 38.27117216227268, -122.4195396691845 38.27670031010642, -122.3858453485523 38.44296136955153, -122.3532454174394 38.60872264056508, -122.321281901071 38.77481263179438, -122.2870678391941 38.9402423639722, -122.28657198358258 38.94018057384403, -122.2484647545139 39.10551216594683, -122.2139845790114 39.27116104878576, -122.1797260176706 39.4367089374228, -122.1454462898122 39.60250573468526, -122.1112187045845 39.76830723022915, -122.0657227757032 39.76272908715357, -122.0199986201785 39.75710391072595, -121.974167995761 39.75144665647245, -121.9280106375743 39.74573006489359, -121.8819129486135 39.74000139035989, -121.8355618840318 39.73422190999039, -121.7893509902118 39.72844019721962, -121.7438269303752 39.72272426697831, -121.6969816389773 39.71682457472104, -121.6515073229837 39.71107635608378, -121.6043191954164 39.70509395348859, -121.5584565168173 39.69925815820748, -121.5109102827927 39.69319018010273, -121.4645931051444 39.68725740118437, -121.4191841855194 39.68142061388765, -121.3710837028612 39.67522101887367, -121.3249639873766 39.66925411189222, -121.2737070377029 39.66260665395009, -121.23414991223851 39.657450537553174, -121.2225423730193 39.71501508524592, -121.1765350243167 39.70900995464177, -121.1256787673412 39.70235510426308, -121.0761429466098 39.6958485542612, -121.0248065795119 39.68908396631235, -120.9731471040036 39.68225266837984, -120.9238122923641 39.67570292460091, -120.8690679290765 39.66841567043333, -120.8147668765373 39.66115958039808, -120.7685909543843 39.65495848719279, -120.7156528937689 39.64783419415447, -120.663007754518 39.64072322969391, -120.6113623558398 39.6337213126097, -120.5575229174151 39.62639828522865, -120.4998084040708 39.61852276683964, -120.4452699517613 39.61104894626836, -120.3863396198317 39.60294709422497, -120.3350203072667 39.59585767211257, -120.2794058786818 39.5881523754319, -120.2276117469398 39.58094649107327, -120.22744443645614 39.58092314818873, -120.2134545404021 39.63753782618391, -120.1722737074452 39.6317932200585, -120.1244336159495 39.62510726553644, -120.0702567931258 39.61751657755807, -120.022269227435 39.61076456269333, -119.9734628265665 39.60387622000747, -119.9205724742573 39.59639065119934, -119.8710716027977 39.58935798135493, -119.8176837356334 39.58175135017377, -119.7678667295637 39.57462631850627, -119.7172666919774 39.56736632596481, -119.6677829890141 39.56024234859523, -119.6164294368659 39.55282685903347, -119.5655855530352 39.54546030402012, -119.5122825240406 39.53771380091477, -119.4596714762434 39.53004121358733, -119.4118356441431 39.52303826133494, -119.3539548115401 39.51454620335684, -119.2999598520621 39.50659276685604, -119.242172282983 39.49805375475951, -119.1867112941332 39.48982722325655, -119.2279582300632 39.32389259181299, -119.2695651047809 39.15814430461985, -119.3154157605841 38.99290396440068, -119.3553955782568 38.82692456194625, -119.4076391719693 38.66278010421749, -119.46426202130762 38.48267405863559, -119.4994803127931 38.33275776186966, -119.5473964124392 38.1679932576986, -119.5759619696445 38.00032674732519, -119.6328594358995 38.00892055228446, -119.685940538886 38.01691396436385, -119.735510021753 38.02435806698762, -119.7876843769492 38.0321663403309, -119.8349767585424 38.03922663419335, -119.8827140678868 38.04633197874039, -119.9336830819589 38.05389196505576, -119.9837372437618 38.06129369064131, -120.029196677421 38.0680003062205, -120.0790441003354 38.07532784287181, -120.1269111066452 38.08234457142717, -120.1767641224129 38.08962794955193, -120.2211977375846 38.09610549717873, -120.2696883291999 38.10314938009251, -120.3131576383198 38.10945036625376, -120.3570069870991 38.11578848698885, -120.4046282389668 38.12264764067351, -120.4517936234199 38.12942103705984, -120.48468630063608 38.134130553754865, -120.4964144795629 38.07720256883281, -120.5521610008301 38.08517268978709, -120.6049996926634 38.09270374285773, -120.6596489990334 38.10046393341369))", + productType: "", + beamMode: "", + polarization: "", + flightDirection: null, + path: 1, + frame: 1, + absoluteOrbit: [1], + stackSize: 1, + faradayRotation: null, + offNadirAngle: null, + instrument: null, + pointingAngle: null, + missionName: null, + flightLine: null, + perpendicular: null, + temporal: null, + canInSAR: false, + burst: null, + opera: null, + fileName: null, + job:null, + pgeVersion: null, + subproducts: [], + parentID: "", + ariaVersion: null, + } + }], + searchType: models.SearchType.DISPLACEMENT + }) + ] + }) + )) + public showResultsMenuOnSearchResponse = createEffect(() => this.actions$.pipe( ofType(SearchActionType.SEARCH_RESPONSE), map(_ => new uiStore.OpenResultsMenu()), @@ -229,10 +295,23 @@ export class SearchEffects { map(_ => new uiStore.OpenResultsMenu()), )); + public showTimeseriesResultsMenuOnSearchResponse = createEffect(() => this.actions$.pipe( + ofType(SearchActionType.DISPLACEMENT_SEARCH_RESPONSE), + map(_ => new uiStore.OpenResultsMenu()), + )); + public setMapInteractionModeBasedOnSearchType = createEffect(() => this.actions$.pipe( ofType(SearchActionType.SET_SEARCH_TYPE_AFTER_SAVE), - filter(action => action.payload === models.SearchType.DATASET), - map(_ => new mapStore.SetMapInteractionMode(models.MapInteractionModeType.DRAW)) + filter(action => action.payload === models.SearchType.DATASET || action.payload === models.SearchType.DISPLACEMENT), + switchMap((action) => { + let output : any[] = [ + new mapStore.SetMapInteractionMode(models.MapInteractionModeType.DRAW) + ]; + if (action.payload === models.SearchType.DISPLACEMENT) { + output.push(new mapStore.SetMapDrawMode(models.MapDrawModeType.POINT)) + } + return output; + }) )); public clearResultsWhenSearchTypeChanges = createEffect(() => this.actions$.pipe( @@ -286,6 +365,11 @@ export class SearchEffects { tap(_ => this.notificationService.info('Refresh search to show new results', 'Results Out of Date')) ), { dispatch: false }); + public OnSetKioskMode = createEffect(() => this.actions$.pipe( + ofType(SearchActionType.SET_SEARCH_KIOSK_MODE), + filter(action => action.payload), + map(_ => new SetSearchType(SearchType.DISPLACEMENT)) + )) private asfApiQuery$ = this.searchParams$.getParams.pipe( debounceTime(100), map(params => [params]), @@ -428,6 +512,7 @@ export class SearchEffects { ); } + private nextCustomProduct$(next: string, latestScenes: models.CMRProduct[]): Observable { return this.hyp3Service.getJobsByUrl$(next).pipe( switchMap( @@ -454,6 +539,11 @@ export class SearchEffects { ); } + private timeseriesQuery$() { + return of(new TimeseriesSearchResponse({ + })) + } + private hyp3JobToProducts(jobs, products) { const virtualProducts = jobs .filter(job => products[job.job_parameters.granules[0]]) diff --git a/src/app/store/search/search.reducer.ts b/src/app/store/search/search.reducer.ts index 2125f73de..51c4e72ef 100644 --- a/src/app/store/search/search.reducer.ts +++ b/src/app/store/search/search.reducer.ts @@ -15,6 +15,7 @@ export interface SearchState { totalResults: null | number; searchType: SearchType | null; nextHyp3JobUrl: null | string; + kioskMode: boolean; } export const initState: SearchState = { @@ -27,7 +28,8 @@ export const initState: SearchState = { totalResults: null, searchType: SearchType.DATASET, nextHyp3JobUrl: null, - areResultsOutOfDate: false + areResultsOutOfDate: false, + kioskMode: false, }; export function searchReducer(state = initState, action: SearchActions): SearchState { @@ -89,6 +91,15 @@ export function searchReducer(state = initState, action: SearchActions): SearchS }; } + case SearchActionType.DISPLACEMENT_SEARCH_RESPONSE: { + return { + ...state, + totalResults: 1, + isLoading: false, + isCanceled: false, + } + } + case SearchActionType.SEARCH_ERROR: { return { ...state, @@ -126,6 +137,13 @@ export function searchReducer(state = initState, action: SearchActions): SearchS }; } + case SearchActionType.SET_SEARCH_KIOSK_MODE: { + return { + ... state, + kioskMode: action.payload + }; + } + default: { return state; } @@ -161,7 +179,7 @@ export const getIsCanceled = createSelector( export const getCanSearch = createSelector( getSearchState, - (state: SearchState) => state.searchType === SearchType.CUSTOM_PRODUCTS || state.canSearch + (state: SearchState) => state.searchType === SearchType.CUSTOM_PRODUCTS || state.searchType === SearchType.DISPLACEMENT || state.canSearch ); export const getIsMaxResultsLoading = createSelector( @@ -183,3 +201,8 @@ export const getareResultsOutOfDate = createSelector( getSearchState, (state: SearchState) => state.areResultsOutOfDate ); + +export const getKioskMode = createSelector( + getSearchState, + (state: SearchState) => state.kioskMode +); diff --git a/src/app/store/ui/ui.action.ts b/src/app/store/ui/ui.action.ts index 1780f5c6d..a970b8032 100644 --- a/src/app/store/ui/ui.action.ts +++ b/src/app/store/ui/ui.action.ts @@ -27,6 +27,7 @@ export enum UIActionType { SET_ONLY_SCENES_WITH_BROWSE = '[UI] Set Only Scenes With Browse', SET_HELP_DIALOG_TOPIC = '[UI] Set Help Dialog Topic', SET_CURRENT_LANGUAGE = '[UI] Set Current Language', + SET_ACTIVE_WKT = '[UI] Set Active Wkt', SET_IS_DOWNLOAD_QUEUE_OPEN = '[UI] Is Download Queue Open', SET_IS_ON_DEMAND_QUEUE_OPEN = '[UI] Is On Demand Queue Open', @@ -40,7 +41,6 @@ export enum UIActionType { LOAD_BANNERS = '[Banner] Load Banners', ADD_BANNERS = '[Banner] Set Banners', REMOVE_BANNER = '[Banner] Remove Banner', - } export class ToggleAOIOptions implements Action { @@ -157,6 +157,12 @@ export class SetCurrentLanguage implements Action { constructor(public payload: string | null) {} } +export class SetActiveWkt implements Action { + public readonly type = UIActionType.SET_ACTIVE_WKT; + + constructor(public payload: string | null) {} +} + export class RemoveBanner implements Action { public readonly type = UIActionType.REMOVE_BANNER; @@ -196,6 +202,7 @@ export type UIActions = | SetOnlyScenesWithBrowse | SetHelpDialogTopic | SetCurrentLanguage + | SetActiveWkt | SetIsBrowseDialogOpen | SetIsDownloadQueueOpen | SetIsOnDemandQueueOpen diff --git a/src/app/store/ui/ui.reducer.ts b/src/app/store/ui/ui.reducer.ts index 1a266e656..35926a8c7 100644 --- a/src/app/store/ui/ui.reducer.ts +++ b/src/app/store/ui/ui.reducer.ts @@ -20,6 +20,7 @@ export interface UIState { isOnDemandQueueOpen: boolean; helpDialogTopic: string | null; currentLanguage: string | null; + activeWkt: string | null; banners: Banner[]; } @@ -38,6 +39,7 @@ export const initState: UIState = { isOnDemandQueueOpen: false, helpDialogTopic: null, currentLanguage: 'en', + activeWkt: null, banners: [], }; @@ -218,6 +220,13 @@ export function uiReducer(state = initState, action: UIActions): UIState { }; } + case UIActionType.SET_ACTIVE_WKT: { + return { + ...state, + activeWkt: action.payload + }; + } + case UIActionType.ADD_BANNERS: { const banners = [ ...state.banners, ...action.payload @@ -308,6 +317,11 @@ export const getCurrentLanguage = createSelector( state => state.currentLanguage ); +export const getActiveWkt = createSelector( + getUIState, + state => state.activeWkt +); + export const getIsDownloadQueueOpen = createSelector( getUIState, state => state.isDownloadQueueOpen diff --git a/src/app/store/user/user.effect.ts b/src/app/store/user/user.effect.ts index f459771cd..81c3b4e9b 100644 --- a/src/app/store/user/user.effect.ts +++ b/src/app/store/user/user.effect.ts @@ -14,7 +14,7 @@ import * as filterStore from '@store/filters'; import * as searchStore from '@store/search'; import { UserDataService } from '@services/user-data.service'; import * as models from '@models'; -import { BaselineFiltersType, GeographicFiltersType, SbasFiltersType, SearchType } from '@models'; +import { BaselineFiltersType, GeographicFiltersType, SbasFiltersType, TimeseriesFiltersType, SearchType } from '@models'; @Injectable() export class UserEffects { @@ -66,7 +66,8 @@ export class UserEffects { defaultFilterPresets: { 'Baseline Search' : '', 'Geographic Search' : '', - 'SBAS Search' : '' + 'SBAS Search' : '', + 'Displacement': '' } }; } @@ -236,6 +237,8 @@ export class UserEffects { case SearchType.SBAS: actions = this.setSBASFilters(targetFilter.filters as SbasFiltersType); break; + case SearchType.DISPLACEMENT: + actions = this.setTimeseriesFilters(targetFilter.filters as TimeseriesFiltersType); default: break; } @@ -350,6 +353,15 @@ export class UserEffects { new filterStore.SetPerpendicularEnd(sbasFilter.perpendicular.end), ]; + return actions; + } + private setTimeseriesFilters(timeseriesFilter: TimeseriesFiltersType) { + + + const actions = [ + new filterStore.setFullBurst(timeseriesFilter.fullBurstIDs), + ] + return actions; } } diff --git a/src/app/store/user/user.reducer.ts b/src/app/store/user/user.reducer.ts index a36575d55..bd06ea821 100644 --- a/src/app/store/user/user.reducer.ts +++ b/src/app/store/user/user.reducer.ts @@ -28,7 +28,8 @@ export const initState: UserState = { defaultFilterPresets: { 'Baseline Search' : '', 'Geographic Search' : '', - 'SBAS Search' : '' + 'SBAS Search' : '', + 'Displacement': '' }, hyp3BackendUrl: '', theme: 'light', diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 1adf4d98f..cc3f78b7d 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -735,6 +735,7 @@ "SENTINEL_1_INTERFEROGRAM_BETA_DESC": "Level 2 standardized Sentinel-1 Interferogram products generated by JPL’s Advanced Rapid Imaging and Analysis (ARIA) project.", "SENTINEL_DESC": "Sentinel-1 includes twin satellites that each carry C-band synthetic aperture radar (SAR), together providing all-weather, day-and-night imagery of Earth’s surface.", "SEP_OCT_NOV": "Sep, Oct, Nov", + "SERIES": "Series", "SET": "Set", "SET_AS_BASELINE": "Set as Baseline", "SET_AS_BOTH": "Set as both", @@ -940,5 +941,7 @@ "ZOOM_TO_EVENT": "Zoom to event", "ZOOM_TO_FIT": "Zoom To Fit", "ZOOM_TO_RESULTS": "Zoom to results", - "ZOOM_TO_SCENE": "Zoom to scene" -} \ No newline at end of file + "ZOOM_TO_SCENE": "Zoom to scene", + "ADD_POINTS":"Add Points", + "STOP_ADDING_POINTS":"Stop Adding Points" +} diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index ee4913c3e..287e032eb 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -940,5 +940,7 @@ "ZOOM_TO_EVENT": "Acercar al evento", "ZOOM_TO_FIT": "Acercar para ajustar", "ZOOM_TO_RESULTS": "Acercar a los resultados", - "ZOOM_TO_SCENE": "Acercar a la escena" -} \ No newline at end of file + "ZOOM_TO_SCENE": "Acercar a la escena", + "ADD_POINTS":"", + "STOP_ADDING_POINTS":"" +} diff --git a/src/assets/priority_rollout_ASCENDING.geojson b/src/assets/priority_rollout_ASCENDING.geojson new file mode 100644 index 000000000..5a376f6c8 --- /dev/null +++ b/src/assets/priority_rollout_ASCENDING.geojson @@ -0,0 +1,3609 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + "priority": 3.0, + "orbit_pass": "ASCENDING" + }, + "geometry": { + "type": "MultiPolygon", + "coordinates": [ + [ + [ + [ + -177.59969799999914, + 53.24108799999508 + ], + [ + -173.8934559999978, + 53.75683799999528 + ], + [ + -173.56285562806968, + 52.43682863506046 + ], + [ + -173.56261499999775, + 52.43686299999467 + ], + [ + -173.55392433758152, + 52.40116809718338 + ], + [ + -173.51159899999772, + 52.232172999994596 + ], + [ + -173.51273999133656, + 52.23201283994838 + ], + [ + -173.191246, + 50.91155 + ], + [ + -176.67323, + 50.410185 + ], + [ + -176.8312925474061, + 50.90252428704802 + ], + [ + -178.795465, + 50.620884 + ], + [ + -178.91653395943308, + 50.99570380432453 + ], + [ + -179.36731094731812, + 50.927460501949625 + ], + [ + -179.171315, + 50.114008 + ], + [ + -180.0, + 50.033478277100976 + ], + [ + -180.0, + 50.8316774617948 + ], + [ + -180.0, + 51.387489955875836 + ], + [ + -180.0, + 51.593111951559194 + ], + [ + -180.0, + 52.45551646355714 + ], + [ + -180.0, + 52.94660630225011 + ], + [ + -179.864033, + 52.95987599999496 + ], + [ + -179.7481243763284, + 52.48892144175108 + ], + [ + -177.75694799999923, + 52.75300099999486 + ], + [ + -177.6617251488403, + 52.36448034466177 + ], + [ + -177.32295897130643, + 52.4126555987572 + ], + [ + -177.59969799999914, + 53.24108799999508 + ] + ] + ], + [ + [ + [ + -170.78646, + 51.319141 + ], + [ + -170.9097223609897, + 51.692940001147825 + ], + [ + -172.87525199999754, + 51.41539599999419 + ], + [ + -173.37538199999764, + 52.92757799999489 + ], + [ + -171.41965364582177, + 53.20138381869414 + ], + [ + -171.745167, + 54.147625 + ], + [ + -167.952688, + 54.66578 + ], + [ + -167.8273215826271, + 54.175525221288396 + ], + [ + -165.840384, + 54.448209 + ], + [ + -165.452645, + 52.923885 + ], + [ + -167.4417860536169, + 52.64845337219814 + ], + [ + -167.236538, + 51.821363 + ], + [ + -170.78646, + 51.319141 + ] + ] + ], + [ + [ + [ + -161.591188, + 53.930589 + ], + [ + -165.316141, + 53.424934 + ], + [ + -165.83202448757976, + 54.885769559953765 + ], + [ + -166.2729191899242, + 56.07700214028323 + ], + [ + -166.132095, + 55.562606 + ], + [ + -170.007753, + 55.053272 + ], + [ + -170.18495804938735, + 55.52646474324886 + ], + [ + -172.147136, + 55.269667 + ], + [ + -172.6955515715818, + 56.721794762560044 + ], + [ + -173.239939, + 58.090589 + ], + [ + -169.044955, + 58.619783 + ], + [ + -168.91146993472657, + 58.15089890962283 + ], + [ + -166.922057, + 58.402932 + ], + [ + -166.5495349616571, + 57.085240295132586 + ], + [ + -166.548961, + 57.085315 + ], + [ + -166.5307421553605, + 57.01876604013732 + ], + [ + -166.491729, + 56.880768 + ], + [ + -166.4929212007811, + 56.88061539238316 + ], + [ + -166.32087319896544, + 56.25216634449552 + ], + [ + -162.4221458837773, + 56.76281813529832 + ], + [ + -162.58832699463431, + 57.195042011964986 + ], + [ + -163.10928694875392, + 58.48031816829515 + ], + [ + -163.40370708012986, + 59.158648367612734 + ], + [ + -167.306696, + 58.682207 + ], + [ + -167.9319589511157, + 60.118815854492986 + ], + [ + -168.5357407434407, + 61.42278324534233 + ], + [ + -168.85037117394103, + 62.058108123379846 + ], + [ + -170.06832004520822, + 61.9181639915489 + ], + [ + -169.8489419196517, + 61.25224710893167 + ], + [ + -169.847419, + 61.252429 + ], + [ + -169.82042725951348, + 61.16569156224724 + ], + [ + -169.781674, + 61.048057 + ], + [ + -169.78374491897682, + 61.04781356803229 + ], + [ + -169.374299, + 59.732067 + ], + [ + -173.70788, + 59.20863 + ], + [ + -173.85550678953325, + 59.53949337314409 + ], + [ + -175.806858, + 59.30427 + ], + [ + -176.480273, + 60.806759 + ], + [ + -174.5359608300485, + 61.03850682104871 + ], + [ + -175.00212, + 62.018744 + ], + [ + -173.0597492864195, + 62.244478751264445 + ], + [ + -173.4573979156964, + 63.03412986292632 + ], + [ + -174.20417, + 64.412712 + ], + [ + -170.36268498660445, + 64.86403953833396 + ], + [ + -170.6269870606783, + 65.32364394952728 + ], + [ + -171.489325, + 66.702329 + ], + [ + -167.67165349383805, + 67.13009106553322 + ], + [ + -167.98951798473644, + 67.60470212142023 + ], + [ + -168.9398270783986, + 68.89334590574887 + ], + [ + -170.06574, + 70.268366 + ], + [ + -166.30453847655073, + 70.63610268848949 + ], + [ + -166.749061, + 71.139064 + ], + [ + -163.00181567703257, + 71.49910749453605 + ], + [ + -163.593453, + 72.110589 + ], + [ + -156.434653, + 72.785503 + ], + [ + -156.2629894456815, + 72.50222058031348 + ], + [ + -154.309564, + 72.686691 + ], + [ + -154.07126729648238, + 72.28994200655794 + ], + [ + -152.11793, + 72.475145 + ], + [ + -151.95238365531762, + 72.19447909218779 + ], + [ + -150.000924, + 72.379846 + ], + [ + -149.76611842125453, + 71.97855262999776 + ], + [ + -147.806392, + 72.165416 + ], + [ + -147.4133539118953, + 71.48124812716493 + ], + [ + -143.50343, + 71.856282 + ], + [ + -143.27982199603218, + 71.45701562740747 + ], + [ + -141.32888, + 71.64499 + ], + [ + -140.94855515653376, + 70.95451195936752 + ], + [ + -137.031642, + 71.334144 + ], + [ + -136.32918186903572, + 70.0270334152641 + ], + [ + -136.324693, + 70.02748 + ], + [ + -136.2778500391639, + 69.93151713583164 + ], + [ + -136.220072, + 69.824006 + ], + [ + -136.22512772055174, + 69.82350977230655 + ], + [ + -135.68582469677582, + 68.71868928503505 + ], + [ + -135.682226, + 68.719057 + ], + [ + -135.63777380097852, + 68.62025183564546 + ], + [ + -135.586584, + 68.515384 + ], + [ + -135.59042011405316, + 68.51499745178042 + ], + [ + -135.0928344862131, + 67.40899975489641 + ], + [ + -135.089431, + 67.409357 + ], + [ + -135.04887130352245, + 67.31128154101917 + ], + [ + -135.00128, + 67.205499 + ], + [ + -135.0049665519511, + 67.20511756456571 + ], + [ + -134.54698036757034, + 66.09768311261148 + ], + [ + -134.540398, + 66.098393 + ], + [ + -134.03511311434775, + 64.7858174232575 + ], + [ + -134.033123, + 64.785964 + ], + [ + -134.00285441760332, + 64.70201919638274 + ], + [ + -133.956586, + 64.581828 + ], + [ + -133.95940521404526, + 64.58152016500394 + ], + [ + -133.55943876284974, + 63.47228073122058 + ], + [ + -133.557857, + 63.472461 + ], + [ + -133.53077554452503, + 63.392788133854346 + ], + [ + -133.485862, + 63.268228 + ], + [ + -133.48834194259015, + 63.267949692650156 + ], + [ + -133.41103395435664, + 63.04051180607822 + ], + [ + -131.431558, + 63.267107 + ], + [ + -130.9859168642588, + 61.952536237317545 + ], + [ + -130.984236, + 61.952734 + ], + [ + -130.95580466988943, + 61.863710033577824 + ], + [ + -130.916709, + 61.748384 + ], + [ + -130.91889256080114, + 61.74813111597993 + ], + [ + -130.8758627746472, + 61.61339657409168 + ], + [ + -128.888688, + 61.847639 + ], + [ + -128.4703499956099, + 60.531958493181385 + ], + [ + -128.469339, + 60.532081 + ], + [ + -128.4481445563222, + 60.46212198942238 + ], + [ + -128.405389, + 60.327655 + ], + [ + -128.407336725825, + 60.32742274990435 + ], + [ + -128.0705044538924, + 59.21560057456101 + ], + [ + -128.069682, + 59.215703 + ], + [ + -128.05071791817667, + 59.150288812550365 + ], + [ + -128.008586, + 59.011219 + ], + [ + -128.0103382582033, + 59.011004312975736 + ], + [ + -127.9368693744369, + 58.75758274586875 + ], + [ + -125.952901, + 59.005749 + ], + [ + -125.57344128481517, + 57.6884086424156 + ], + [ + -125.572785, + 57.688493 + ], + [ + -125.55319250182806, + 57.61811253994822 + ], + [ + -125.514547, + 57.48395 + ], + [ + -125.51580025371659, + 57.483791556408384 + ], + [ + -125.20591195887292, + 56.37060626659122 + ], + [ + -125.205058, + 56.370719 + ], + [ + -125.18473748826095, + 56.29454302187654 + ], + [ + -125.148986, + 56.166116 + ], + [ + -125.15042866215622, + 56.16592872217977 + ], + [ + -125.1081271873529, + 56.00735219317354 + ], + [ + -123.118136, + 56.270549 + ], + [ + -122.76734738538586, + 54.95176134683163 + ], + [ + -122.766945, + 54.951816 + ], + [ + -122.75455909692853, + 54.90368385451839 + ], + [ + -122.712928, + 54.747172 + ], + [ + -122.71423867408197, + 54.74699697854886 + ], + [ + -122.6420863537718, + 54.46660999683553 + ], + [ + -120.653894, + 54.73781 + ], + [ + -120.3160758965007, + 53.41826430621082 + ], + [ + -120.315771, + 53.418307 + ], + [ + -120.30544744145362, + 53.376748674148104 + ], + [ + -120.263686, + 53.213625 + ], + [ + -120.2648846883672, + 53.213460007488905 + ], + [ + -119.98782435057208, + 52.098131049261674 + ], + [ + -119.987602, + 52.098163 + ], + [ + -119.97746147145914, + 52.056414435266134 + ], + [ + -119.936981, + 51.893457 + ], + [ + -119.93785006982999, + 51.893334260652935 + ], + [ + -119.89462996301268, + 51.71539704367288 + ], + [ + -117.906416, + 52.001634 + ], + [ + -117.78407166669719, + 51.496973260999766 + ], + [ + -117.38240672788147, + 51.55502346381884 + ], + [ + -117.65124, + 52.381451 + ], + [ + -114.016477, + 52.895738 + ], + [ + -113.9217222286424, + 52.51000661242071 + ], + [ + -111.930634, + 52.792243 + ], + [ + -111.80915519928953, + 52.29650070698882 + ], + [ + -109.822224, + 52.579352 + ], + [ + -109.7289829095975, + 52.19721533214553 + ], + [ + -107.739798, + 52.480919 + ], + [ + -107.61800641435813, + 51.980732194292486 + ], + [ + -105.629073, + 52.265579 + ], + [ + -105.50928839033944, + 51.77399079015719 + ], + [ + -103.523499, + 52.059573 + ], + [ + -103.42826217909771, + 51.66719608368828 + ], + [ + -101.437853, + 51.95398 + ], + [ + -101.31738224832608, + 51.4564801003097 + ], + [ + -100.91441139653962, + 51.51477878820974 + ], + [ + -101.21888, + 52.448743 + ], + [ + -97.576969, + 52.963351 + ], + [ + -97.45495278106395, + 52.46736569217878 + ], + [ + -95.467047, + 52.749452 + ], + [ + -95.3741779801999, + 52.37026928142197 + ], + [ + -93.385902, + 52.652953 + ], + [ + -93.26344239731972, + 52.151974671665464 + ], + [ + -91.27345, + 52.436065 + ], + [ + -91.1534008444199, + 51.942642195577086 + ], + [ + -89.167253, + 52.227388 + ], + [ + -89.07234522538245, + 51.83775476405517 + ], + [ + -87.082021, + 52.123625 + ], + [ + -86.96066089407266, + 51.62422834582646 + ], + [ + -84.974632, + 51.9107 + ], + [ + -84.65498870041823, + 50.59003716690388 + ], + [ + -84.654591, + 50.590096 + ], + [ + -84.64103169690017, + 50.532371338050915 + ], + [ + -84.605448, + 50.385351 + ], + [ + -84.6064625354525, + 50.38520351211322 + ], + [ + -84.56213650107526, + 50.19649872904789 + ], + [ + -82.573197, + 50.491274 + ], + [ + -82.45327028618803, + 49.97979507641627 + ], + [ + -80.468136, + 50.275247 + ], + [ + -80.15653017749831, + 48.954006448931985 + ], + [ + -80.155989, + 48.954089 + ], + [ + -80.1387268828818, + 48.8785186592588 + ], + [ + -80.108256, + 48.749319 + ], + [ + -80.10918278693897, + 48.74918009771383 + ], + [ + -79.85399281749704, + 47.6320058361558 + ], + [ + -79.853947, + 47.632013 + ], + [ + -79.85163895243052, + 47.62170105233829 + ], + [ + -79.807217, + 47.42723 + ], + [ + -79.80808217605316, + 47.427097091719766 + ], + [ + -79.73797208329351, + 47.113857617518306 + ], + [ + -77.755363, + 47.425106 + ], + [ + -77.66090729523913, + 47.00594314810918 + ], + [ + -76.95008311978437, + 47.11773489178179 + ], + [ + -77.181676, + 47.919741 + ], + [ + -73.869341, + 48.430204 + ], + [ + -73.77681819257175, + 48.0219900941301 + ], + [ + -73.12658643866084, + 48.12237456719756 + ], + [ + -73.35655276314564, + 48.89970961533936 + ], + [ + -73.768737, + 50.245748 + ], + [ + -70.297636, + 50.757689 + ], + [ + -70.20548679142163, + 50.36669719417428 + ], + [ + -68.217146, + 50.660508 + ], + [ + -68.09652391263371, + 50.14782247092378 + ], + [ + -66.106747, + 50.443033 + ], + [ + -65.98843566336681, + 49.93809395607778 + ], + [ + -64.005572, + 50.233539 + ], + [ + -63.69688207503638, + 48.91185304167277 + ], + [ + -63.693523, + 48.912366 + ], + [ + -63.39160256321619, + 47.59026786818482 + ], + [ + -63.391557, + 47.590275 + ], + [ + -63.38925659855242, + 47.5799949779747 + ], + [ + -63.344839, + 47.385492 + ], + [ + -63.345702195107535, + 47.38535928637234 + ], + [ + -63.09558187435381, + 46.26762289778179 + ], + [ + -63.095575, + 46.267624 + ], + [ + -63.095073965029655, + 46.265353155235466 + ], + [ + -63.049755, + 46.062832 + ], + [ + -63.050368742941394, + 46.06273532307721 + ], + [ + -62.80365814101013, + 44.94456690787323 + ], + [ + -62.803487, + 44.944595 + ], + [ + -62.795242493306766, + 44.90642460113115 + ], + [ + -62.758475, + 44.739783 + ], + [ + -62.759223157626465, + 44.73966236039729 + ], + [ + -62.473335, + 43.416058 + ], + [ + -64.45969703417836, + 43.08827361728038 + ], + [ + -64.291995, + 42.301485 + ], + [ + -67.269433, + 41.800762 + ], + [ + -67.66728685869809, + 43.319280304572736 + ], + [ + -67.76058240018263, + 43.66641569731819 + ], + [ + -68.6671554759248, + 43.51792963895246 + ], + [ + -68.474401, + 42.616985 + ], + [ + -68.4750695298347, + 42.61687316859809 + ], + [ + -68.195753, + 41.292449 + ], + [ + -70.17961314598159, + 40.953082856383695 + ], + [ + -70.337985, + 41.712648 + ], + [ + -70.34065266962763, + 41.71218523222147 + ], + [ + -70.620622, + 43.036756 + ], + [ + -73.631919, + 42.52585 + ], + [ + -73.40384432652398, + 41.64312509272605 + ], + [ + -73.92069592077938, + 41.55359026346168 + ], + [ + -74.15912279139175, + 41.51228728715361 + ], + [ + -74.4015880838417, + 41.47028473012693 + ], + [ + -74.517602, + 42.025051 + ], + [ + -77.479296, + 41.513901 + ], + [ + -77.14288562292016, + 40.188121124068054 + ], + [ + -77.142943, + 40.188111 + ], + [ + -76.92816830230956, + 39.32299902501019 + ], + [ + -78.899082, + 38.968221 + ], + [ + -78.71397302265459, + 38.208950977387595 + ], + [ + -80.681501, + 37.848434 + ], + [ + -80.50300796115863, + 37.10462212391763 + ], + [ + -81.68699049296205, + 36.88386314908158 + ], + [ + -81.78136, + 37.352671 + ], + [ + -81.78362851202087, + 37.35224876681449 + ], + [ + -82.053172, + 38.678402 + ], + [ + -84.03298778127284, + 38.3174320239693 + ], + [ + -84.149993, + 38.892447 + ], + [ + -86.13567815799718, + 38.531772036694306 + ], + [ + -86.230354, + 38.996587 + ], + [ + -88.21248318360584, + 38.63702794889196 + ], + [ + -88.328563, + 39.206084 + ], + [ + -90.31352422165367, + 38.84727485934816 + ], + [ + -90.431376, + 39.423914 + ], + [ + -92.41564124410377, + 39.06645571476947 + ], + [ + -92.508564, + 39.52078 + ], + [ + -94.49233364442028, + 39.16398449729368 + ], + [ + -94.609442, + 39.735572 + ], + [ + -96.59525703752, + 39.37966721566193 + ], + [ + -96.688892, + 39.836248 + ], + [ + -99.555175, + 39.323334 + ], + [ + -99.36958012581951, + 38.56603701670952 + ], + [ + -100.4987279533575, + 38.36034900012213 + ], + [ + -100.593825, + 38.827905 + ], + [ + -102.57609858771534, + 38.46746046134116 + ], + [ + -102.69163, + 39.034669 + ], + [ + -105.523869, + 38.521328 + ], + [ + -105.20254039942354, + 37.193952917007465 + ], + [ + -105.202648, + 37.193933 + ], + [ + -104.88694064392895, + 35.865938606625754 + ], + [ + -104.887055, + 35.865917 + ], + [ + -104.7155829995403, + 35.13223177886369 + ], + [ + -105.97125199816541, + 34.890957744533175 + ], + [ + -106.066875, + 35.370579 + ], + [ + -108.765118, + 34.852863 + ], + [ + -108.5962506941917, + 34.12175607318161 + ], + [ + -109.88322640327273, + 33.870747737049925 + ], + [ + -109.93978357052464, + 34.15651746102571 + ], + [ + -109.939373, + 34.156596 + ], + [ + -110.245364, + 35.68843 + ], + [ + -112.22478290867949, + 35.310420937399066 + ], + [ + -112.30175267403285, + 35.69340158904123 + ], + [ + -112.30159, + 35.693432 + ], + [ + -112.609671, + 37.224859 + ], + [ + -114.59122283600226, + 36.85528308768807 + ], + [ + -114.709647, + 37.443295 + ], + [ + -116.69295476752697, + 37.07469154944425 + ], + [ + -116.786777, + 37.54024 + ], + [ + -118.76967314876552, + 37.172196778757865 + ], + [ + -118.887394, + 37.755454 + ], + [ + -120.87220543479437, + 37.38830147118928 + ], + [ + -120.92532873285523, + 37.651280164478464 + ], + [ + -120.924817, + 37.651373 + ], + [ + -121.19526156138267, + 38.977223203014624 + ], + [ + -121.194711, + 38.977321 + ], + [ + -121.511044, + 40.507543 + ], + [ + -124.402867, + 39.995664 + ], + [ + -124.21464640246067, + 39.23511580733894 + ], + [ + -126.18239453524203, + 38.88049530323391 + ], + [ + -126.511756, + 40.207068 + ], + [ + -126.51169908602499, + 40.20707803788915 + ], + [ + -126.848161, + 41.532941 + ], + [ + -126.84811988210993, + 41.53294809314021 + ], + [ + -127.192205, + 42.858096 + ], + [ + -127.1921948375921, + 42.85809771388161 + ], + [ + -127.544736, + 44.182485 + ], + [ + -125.5830072891556, + 44.50577930569881 + ], + [ + -125.79479754064899, + 45.28338590661424 + ], + [ + -126.16412497827218, + 46.601356920694045 + ], + [ + -126.54461851879034, + 47.91877074495507 + ], + [ + -126.64400232362996, + 48.25192880320892 + ], + [ + -128.610216, + 47.955588 + ], + [ + -129.0561638788164, + 49.442636104848965 + ], + [ + -129.46454588807705, + 50.7569803832231 + ], + [ + -129.53767101378557, + 50.98362312156169 + ], + [ + -131.506139, + 50.701837 + ], + [ + -131.66349183358537, + 51.18790815206952 + ], + [ + -133.627213, + 50.907952 + ], + [ + -134.10721151030037, + 52.38174096623686 + ], + [ + -134.5522773983383, + 53.6937036182776 + ], + [ + -135.0169982566917, + 55.004490324872876 + ], + [ + -135.13900275442185, + 55.33273724698096 + ], + [ + -137.099788, + 55.075206 + ], + [ + -137.23292882468502, + 55.43051454551152 + ], + [ + -139.193895, + 55.173452 + ], + [ + -139.74025455031463, + 56.62604815852662 + ], + [ + -140.25860399872215, + 57.93505148473539 + ], + [ + -140.3924509440154, + 58.25498398695793 + ], + [ + -142.344937, + 58.013365 + ], + [ + -142.6790955013179, + 58.804782453514 + ], + [ + -146.589034, + 58.324144 + ], + [ + -146.92692849941326, + 59.113322869219736 + ], + [ + -150.5463284073536, + 58.671087399804605 + ], + [ + -150.4541588674216, + 58.358087948864025 + ], + [ + -150.453433, + 58.35818 + ], + [ + -150.43588218110503, + 58.29602196929731 + ], + [ + -150.393965, + 58.153675 + ], + [ + -150.39563070154142, + 58.153467213447 + ], + [ + -150.08136608018052, + 57.04046672610604 + ], + [ + -150.080796, + 57.040541 + ], + [ + -150.06263734184967, + 56.97413697253959 + ], + [ + -150.023631, + 56.835992 + ], + [ + -150.02481898175293, + 56.83583978110721 + ], + [ + -149.664394, + 55.517809 + ], + [ + -153.535626, + 55.008556 + ], + [ + -153.91888820524179, + 56.033631038969446 + ], + [ + -153.8942761132644, + 55.941470439292 + ], + [ + -153.864486, + 55.8335 + ], + [ + -153.86540965350346, + 55.83337925205855 + ], + [ + -153.513303, + 54.514907 + ], + [ + -157.2951, + 54.007512 + ], + [ + -157.82084940041074, + 55.465882593503395 + ], + [ + -158.0172200764535, + 55.98485508406274 + ], + [ + -157.79177975923199, + 55.14190659433548 + ], + [ + -157.791363, + 55.141963 + ], + [ + -157.77870264708196, + 55.09300969748616 + ], + [ + -157.737067, + 54.937329 + ], + [ + -157.73839465670088, + 54.937152332401375 + ], + [ + -157.39723, + 53.617984 + ], + [ + -161.094461, + 53.112974 + ], + [ + -161.60537412218798, + 54.5752171213821 + ], + [ + -162.08476348040003, + 55.885313287997626 + ], + [ + -162.1571756585935, + 56.07365161487038 + ], + [ + -161.9890900386653, + 55.45429789746358 + ], + [ + -161.988316, + 55.454402 + ], + [ + -161.96890934603573, + 55.37993706275744 + ], + [ + -161.933587, + 55.249783 + ], + [ + -161.9349425731736, + 55.24960374439321 + ], + [ + -161.591188, + 53.930589 + ] + ], + [ + [ + -153.92200184793245, + 56.04195880350978 + ], + [ + -153.92090413886706, + 56.03798029799174 + ], + [ + -153.92053279535082, + 56.038029668020364 + ], + [ + -153.92200184793245, + 56.04195880350978 + ] + ] + ], + [ + [ + [ + 177.401359, + 49.613083 + ], + [ + 177.24366896961695, + 50.115591564432286 + ], + [ + 175.281935, + 49.830055 + ], + [ + 174.81505012803385, + 51.289846770947385 + ], + [ + 174.364882999998, + 52.66118799999478 + ], + [ + 178.0233239999993, + 53.17618699999505 + ], + [ + 178.14684386129773, + 52.68150697674011 + ], + [ + 180.0, + 52.94660630225011 + ], + [ + 180.0, + 52.45551646355714 + ], + [ + 180.0, + 51.593111951559194 + ], + [ + 180.0, + 51.387489955875836 + ], + [ + 180.0, + 50.8316774617948 + ], + [ + 180.0, + 50.033478277100976 + ], + [ + 177.401359, + 49.613083 + ] + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "priority": 2.0, + "orbit_pass": "ASCENDING" + }, + "geometry": { + "type": "MultiPolygon", + "coordinates": [ + [ + [ + [ + -170.154615, + -13.123869 + ], + [ + -169.780732, + -14.651948 + ], + [ + -172.028365, + -15.289224 + ], + [ + -172.388991, + -13.76518 + ], + [ + -170.154615, + -13.123869 + ] + ] + ], + [ + [ + [ + -102.73607526128717, + 16.476534863014354 + ], + [ + -104.69741, + 16.011517 + ], + [ + -105.013426, + 17.540454 + ], + [ + -105.01339894202805, + 17.540460443084662 + ], + [ + -105.11247663618154, + 18.01836581018402 + ], + [ + -107.073441, + 17.560568 + ], + [ + -107.39056, + 19.089256 + ], + [ + -107.39052227877812, + 19.089264840479053 + ], + [ + -107.668316, + 20.422815 + ], + [ + -107.66825583743932, + 20.422828901345316 + ], + [ + -107.94731, + 21.756106 + ], + [ + -107.94723693251171, + 21.756122637213565 + ], + [ + -108.02065811621237, + 22.104894660825682 + ], + [ + -107.610821, + 22.196478 + ], + [ + -107.86758542760789, + 23.526607133898963 + ], + [ + -107.867427, + 23.526642 + ], + [ + -108.02140917994312, + 24.323839776269324 + ], + [ + -106.045387, + 24.752392 + ], + [ + -106.17930615962695, + 25.445286372189866 + ], + [ + -104.68415388038157, + 25.76519955828479 + ], + [ + -104.60121661467798, + 25.382059336153706 + ], + [ + -104.288167, + 23.912996 + ], + [ + -102.3243591861924, + 24.340515318095232 + ], + [ + -102.187006, + 23.695412 + ], + [ + -99.772275, + 24.222354 + ], + [ + -99.9076021190415, + 24.919658366697846 + ], + [ + -98.40244301965357, + 25.243794837712223 + ], + [ + -98.288873, + 24.713663 + ], + [ + -95.85544191161544, + 25.238315132722114 + ], + [ + -95.598524, + 23.908585 + ], + [ + -95.59868652802788, + 23.908549396986892 + ], + [ + -95.341921, + 22.578541 + ], + [ + -95.34204215833479, + 22.57851404698213 + ], + [ + -95.12464476503719, + 21.452919247585594 + ], + [ + -95.12388, + 21.453095 + ], + [ + -94.827274, + 19.917913 + ], + [ + -94.8273533436985, + 19.917894825531725 + ], + [ + -94.73705975553179, + 19.451204390150362 + ], + [ + -93.14594868009837, + 19.823061721252188 + ], + [ + -93.307242, + 20.596649 + ], + [ + -91.34531020366077, + 21.049131048914752 + ], + [ + -91.484431, + 21.713799 + ], + [ + -91.48435743024802, + 21.713815760551654 + ], + [ + -91.764963, + 23.046745 + ], + [ + -89.365675, + 23.585119 + ], + [ + -89.06939, + 22.050271 + ], + [ + -89.06950432387305, + 22.05024541236409 + ], + [ + -89.00346248788006, + 21.708368873296195 + ], + [ + -87.44336928680352, + 22.064184227074172 + ], + [ + -87.58337, + 22.73035 + ], + [ + -85.190002, + 23.26934 + ], + [ + -84.893697, + 21.734445 + ], + [ + -84.89380840790687, + 21.73441997757226 + ], + [ + -84.636808, + 20.404035 + ], + [ + -86.60737626622685, + 19.954938795408196 + ], + [ + -86.479201, + 19.292152 + ], + [ + -86.47925384943417, + 19.292139811504434 + ], + [ + -86.221421, + 17.961401 + ], + [ + -86.22150089738503, + 17.961382319608205 + ], + [ + -86.12783026673405, + 17.478365184559525 + ], + [ + -84.51204608264612, + 17.86365054930892 + ], + [ + -84.647908, + 18.519612 + ], + [ + -82.322929, + 19.067801 + ], + [ + -82.025723, + 17.532291 + ], + [ + -83.99144904461883, + 17.070664867803472 + ], + [ + -83.86557000256117, + 16.42174729636219 + ], + [ + -83.76985981848978, + 15.930652761017758 + ], + [ + -81.806888, + 16.405907 + ], + [ + -81.52011110201504, + 14.935349204640726 + ], + [ + -81.26465177808757, + 13.63078154844454 + ], + [ + -80.984807, + 12.207939 + ], + [ + -82.94522710012383, + 11.724333234076868 + ], + [ + -82.83461958993139, + 11.163014912813926 + ], + [ + -82.71976339869039, + 10.584336092381502 + ], + [ + -80.762711, + 11.080993 + ], + [ + -80.64304184543892, + 10.478974309023984 + ], + [ + -78.683952, + 10.976511 + ], + [ + -78.54230357307492, + 10.264148632568016 + ], + [ + -76.585459, + 10.762009 + ], + [ + -76.3051844902376, + 9.353914278992631 + ], + [ + -76.0423067347134, + 8.041589435998024 + ], + [ + -75.743893, + 6.564157 + ], + [ + -77.952709, + 5.994866 + ], + [ + -78.10091367133697, + 6.71233975144207 + ], + [ + -80.053023, + 6.209988 + ], + [ + -80.17841519487128, + 6.817263838568662 + ], + [ + -82.132413, + 6.314715 + ], + [ + -82.27947026065158, + 7.026939413948226 + ], + [ + -84.232664, + 6.525449 + ], + [ + -84.50792031987389, + 7.860264700939148 + ], + [ + -84.508045, + 7.860233 + ], + [ + -84.54264786297324, + 8.028670897044996 + ], + [ + -84.548095, + 8.055086 + ], + [ + -84.54807546016437, + 8.055091053596396 + ], + [ + -84.65507742863295, + 8.575949300570242 + ], + [ + -86.610075, + 8.079658 + ], + [ + -86.88471932439387, + 9.414453762676048 + ], + [ + -86.884794, + 9.414435 + ], + [ + -87.15906023661968, + 10.749187403838434 + ], + [ + -87.159086, + 10.749181 + ], + [ + -87.27896282333793, + 11.332813409324983 + ], + [ + -89.236356, + 10.84668 + ], + [ + -89.52551938908522, + 12.25447504771746 + ], + [ + -89.65363133930283, + 12.877519453328391 + ], + [ + -91.611458, + 12.397682 + ], + [ + -91.73094589518958, + 12.978799122525576 + ], + [ + -93.690246, + 12.498987 + ], + [ + -93.99851216252283, + 13.997935895292583 + ], + [ + -94.10577429378613, + 14.518831420373822 + ], + [ + -96.06416, + 14.04588 + ], + [ + -96.18355142499352, + 14.625540123351946 + ], + [ + -98.144284, + 14.152428 + ], + [ + -98.28432729814155, + 14.832155510102654 + ], + [ + -100.242931, + 14.360505 + ], + [ + -100.558068, + 15.889662 + ], + [ + -100.55805970691513, + 15.889664006855886 + ], + [ + -100.65882283653455, + 16.37758485348093 + ], + [ + -102.619485, + 15.912301 + ], + [ + -102.73607526128717, + 16.476534863014354 + ] + ], + [ + [ + -101.387018, + 19.891322 + ], + [ + -101.069234, + 18.362793 + ], + [ + -99.10785979608762, + 18.816944042759793 + ], + [ + -98.970287, + 18.154803 + ], + [ + -96.648934, + 18.693514 + ], + [ + -96.90639146446225, + 20.024182814503607 + ], + [ + -96.906312, + 20.024201 + ], + [ + -97.202936, + 21.559369 + ], + [ + -99.567438, + 21.016547 + ], + [ + -99.427050492076, + 20.346791368234403 + ], + [ + -101.387018, + 19.891322 + ] + ] + ], + [ + [ + [ + -111.252669, + 17.875932 + ], + [ + -111.570128, + 19.404563 + ], + [ + -111.57009345039249, + 19.404571070697347 + ], + [ + -111.848237, + 20.738061 + ], + [ + -109.489991, + 21.281117 + ], + [ + -109.20009216275339, + 19.781299070391384 + ], + [ + -108.93504, + 18.415243 + ], + [ + -111.252669, + 17.875932 + ] + ] + ], + [ + [ + [ + -88.328563, + 39.206084 + ], + [ + -88.21248318360584, + 38.63702794889196 + ], + [ + -86.230354, + 38.996587 + ], + [ + -86.13567815799718, + 38.531772036694306 + ], + [ + -84.149993, + 38.892447 + ], + [ + -84.03298778127284, + 38.3174320239693 + ], + [ + -82.053172, + 38.678402 + ], + [ + -81.78362851202087, + 37.35224876681449 + ], + [ + -81.78136, + 37.352671 + ], + [ + -81.68699049296205, + 36.88386314908158 + ], + [ + -80.50300796115863, + 37.10462212391763 + ], + [ + -80.681501, + 37.848434 + ], + [ + -78.71397302265459, + 38.208950977387595 + ], + [ + -78.899082, + 38.968221 + ], + [ + -76.92816830230956, + 39.32299902501019 + ], + [ + -77.142943, + 40.188111 + ], + [ + -77.14288562292016, + 40.188121124068054 + ], + [ + -77.479296, + 41.513901 + ], + [ + -74.517602, + 42.025051 + ], + [ + -74.4015880838417, + 41.47028473012693 + ], + [ + -75.369628, + 41.30259 + ], + [ + -74.985129, + 39.782085 + ], + [ + -72.098732, + 40.284157 + ], + [ + -72.418041, + 41.813897 + ], + [ + -73.40384432652397, + 41.64312509272605 + ], + [ + -73.631919, + 42.52585 + ], + [ + -70.620622, + 43.036756 + ], + [ + -70.34065266962763, + 41.71218523222147 + ], + [ + -70.337985, + 41.712648 + ], + [ + -70.019021, + 40.182869 + ], + [ + -72.00672471590617, + 39.83667031007996 + ], + [ + -71.825239, + 38.958856 + ], + [ + -73.80916030155427, + 38.60628514753913 + ], + [ + -73.653498, + 37.844374 + ], + [ + -73.65401440279884, + 37.8442806017583 + ], + [ + -73.385738, + 36.51813 + ], + [ + -73.38620981752847, + 36.51804288539392 + ], + [ + -73.120142, + 35.191451 + ], + [ + -75.10483764261687, + 34.81754811111241 + ], + [ + -74.935896, + 33.971143 + ], + [ + -76.91672919789738, + 33.59113700127224 + ], + [ + -76.770209, + 32.850982 + ], + [ + -78.74968234333848, + 32.46507235488075 + ], + [ + -78.606962, + 31.740181 + ], + [ + -80.58819210576854, + 31.34779398900706 + ], + [ + -80.424271, + 30.511249 + ], + [ + -80.4245842742612, + 30.511185889116142 + ], + [ + -80.36591062886393, + 30.210495541670134 + ], + [ + -78.387456, + 30.616823 + ], + [ + -78.088366, + 29.083523 + ], + [ + -78.08862948001922, + 29.08346889293198 + ], + [ + -77.830245, + 27.75469 + ], + [ + -77.83049744180143, + 27.75463725315759 + ], + [ + -77.5729, + 26.425508 + ], + [ + -79.54954807712267, + 26.005474242531264 + ], + [ + -79.392814, + 25.195305 + ], + [ + -79.39299914512836, + 25.195265055278334 + ], + [ + -79.136044, + 23.865555 + ], + [ + -81.543258, + 23.337889 + ], + [ + -81.68016012713618, + 23.982170954923582 + ], + [ + -83.644614, + 23.552687 + ], + [ + -83.969527, + 25.079928 + ], + [ + -83.96943777245232, + 25.079947544141067 + ], + [ + -84.255144, + 26.411944 + ], + [ + -84.25504206578522, + 26.411965963420542 + ], + [ + -84.543204, + 27.743561 + ], + [ + -84.54309066253755, + 27.743585010239183 + ], + [ + -84.61277900417873, + 28.062470066541394 + ], + [ + -86.581731, + 27.65326 + ], + [ + -86.915545, + 29.179223 + ], + [ + -86.915422187051, + 29.17924853572463 + ], + [ + -87.00742249641998, + 29.595259763847675 + ], + [ + -86.438218, + 29.711164 + ], + [ + -86.737887, + 31.244315 + ], + [ + -88.71688446815635, + 30.841390632701682 + ], + [ + -88.798338144671, + 31.25773636993373 + ], + [ + -88.798014, + 31.257801 + ], + [ + -89.05901258459929, + 32.5856590651401 + ], + [ + -89.058645, + 32.585731 + ], + [ + -89.361572, + 34.118084 + ], + [ + -91.34234945347738, + 33.73091255366688 + ], + [ + -91.39758152090978, + 34.010177687603075 + ], + [ + -91.397173, + 34.010256 + ], + [ + -91.66202768002387, + 35.33720351866546 + ], + [ + -91.661674, + 35.33727 + ], + [ + -91.92796848979621, + 36.663853593739354 + ], + [ + -91.927494, + 36.663941 + ], + [ + -92.19602989659326, + 37.990081191910036 + ], + [ + -92.19551, + 37.990175 + ], + [ + -92.41564124410377, + 39.06645571476947 + ], + [ + -90.431376, + 39.423914 + ], + [ + -90.31352422165367, + 38.84727485934816 + ], + [ + -88.328563, + 39.206084 + ] + ] + ], + [ + [ + [ + 147.070277, + 13.678087 + ], + [ + 144.810007, + 13.127514 + ], + [ + 144.5041805958923, + 14.612969438978377 + ], + [ + 144.219988, + 15.991093 + ], + [ + 144.21999568798216, + 15.991094859167871 + ], + [ + 143.944292, + 17.325186 + ], + [ + 146.252008, + 17.876008 + ], + [ + 146.54814007530925, + 16.350157857235505 + ], + [ + 146.797030906129, + 15.073736226001722 + ], + [ + 147.070277, + 13.678087 + ] + ] + ], + [ + [ + [ + -66.24544567134907, + 19.048232942814884 + ], + [ + -66.381584, + 19.703291 + ], + [ + -64.038554, + 20.248972 + ], + [ + -63.741455, + 18.713696 + ], + [ + -63.741563254092185, + 18.71367088062772 + ], + [ + -63.483884, + 17.382826 + ], + [ + -65.787942, + 16.840915 + ], + [ + -65.92809973332763, + 17.517843385143518 + ], + [ + -67.88941, + 17.057567 + ], + [ + -68.0058647659658, + 17.619658504127845 + ], + [ + -69.968658, + 17.159497 + ], + [ + -70.285495, + 18.688172 + ], + [ + -67.957535, + 19.236139 + ], + [ + -67.84791677441474, + 18.670663435201362 + ], + [ + -66.24544567134907, + 19.048232942814884 + ] + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "priority": 1.0, + "orbit_pass": "ASCENDING" + }, + "geometry": { + "type": "MultiPolygon", + "coordinates": [ + [ + [ + [ + -161.18358100000145, + 20.56712199999893 + ], + [ + -161.5040260000015, + 22.095221999999012 + ], + [ + -159.5418243324219, + 22.54042034854746 + ], + [ + -159.68432400000145, + 23.21658599999907 + ], + [ + -157.28342700000132, + 23.754424999999124 + ], + [ + -156.987041, + 22.219522 + ], + [ + -156.9871579961175, + 22.219495856473355 + ], + [ + -156.91976290065386, + 21.870690160566873 + ], + [ + -154.9478170000012, + 22.319690999999047 + ], + [ + -154.65124800000117, + 20.78457199999895 + ], + [ + -154.65133628240173, + 20.784551958763533 + ], + [ + -154.39402600000113, + 19.453927999998875 + ], + [ + -154.39407946510102, + 19.45391568860065 + ], + [ + -154.13627100000107, + 18.123107999998798 + ], + [ + -156.4485800000012, + 17.583280999998767 + ], + [ + -156.765822, + 19.112004 + ], + [ + -156.76578479782498, + 19.11201271888913 + ], + [ + -156.84116908002284, + 19.473756829855244 + ], + [ + -158.805504, + 19.021872 + ], + [ + -159.124194, + 20.550307 + ], + [ + -159.12413593454366, + 20.550320403160143 + ], + [ + -159.22069406495805, + 21.011189754839357 + ], + [ + -161.18358100000145, + 20.56712199999893 + ] + ] + ], + [ + [ + [ + -163.56699700000158, + 22.120062999999003 + ], + [ + -163.889721, + 23.647765 + ], + [ + -161.4803370000015, + 24.18477999999912 + ], + [ + -161.18390300000146, + 22.649968999999032 + ], + [ + -163.56699700000158, + 22.120062999999003 + ] + ] + ], + [ + [ + [ + -119.509164, + 27.738272 + ], + [ + -119.843181, + 29.264266 + ], + [ + -117.87632777752198, + 29.67272122458691 + ], + [ + -118.032337, + 30.37911 + ], + [ + -118.03221180153254, + 30.379135611778736 + ], + [ + -118.329577, + 31.709443 + ], + [ + -118.3294519688351, + 31.709468109766213 + ], + [ + -118.42191107859564, + 32.11770796696676 + ], + [ + -120.391061, + 31.730488 + ], + [ + -120.737139, + 33.254974 + ], + [ + -120.73700809369402, + 33.25499971463506 + ], + [ + -120.80284975450964, + 33.54095023801114 + ], + [ + -122.773987, + 33.161178 + ], + [ + -123.125326, + 34.685068 + ], + [ + -123.1251998861744, + 34.68509226127138 + ], + [ + -123.436353, + 36.01365 + ], + [ + -123.43624205212423, + 36.01367091937677 + ], + [ + -123.75265, + 37.341622 + ], + [ + -123.75254519755741, + 37.34164135790092 + ], + [ + -123.84303625368437, + 37.7145514389685 + ], + [ + -125.812069, + 37.358576 + ], + [ + -126.182485, + 38.880479 + ], + [ + -124.21464640246067, + 39.23511580733894 + ], + [ + -124.402867, + 39.995664 + ], + [ + -121.511044, + 40.507543 + ], + [ + -121.194711, + 38.977321 + ], + [ + -121.19526156138267, + 38.977223203014624 + ], + [ + -120.924817, + 37.651373 + ], + [ + -120.92532873285523, + 37.651280164478464 + ], + [ + -120.87220543479437, + 37.38830147118928 + ], + [ + -118.887394, + 37.755454 + ], + [ + -118.76967314876552, + 37.172196778757865 + ], + [ + -116.786777, + 37.54024 + ], + [ + -116.69295476752697, + 37.07469154944425 + ], + [ + -114.709647, + 37.443295 + ], + [ + -114.59122283600226, + 36.85528308768807 + ], + [ + -112.609671, + 37.224859 + ], + [ + -112.30159, + 35.693432 + ], + [ + -112.30175267403285, + 35.69340158904123 + ], + [ + -112.22478290867949, + 35.310420937399066 + ], + [ + -110.245364, + 35.68843 + ], + [ + -109.939373, + 34.156596 + ], + [ + -109.93978357052464, + 34.15651746102571 + ], + [ + -109.88322640327273, + 33.870747737049925 + ], + [ + -108.5962506941917, + 34.12175607318161 + ], + [ + -108.765118, + 34.852863 + ], + [ + -106.066875, + 35.370579 + ], + [ + -105.97125199816541, + 34.890957744533175 + ], + [ + -104.7155829995403, + 35.13223177886369 + ], + [ + -104.887055, + 35.865917 + ], + [ + -104.88694064392895, + 35.865938606625754 + ], + [ + -105.202648, + 37.193933 + ], + [ + -105.20254039942354, + 37.193952917007465 + ], + [ + -105.523869, + 38.521328 + ], + [ + -102.69163, + 39.034669 + ], + [ + -102.57609858771534, + 38.46746046134116 + ], + [ + -100.593825, + 38.827905 + ], + [ + -100.4987279533575, + 38.36034900012213 + ], + [ + -99.36958012581951, + 38.56603701670952 + ], + [ + -99.555175, + 39.323334 + ], + [ + -96.688892, + 39.836248 + ], + [ + -96.59525703752, + 39.37966721566193 + ], + [ + -94.609442, + 39.735572 + ], + [ + -94.49233364442028, + 39.16398449729368 + ], + [ + -92.508564, + 39.52078 + ], + [ + -92.19551, + 37.990175 + ], + [ + -92.19602989659326, + 37.990081191910036 + ], + [ + -91.927494, + 36.663941 + ], + [ + -91.92796848979621, + 36.663853593739354 + ], + [ + -91.661674, + 35.33727 + ], + [ + -91.66202768002387, + 35.33720351866546 + ], + [ + -91.397173, + 34.010256 + ], + [ + -91.39758152090978, + 34.010177687603075 + ], + [ + -91.34234945347738, + 33.73091255366688 + ], + [ + -89.361572, + 34.118084 + ], + [ + -89.058645, + 32.585731 + ], + [ + -89.05901258459929, + 32.5856590651401 + ], + [ + -88.798014, + 31.257801 + ], + [ + -88.798338144671, + 31.25773636993373 + ], + [ + -88.71688446815635, + 30.841390632701682 + ], + [ + -86.737887, + 31.244315 + ], + [ + -86.438218, + 29.711164 + ], + [ + -88.41677535053203, + 29.308280361800865 + ], + [ + -88.278158, + 28.601109 + ], + [ + -90.788569, + 28.082409 + ], + [ + -90.89908297642577, + 28.58575676374545 + ], + [ + -92.864453, + 28.180121 + ], + [ + -93.00190197172043, + 28.800540675167184 + ], + [ + -94.43247740285904, + 28.506127162438155 + ], + [ + -94.272942, + 27.685525 + ], + [ + -96.24873775403336, + 27.27232235278816 + ], + [ + -96.11219, + 26.567848 + ], + [ + -96.11241288011912, + 26.567800728953763 + ], + [ + -95.855257, + 25.238355 + ], + [ + -98.288873, + 24.713663 + ], + [ + -98.40244301965357, + 25.243794837712223 + ], + [ + -99.9076021190415, + 24.919658366697846 + ], + [ + -99.772275, + 24.222354 + ], + [ + -102.187006, + 23.695412 + ], + [ + -102.3243591861924, + 24.340515318095232 + ], + [ + -104.288167, + 23.912996 + ], + [ + -104.60121661467798, + 25.382059336153706 + ], + [ + -104.68415388038157, + 25.76519955828479 + ], + [ + -106.17930615962695, + 25.445286372189866 + ], + [ + -106.045387, + 24.752392 + ], + [ + -108.02140917994312, + 24.323839776269324 + ], + [ + -107.867427, + 23.526642 + ], + [ + -107.86758542760789, + 23.526607133898963 + ], + [ + -107.610821, + 22.196478 + ], + [ + -109.986465, + 21.66561 + ], + [ + -110.12307127696316, + 22.314087545541334 + ], + [ + -112.086477, + 21.876429 + ], + [ + -112.408638, + 23.40419 + ], + [ + -112.4085478470388, + 23.404210144817757 + ], + [ + -112.691406, + 24.736769 + ], + [ + -112.69131243185554, + 24.736789580210313 + ], + [ + -112.7871907032562, + 25.184899678013263 + ], + [ + -114.754092, + 24.761015 + ], + [ + -115.081336, + 26.287972 + ], + [ + -115.0812336231453, + 26.287994095041046 + ], + [ + -115.369149, + 27.619699 + ], + [ + -115.3690341881701, + 27.619723363506367 + ], + [ + -115.43718066885963, + 27.931874621194517 + ], + [ + -117.40512, + 27.522207 + ], + [ + -117.54156664475055, + 28.146711789813644 + ], + [ + -119.509164, + 27.738272 + ] + ] + ], + [ + [ + [ + -97.202936, + 21.559369 + ], + [ + -96.906312, + 20.024201 + ], + [ + -96.90639146446225, + 20.024182814503607 + ], + [ + -96.648934, + 18.693514 + ], + [ + -98.970287, + 18.154803 + ], + [ + -99.10785979608762, + 18.816944042759793 + ], + [ + -101.069234, + 18.362793 + ], + [ + -101.387018, + 19.891322 + ], + [ + -99.427050492076, + 20.346791368234403 + ], + [ + -99.567438, + 21.016547 + ], + [ + -97.202936, + 21.559369 + ] + ] + ], + [ + [ + [ + -75.369628, + 41.30259 + ], + [ + -72.418041, + 41.813897 + ], + [ + -72.098732, + 40.284157 + ], + [ + -74.985129, + 39.782085 + ], + [ + -75.369628, + 41.30259 + ] + ] + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/assets/priority_rollout_DESCENDING.geojson b/src/assets/priority_rollout_DESCENDING.geojson new file mode 100644 index 000000000..bab863312 --- /dev/null +++ b/src/assets/priority_rollout_DESCENDING.geojson @@ -0,0 +1,3919 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + "priority": 3.0, + "orbit_pass": "DESCENDING" + }, + "geometry": { + "type": "MultiPolygon", + "coordinates": [ + [ + [ + [ + -179.57892594211785, + 51.506293863179444 + ], + [ + -180.0, + 50.18112821101667 + ], + [ + -180.0, + 51.3934936656684 + ], + [ + -180.0, + 51.598170879436374 + ], + [ + -180.0, + 52.968090592434635 + ], + [ + -179.13135499999967, + 52.861597999994906 + ], + [ + -179.57892594211785, + 51.506293863179444 + ] + ] + ], + [ + [ + [ + -179.04858299999967, + 51.93848199999448 + ], + [ + -179.01450332584545, + 52.07542740423032 + ], + [ + -178.99788099999964, + 52.14316499999459 + ], + [ + -178.99765087944854, + 52.143147097609486 + ], + [ + -178.66912699999952, + 53.4632839999952 + ], + [ + -176.649241718994, + 53.309424812264076 + ], + [ + -176.58650299999877, + 53.56098699999522 + ], + [ + -174.57142176716783, + 53.407901239514054 + ], + [ + -174.47862399999798, + 53.778302999995304 + ], + [ + -172.4579422210684, + 53.625321236955216 + ], + [ + -172.36701, + 53.986485 + ], + [ + -170.3487433676933, + 53.834146166039346 + ], + [ + -170.3354286385953, + 53.8869172506955 + ], + [ + -170.336689, + 53.887009 + ], + [ + -170.29502064103175, + 54.04706875242849 + ], + [ + -170.283767, + 54.091671 + ], + [ + -170.28341621595052, + 54.09164457570465 + ], + [ + -169.939989, + 55.410844 + ], + [ + -167.91944878517435, + 55.261872873463616 + ], + [ + -167.824854, + 55.623212 + ], + [ + -163.863728, + 55.332027 + ], + [ + -164.35160343492169, + 53.969912391959994 + ], + [ + -164.85331, + 52.505068 + ], + [ + -166.86018492639724, + 52.65391179399157 + ], + [ + -166.93056336745337, + 52.446953891992436 + ], + [ + -167.411151, + 50.974389 + ], + [ + -169.4175294168463, + 51.1270214087156 + ], + [ + -169.501424, + 50.869187 + ], + [ + -171.50921928622296, + 51.02224089118472 + ], + [ + -171.625948, + 50.661183 + ], + [ + -173.63205850139394, + 50.814587249573925 + ], + [ + -173.751031, + 50.444259 + ], + [ + -175.75900389889108, + 50.59838709729972 + ], + [ + -175.83966, + 50.346601 + ], + [ + -179.372102, + 50.618178 + ], + [ + -179.04811734543546, + 51.93844700256319 + ], + [ + -179.04858299999967, + 51.93848199999448 + ] + ] + ], + [ + [ + [ + -163.264707, + 57.256482 + ], + [ + -159.22652036906092, + 56.96709865748615 + ], + [ + -159.11628671667145, + 57.36433714790624 + ], + [ + -159.11756, + 57.364425 + ], + [ + -159.07855491003636, + 57.50030765767032 + ], + [ + -159.059505, + 57.568956 + ], + [ + -159.0588625698902, + 57.56891017896436 + ], + [ + -158.90793510740704, + 58.09469860136695 + ], + [ + -162.946956, + 58.369254 + ], + [ + -162.72993996998323, + 59.10095584094857 + ], + [ + -164.37974925114625, + 59.211508808384735 + ], + [ + -164.532728, + 58.866838 + ], + [ + -166.52186938863633, + 59.00044521925688 + ], + [ + -166.626285, + 58.761491 + ], + [ + -168.6246380370167, + 58.896091655362454 + ], + [ + -168.772346, + 58.554781 + ], + [ + -173.092708, + 58.8465 + ], + [ + -172.80155046373082, + 59.81233149314983 + ], + [ + -174.820072, + 59.946582 + ], + [ + -174.343146, + 61.466803 + ], + [ + -172.32851043912126, + 61.33087835676893 + ], + [ + -172.217122, + 61.683115 + ], + [ + -170.19960690982106, + 61.54739615848849 + ], + [ + -170.15537927923566, + 61.686103325174734 + ], + [ + -170.157588, + 61.686247 + ], + [ + -170.11839334227665, + 61.802099015084316 + ], + [ + -170.09018, + 61.890582 + ], + [ + -170.08849631428362, + 61.89046899046397 + ], + [ + -169.94386919345075, + 62.31795947915752 + ], + [ + -173.977481, + 62.577442 + ], + [ + -173.51549853430788, + 63.89118102753358 + ], + [ + -173.51777, + 63.891325 + ], + [ + -173.4752278021961, + 64.00569886396995 + ], + [ + -173.443646, + 64.095508 + ], + [ + -173.4418658845759, + 64.09539172481493 + ], + [ + -173.029424685616, + 65.20423179468759 + ], + [ + -173.032466, + 65.204422 + ], + [ + -172.98526258807223, + 65.32296072731997 + ], + [ + -172.953446, + 65.408499 + ], + [ + -172.95125646425424, + 65.40835799997137 + ], + [ + -172.428799, + 66.72037 + ], + [ + -170.42157709346012, + 66.59275127542844 + ], + [ + -170.36551797478063, + 66.73190677906113 + ], + [ + -170.369072, + 66.732126 + ], + [ + -170.31928336122806, + 66.84667492179557 + ], + [ + -170.283278, + 66.936051 + ], + [ + -170.2805123562728, + 66.93587552908477 + ], + [ + -169.9465079902686, + 67.7043207194836 + ], + [ + -171.955194, + 67.827201 + ], + [ + -171.33775498895676, + 69.13589066781591 + ], + [ + -171.341387, + 69.136111 + ], + [ + -171.2924695094727, + 69.23187527203248 + ], + [ + -171.241604, + 69.339687 + ], + [ + -171.2375277200092, + 69.33943312946587 + ], + [ + -170.569464, + 70.647281 + ], + [ + -168.57753615389132, + 70.5240631066434 + ], + [ + -168.401932, + 70.862519 + ], + [ + -166.4011391718331, + 70.7389956161137 + ], + [ + -166.227422, + 71.068542 + ], + [ + -164.235595917065, + 70.94563307170947 + ], + [ + -164.22314302448126, + 70.96908005127139 + ], + [ + -164.229111, + 70.969439 + ], + [ + -164.16747852712854, + 71.07388817701212 + ], + [ + -164.114995, + 71.172707 + ], + [ + -164.10937290548623, + 71.17236036346779 + ], + [ + -163.339219, + 72.477548 + ], + [ + -161.34475035638894, + 72.35514491411776 + ], + [ + -161.145125, + 72.687295 + ], + [ + -153.793143, + 72.236118 + ], + [ + -154.30473563068514, + 71.71389856681141 + ], + [ + -153.53257599513034, + 71.66636302616885 + ], + [ + -153.341001, + 72.004059 + ], + [ + -146.240473, + 71.567358 + ], + [ + -146.91905915214042, + 70.82912293974914 + ], + [ + -145.81379320651493, + 70.76090514220327 + ], + [ + -145.51581, + 71.315638 + ], + [ + -138.655972, + 70.892684 + ], + [ + -139.00764553840784, + 70.48596997701262 + ], + [ + -133.169614, + 70.124745 + ], + [ + -134.28706627908323, + 68.74332054882665 + ], + [ + -135.23564888367235, + 67.45253726692052 + ], + [ + -136.0872632443604, + 66.16783075453321 + ], + [ + -136.8739585176661, + 64.87165240719119 + ], + [ + -137.60064837744304, + 63.57276723777886 + ], + [ + -137.94106215293195, + 62.91647655597863 + ], + [ + -133.966236, + 62.653372 + ], + [ + -134.3260977045306, + 61.92125931851521 + ], + [ + -133.07807467593068, + 61.83755516729045 + ], + [ + -132.963776, + 62.18901 + ], + [ + -128.19051, + 61.870117 + ], + [ + -128.84018619719427, + 60.49380497443426 + ], + [ + -129.4183010184267, + 59.18861304430988 + ], + [ + -129.69256275521465, + 58.531759080913055 + ], + [ + -125.696525, + 58.250917 + ], + [ + -126.07972424056118, + 57.293567557132015 + ], + [ + -124.080877, + 57.150674 + ], + [ + -124.49109031115057, + 56.079917706178534 + ], + [ + -122.490524, + 55.934155 + ], + [ + -122.83862926008996, + 54.983270862604755 + ], + [ + -120.844782, + 54.835559 + ], + [ + -121.32382882378249, + 53.47475143287247 + ], + [ + -121.6309633935797, + 52.56339272191589 + ], + [ + -119.625943, + 52.408701 + ], + [ + -119.96981232475318, + 51.352923013625706 + ], + [ + -119.54328859066382, + 51.31933579761542 + ], + [ + -119.454344, + 51.690125 + ], + [ + -117.43478300039597, + 51.53160097521668 + ], + [ + -117.372741, + 51.789762 + ], + [ + -115.35164113153436, + 51.631396512538245 + ], + [ + -115.261264, + 52.004282 + ], + [ + -113.24070858604928, + 51.84652855903277 + ], + [ + -113.179232, + 52.099654 + ], + [ + -111.16451008663539, + 51.94274732486882 + ], + [ + -111.073269, + 52.316982 + ], + [ + -109.05258175653714, + 52.16017279069677 + ], + [ + -108.962968, + 52.526064 + ], + [ + -106.9443091884442, + 52.369894592168095 + ], + [ + -106.880941, + 52.628137 + ], + [ + -103.190707, + 52.343203 + ], + [ + -103.49869293033109, + 51.39559504199409 + ], + [ + -103.07581137546305, + 51.362311209480765 + ], + [ + -103.014329, + 51.619003 + ], + [ + -100.99537362694413, + 51.460359891728785 + ], + [ + -100.905264, + 51.835049 + ], + [ + -98.88349424888956, + 51.67678267522189 + ], + [ + -98.795, + 52.04163 + ], + [ + -96.77734070320908, + 51.88420093494029 + ], + [ + -96.713112, + 52.146054 + ], + [ + -94.69618071880768, + 51.989184124176944 + ], + [ + -94.606395, + 52.357161 + ], + [ + -90.93956, + 52.072807 + ], + [ + -91.28155348726982, + 51.011868762321534 + ], + [ + -89.276156, + 50.853083 + ], + [ + -89.69584513551176, + 49.504820742708894 + ], + [ + -90.142498, + 48.018333 + ], + [ + -92.15128300812098, + 48.17913829329691 + ], + [ + -92.229208, + 47.919151 + ], + [ + -94.23861601899044, + 48.080303452668176 + ], + [ + -94.29798390185735, + 47.881119219701354 + ], + [ + -94.729261, + 46.386346 + ], + [ + -96.73790736454445, + 46.551774603601636 + ], + [ + -96.76400719338979, + 46.461107949143404 + ], + [ + -97.13175338931526, + 45.14441842121095 + ], + [ + -97.49039634690168, + 43.824170316743945 + ], + [ + -97.83939991375586, + 42.50504700080462 + ], + [ + -97.839389, + 42.505046 + ], + [ + -98.18155710310566, + 41.17980185809352 + ], + [ + -98.181516, + 41.179798 + ], + [ + -98.51616230313401, + 39.85383356233896 + ], + [ + -98.516094, + 39.853827 + ], + [ + -98.84396045883906, + 38.52718471350116 + ], + [ + -101.725605, + 38.810487 + ], + [ + -101.80832365329272, + 38.40395331045967 + ], + [ + -103.825597, + 38.602935 + ], + [ + -104.13655, + 37.072047 + ], + [ + -104.13605036187022, + 37.07199828648421 + ], + [ + -104.403002, + 35.745541 + ], + [ + -104.40262593132547, + 35.745503492191894 + ], + [ + -104.44681319154815, + 35.524619107038966 + ], + [ + -106.461934, + 35.73338 + ], + [ + -106.767996, + 34.201639 + ], + [ + -106.76757724909528, + 34.20159612398846 + ], + [ + -106.78879368891761, + 34.094443966278455 + ], + [ + -108.804212, + 34.308291 + ], + [ + -108.88912043683881, + 33.87925931923791 + ], + [ + -110.20077850060053, + 34.018904732207254 + ], + [ + -109.966344, + 35.03124 + ], + [ + -111.97487346660006, + 35.24079026665356 + ], + [ + -111.761651, + 36.149276 + ], + [ + -113.76546643512938, + 36.354352227434575 + ], + [ + -113.550121, + 37.258292 + ], + [ + -116.382403, + 37.542917 + ], + [ + -116.44267949073974, + 37.24403339552847 + ], + [ + -118.460005, + 37.447063 + ], + [ + -118.54450747061455, + 37.027731911898826 + ], + [ + -119.74971291871361, + 37.14946333039447 + ], + [ + -119.502762, + 38.173828 + ], + [ + -121.51187381233545, + 38.37254541231225 + ], + [ + -121.287599, + 39.288113 + ], + [ + -124.199639, + 39.57055 + ], + [ + -124.512842, + 38.03998 + ], + [ + -124.51231152516962, + 38.039929143120084 + ], + [ + -124.57292442121913, + 37.74073554612236 + ], + [ + -126.59135, + 37.934645 + ], + [ + -126.32024359228167, + 39.260357732937436 + ], + [ + -126.320811, + 39.260411 + ], + [ + -126.04677632177108, + 40.58564898827184 + ], + [ + -126.047387, + 40.585705 + ], + [ + -126.02197962239583, + 40.705566395105976 + ], + [ + -126.004407, + 40.790548 + ], + [ + -126.00397452416938, + 40.790506927972615 + ], + [ + -125.84927008789019, + 41.5203378397022 + ], + [ + -127.86833, + 41.701959 + ], + [ + -127.58783719163115, + 43.02628820913664 + ], + [ + -127.588529, + 43.026349 + ], + [ + -127.30396485339134, + 44.35016695309405 + ], + [ + -127.304711, + 44.350231 + ], + [ + -127.01553377708984, + 45.67351731931558 + ], + [ + -127.016329, + 45.673584 + ], + [ + -126.98051534169242, + 45.83376305381325 + ], + [ + -126.970765, + 45.878381 + ], + [ + -126.97054372766146, + 45.87836178446377 + ], + [ + -126.72061538163577, + 46.99618352843909 + ], + [ + -126.721256, + 46.996236 + ], + [ + -126.67712590003246, + 47.1906932306934 + ], + [ + -126.674819, + 47.201011 + ], + [ + -126.67478504046107, + 47.20100811939821 + ], + [ + -126.50722774232707, + 47.93934155171723 + ], + [ + -128.528283, + 48.10171 + ], + [ + -128.28222544536823, + 49.16655429960599 + ], + [ + -130.304506, + 49.325587 + ], + [ + -130.0799167855303, + 50.276885812148464 + ], + [ + -132.099088, + 50.432756 + ], + [ + -131.84209137700773, + 51.49853442799294 + ], + [ + -132.25587031169363, + 51.52982636165346 + ], + [ + -132.374393, + 51.168882 + ], + [ + -135.973112, + 51.441862 + ], + [ + -135.64685027296403, + 52.76196124146119 + ], + [ + -135.647831, + 52.762034 + ], + [ + -135.6076466854201, + 52.9205842790129 + ], + [ + -135.596246, + 52.966713 + ], + [ + -135.59596098161188, + 52.96669111494199 + ], + [ + -135.40572398480558, + 53.71728569985773 + ], + [ + -137.426412, + 53.86452 + ], + [ + -137.08313887121, + 55.18356425833058 + ], + [ + -137.084509, + 55.183662 + ], + [ + -137.0428694787142, + 55.33830142387927 + ], + [ + -137.02986, + 55.388291 + ], + [ + -137.0294176517031, + 55.388258356977666 + ], + [ + -136.72951241466845, + 56.50203612486135 + ], + [ + -136.731013, + 56.502141 + ], + [ + -136.695075574318, + 56.62992647968723 + ], + [ + -136.674394, + 56.706733 + ], + [ + -136.67349339160677, + 56.70666791339077 + ], + [ + -136.52588265553894, + 57.23153880654611 + ], + [ + -140.562227, + 57.509486 + ], + [ + -140.35110318531886, + 58.241625853796684 + ], + [ + -142.10735206182375, + 58.36075331095661 + ], + [ + -142.209201, + 58.12082 + ], + [ + -146.20726469997305, + 58.392509047851924 + ], + [ + -146.496289, + 57.698877 + ], + [ + -150.49447619775125, + 57.9721591251208 + ], + [ + -150.69132272134044, + 57.498916827599594 + ], + [ + -151.191523215385, + 56.21477433000287 + ], + [ + -151.73019, + 54.760484 + ], + [ + -155.637851, + 55.039791 + ], + [ + -155.37722312856422, + 56.01158785042419 + ], + [ + -155.41816880479647, + 55.9051907942592 + ], + [ + -155.9047019399646, + 54.57703896866724 + ], + [ + -156.416069, + 53.133088 + ], + [ + -160.169583, + 53.408402 + ], + [ + -159.83000825626294, + 54.72770935544571 + ], + [ + -159.831339, + 54.727805 + ], + [ + -159.78969257752377, + 54.88434282858053 + ], + [ + -159.777316, + 54.932428 + ], + [ + -159.7769077376088, + 54.93239764241667 + ], + [ + -159.4854260433435, + 56.02799982810929 + ], + [ + -159.65030643194243, + 55.59433814786618 + ], + [ + -160.12519828902504, + 54.28322678872146 + ], + [ + -160.631678, + 52.819818 + ], + [ + -164.363415, + 53.095191 + ], + [ + -164.02632206523705, + 54.41466290023914 + ], + [ + -164.027625, + 54.414757 + ], + [ + -163.9860118479709, + 54.57244787135589 + ], + [ + -163.974018, + 54.619395 + ], + [ + -163.97363057764986, + 54.61936605010982 + ], + [ + -163.67960165544253, + 55.733573330401384 + ], + [ + -163.681025, + 55.733674 + ], + [ + -163.63928972116662, + 55.886333304881674 + ], + [ + -163.625582, + 55.938278 + ], + [ + -163.62509831886436, + 55.93824261689092 + ], + [ + -163.264707, + 57.256482 + ] + ] + ], + [ + [ + [ + -91.90214356900948, + 41.5956246619066 + ], + [ + -91.902115, + 41.595622 + ], + [ + -92.1359065054166, + 40.67570403966312 + ], + [ + -91.0766726963258, + 40.57511180249568 + ], + [ + -91.05967715017881, + 40.65727196800358 + ], + [ + -91.060289, + 40.657328 + ], + [ + -91.02099586866535, + 40.84426569351951 + ], + [ + -91.017292, + 40.862171 + ], + [ + -91.01723345241146, + 40.86216544832841 + ], + [ + -90.78186401028692, + 41.98193929025022 + ], + [ + -90.782375, + 41.981985 + ], + [ + -90.75520647225937, + 42.10876294885199 + ], + [ + -90.7388, + 42.186817 + ], + [ + -90.7384857196351, + 42.1867878878993 + ], + [ + -90.454759, + 43.510757 + ], + [ + -87.364405, + 43.231187 + ], + [ + -87.71088123253446, + 41.90633789310052 + ], + [ + -87.71085, + 41.906335 + ], + [ + -87.94545838554632, + 40.987777942844566 + ], + [ + -85.937459, + 40.798143 + ], + [ + -86.16886936813472, + 39.875088345628384 + ], + [ + -87.088773, + 39.963718 + ], + [ + -87.402978, + 38.433289 + ], + [ + -87.40243875413464, + 38.433237644862274 + ], + [ + -87.44393914518027, + 38.228988045446506 + ], + [ + -89.461446, + 38.428541 + ], + [ + -89.54614191828557, + 38.01095116150775 + ], + [ + -90.71481384648023, + 38.12699345159358 + ], + [ + -90.462542, + 39.159025 + ], + [ + -93.369182, + 39.44152 + ], + [ + -93.41105926069216, + 39.23662379690661 + ], + [ + -93.411626, + 39.236677 + ], + [ + -93.22057400067929, + 40.1611589544004 + ], + [ + -95.237632, + 40.346957 + ], + [ + -94.9599628188154, + 41.67167962332184 + ], + [ + -94.960456, + 41.671724 + ], + [ + -94.6801165961213, + 42.99606131469059 + ], + [ + -94.680807, + 42.996122 + ], + [ + -94.352397, + 44.524819 + ], + [ + -91.204288, + 44.244884 + ], + [ + -91.5576295671945, + 42.92001974090131 + ], + [ + -91.90214356900948, + 41.5956246619066 + ] + ] + ], + [ + [ + [ + -82.90825051304482, + 40.28019968315402 + ], + [ + -82.63127, + 41.605077 + ], + [ + -79.629817, + 41.324103 + ], + [ + -79.96522074014301, + 39.99819401185768 + ], + [ + -79.965158, + 39.998188 + ], + [ + -80.2206646691523, + 38.966539395671006 + ], + [ + -79.08888334594235, + 38.8557503039596 + ], + [ + -79.316738, + 37.739304 + ], + [ + -79.31621557937022, + 37.73925367199132 + ], + [ + -79.3594216589552, + 37.525471316048375 + ], + [ + -80.54313695056494, + 37.64392351753969 + ], + [ + -80.293637, + 38.671591 + ], + [ + -83.181058, + 38.954714 + ], + [ + -83.26509223789854, + 38.54212465651535 + ], + [ + -84.4125489739695, + 38.65502845572615 + ], + [ + -84.15958, + 39.6815 + ], + [ + -85.07128179085413, + 39.769339434278066 + ], + [ + -85.010292, + 40.066196 + ], + [ + -82.99230665404076, + 39.87215253183366 + ], + [ + -82.95048258664833, + 40.075322544295176 + ], + [ + -82.951071, + 40.075377 + ], + [ + -82.9119427224072, + 40.262538785715826 + ], + [ + -82.908306, + 40.280205 + ], + [ + -82.90825051304482, + 40.28019968315402 + ] + ] + ], + [ + [ + [ + -78.21346044243467, + 43.03937617863228 + ], + [ + -78.214153, + 43.039437 + ], + [ + -77.92961634386326, + 44.36327503308116 + ], + [ + -77.930362, + 44.363339 + ], + [ + -77.64121067161511, + 45.68664735076661 + ], + [ + -77.642006, + 45.686714 + ], + [ + -77.60621930770488, + 45.846786210670054 + ], + [ + -77.596446, + 45.891514 + ], + [ + -77.5962240054294, + 45.89149473299886 + ], + [ + -77.34631267306999, + 47.0093365025699 + ], + [ + -77.346954, + 47.009389 + ], + [ + -77.30280411055185, + 47.20394827970538 + ], + [ + -77.30052, + 47.214165 + ], + [ + -77.30048635350717, + 47.2141621476625 + ], + [ + -77.000431, + 48.536443 + ], + [ + -74.97990635972546, + 48.36909181723586 + ], + [ + -74.894682, + 48.743342 + ], + [ + -72.87579752242559, + 48.576670155869714 + ], + [ + -72.813875, + 48.848204 + ], + [ + -69.406928, + 48.567532 + ], + [ + -69.79986658636541, + 47.22747376304813 + ], + [ + -70.06122558871137, + 46.307681580795034 + ], + [ + -69.29006294049738, + 46.24140689472077 + ], + [ + -69.229559, + 46.514721 + ], + [ + -67.21031236234982, + 46.34148091096117 + ], + [ + -67.124182, + 46.729381 + ], + [ + -65.1040657929557, + 46.556694785602446 + ], + [ + -65.044363, + 46.825178 + ], + [ + -61.768175, + 46.545538 + ], + [ + -62.140725951171525, + 45.21355014365673 + ], + [ + -62.4998872494351, + 43.89314583940534 + ], + [ + -62.900723, + 42.379973 + ], + [ + -64.91171422974449, + 42.55779946436167 + ], + [ + -64.984082, + 42.284069 + ], + [ + -66.99422462672295, + 42.462091539548815 + ], + [ + -67.04646911846959, + 42.263648759808525 + ], + [ + -67.04645, + 42.263647 + ], + [ + -67.437097, + 40.743644 + ], + [ + -69.44745015515868, + 40.92656741478718 + ], + [ + -69.47011050713134, + 40.83824376739133 + ], + [ + -69.47006, + 40.838239 + ], + [ + -69.851613, + 39.317426 + ], + [ + -71.86219604897052, + 39.50504613225285 + ], + [ + -71.91338004047992, + 39.30028795292782 + ], + [ + -74.825354, + 39.582572 + ], + [ + -74.8869486420023, + 39.281527759426766 + ], + [ + -76.904029, + 39.477467 + ], + [ + -76.98665514798407, + 39.07336616463667 + ], + [ + -79.00187924971428, + 39.26977246453629 + ], + [ + -78.728323, + 40.595072 + ], + [ + -76.71274692384745, + 40.403175535123296 + ], + [ + -76.630126, + 40.802787 + ], + [ + -74.61261522560109, + 40.61128722671799 + ], + [ + -74.5936472979533, + 40.702960860539235 + ], + [ + -74.594261, + 40.703017 + ], + [ + -74.55495397804712, + 40.88996902011648 + ], + [ + -74.551252, + 40.907861 + ], + [ + -74.55119332340695, + 40.907855442109614 + ], + [ + -74.37585509059325, + 41.741798976867216 + ], + [ + -75.38382461549214, + 41.832034923782004 + ], + [ + -75.484708, + 41.444491 + ], + [ + -78.493924, + 41.715027 + ], + [ + -78.21346044243467, + 43.03937617863228 + ] + ] + ], + [ + [ + [ + -88.657192, + 51.444943 + ], + [ + -85.06109, + 51.161617 + ], + [ + -85.48479544029081, + 49.81238355127456 + ], + [ + -85.88320847163033, + 48.497311217326605 + ], + [ + -86.320155, + 47.005827 + ], + [ + -89.62866, + 47.275504 + ], + [ + -89.32732409018965, + 48.59757761803895 + ], + [ + -89.328258, + 48.597652 + ], + [ + -89.28462159305872, + 48.78492948365871 + ], + [ + -89.280638, + 48.802407 + ], + [ + -89.28055093461374, + 48.80239981918455 + ], + [ + -89.02034321661239, + 49.91915186344494 + ], + [ + -89.021347, + 49.91923 + ], + [ + -88.97836085894821, + 50.09933054570871 + ], + [ + -88.97262, + 50.123969 + ], + [ + -88.97248282672511, + 50.12395794386939 + ], + [ + -88.657192, + 51.444943 + ] + ] + ], + [ + [ + [ + 174.64838699999817, + 51.41230899999423 + ], + [ + 175.0250609999982, + 52.93725299999492 + ], + [ + 177.04580016363954, + 52.78206161211738 + ], + [ + 177.13646299999897, + 53.147357999995045 + ], + [ + 180.0, + 52.968090592434635 + ], + [ + 180.0, + 51.598170879436374 + ], + [ + 180.0, + 51.3934936656684 + ], + [ + 179.99378753143222, + 51.39393255580956 + ], + [ + 179.952301, + 50.03004 + ], + [ + 176.441376, + 50.301631 + ], + [ + 176.67164348580215, + 51.258808895698614 + ], + [ + 174.64838699999817, + 51.41230899999423 + ] + ] + ], + [ + [ + [ + 174.50555590837658, + 52.29955550012461 + ], + [ + 174.02689, + 50.826371 + ], + [ + 170.457633, + 51.09856 + ], + [ + 170.78163490872805, + 52.418903489700035 + ], + [ + 170.780676, + 52.418975 + ], + [ + 170.820986023576, + 52.579263620002685 + ], + [ + 170.831883, + 52.62367 + ], + [ + 170.83214836629708, + 52.62364951591722 + ], + [ + 171.164087, + 53.943569 + ], + [ + 174.96484799999817, + 53.65658199999526 + ], + [ + 174.50555590837658, + 52.29955550012461 + ] + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "priority": 2.0, + "orbit_pass": "DESCENDING" + }, + "geometry": { + "type": "MultiPolygon", + "coordinates": [ + [ + [ + [ + -100.195102, + 15.101629 + ], + [ + -100.00734723625311, + 16.06500069341326 + ], + [ + -102.012867, + 16.332801 + ], + [ + -101.84683990174874, + 17.187226584695345 + ], + [ + -103.50318383115197, + 17.405202767149994 + ], + [ + -103.57985, + 17.036203 + ], + [ + -105.930078, + 17.345969 + ], + [ + -105.7631023707062, + 18.207881114211343 + ], + [ + -107.76916, + 18.468407 + ], + [ + -107.51189320867253, + 19.799133462387346 + ], + [ + -107.512015, + 19.799149 + ], + [ + -107.25480004964673, + 21.129615357071298 + ], + [ + -107.254893, + 21.129627 + ], + [ + -107.08783355174309, + 21.99460172169487 + ], + [ + -108.67662362711016, + 22.1905376022798 + ], + [ + -108.427407, + 23.372331 + ], + [ + -108.42749986682979, + 23.37234261754101 + ], + [ + -108.144585, + 24.704822 + ], + [ + -108.14469097485342, + 24.704835004707913 + ], + [ + -108.1143616993191, + 24.84658662240543 + ], + [ + -106.107694, + 24.608505 + ], + [ + -106.01026098031433, + 25.063590006377403 + ], + [ + -104.47345200000511, + 24.881860042404185 + ], + [ + -104.644228, + 23.998142 + ], + [ + -102.185866, + 23.702521 + ], + [ + -102.11213810646072, + 24.048665875160612 + ], + [ + -100.105962, + 23.807851 + ], + [ + -100.0094697885234, + 24.26064853429258 + ], + [ + -98.003529, + 24.020563 + ], + [ + -97.93101587301972, + 24.36034102635524 + ], + [ + -95.924559, + 24.120572 + ], + [ + -95.88295105023104, + 24.315423002092192 + ], + [ + -95.88287, + 24.315413 + ], + [ + -96.206615, + 22.787985 + ], + [ + -96.20798882048106, + 22.788152381943988 + ], + [ + -96.44741595089681, + 21.650209885351664 + ], + [ + -96.447331, + 21.650199 + ], + [ + -96.6265390859416, + 20.793580727961846 + ], + [ + -94.623853, + 20.53299 + ], + [ + -94.82654708766695, + 19.56041295576316 + ], + [ + -93.19927180385578, + 19.345108250630258 + ], + [ + -93.14536506463745, + 19.62392066452488 + ], + [ + -93.145485, + 19.623936 + ], + [ + -92.848694, + 21.159124 + ], + [ + -90.84194751236544, + 20.89913375551542 + ], + [ + -90.79058869817538, + 21.164787317521967 + ], + [ + -90.790682, + 21.164799 + ], + [ + -90.53375006792821, + 22.49505315654317 + ], + [ + -90.533879, + 22.495069 + ], + [ + -90.237536, + 24.029824 + ], + [ + -87.780868, + 23.724042 + ], + [ + -87.98703105898568, + 22.748145642130236 + ], + [ + -85.982971, + 22.494344 + ], + [ + -86.1636266437671, + 21.634225928640266 + ], + [ + -84.160626, + 21.376544 + ], + [ + -84.480254, + 19.848389 + ], + [ + -86.4840636407226, + 20.102818433182023 + ], + [ + -86.54149637508216, + 19.8279551724769 + ], + [ + -86.541457, + 19.82795 + ], + [ + -86.81883139079049, + 18.494342528455814 + ], + [ + -86.818805, + 18.494339 + ], + [ + -86.99434433839093, + 17.647322727416455 + ], + [ + -85.34263116072914, + 17.423275210123524 + ], + [ + -85.31039403838983, + 17.589158983262536 + ], + [ + -85.310417, + 17.589162 + ], + [ + -85.013243, + 19.12468 + ], + [ + -82.639845, + 18.808644 + ], + [ + -82.91629605685883, + 17.474814155691238 + ], + [ + -82.916258, + 17.474809 + ], + [ + -83.09007347596, + 16.63367089705258 + ], + [ + -81.089929, + 16.358871 + ], + [ + -81.36506147983822, + 15.024665067019749 + ], + [ + -81.365061, + 15.024665 + ], + [ + -81.6604172935184, + 13.590433010925837 + ], + [ + -81.954343, + 12.160913 + ], + [ + -81.9543460758205, + 12.160913430465005 + ], + [ + -82.2286, + 10.826274 + ], + [ + -82.22865256355772, + 10.8262814708218 + ], + [ + -82.35926063357797, + 10.19106237384853 + ], + [ + -80.64029493717433, + 9.936324700870186 + ], + [ + -80.560241, + 10.337952 + ], + [ + -78.56262917238665, + 10.04232429050393 + ], + [ + -78.461383, + 10.550695 + ], + [ + -76.18326, + 10.214289 + ], + [ + -76.49783, + 8.684647 + ], + [ + -76.49794042722408, + 8.684663075775143 + ], + [ + -76.772917, + 7.349869 + ], + [ + -76.7730672352163, + 7.349891185228698 + ], + [ + -77.048652, + 6.015095 + ], + [ + -79.04344408324562, + 6.3137616093339 + ], + [ + -79.149165, + 5.801812 + ], + [ + -81.14517890916356, + 6.101267227441673 + ], + [ + -81.228885, + 5.696044 + ], + [ + -83.48216, + 6.034526 + ], + [ + -83.31496513815262, + 6.860908687853661 + ], + [ + -85.311557, + 7.157317 + ], + [ + -85.14665716769447, + 7.977759745443331 + ], + [ + -87.144477, + 8.270916 + ], + [ + -86.85403657822185, + 9.72339714114958 + ], + [ + -86.68993772063489, + 10.549423050691196 + ], + [ + -88.690707, + 10.834841 + ], + [ + -88.52576718029056, + 11.669294060648001 + ], + [ + -90.526731, + 11.951069 + ], + [ + -90.34005098516748, + 12.901458548952418 + ], + [ + -92.343253, + 13.17956 + ], + [ + -92.17739384830693, + 14.025970117783645 + ], + [ + -94.180055, + 14.300203 + ], + [ + -94.01554559858029, + 15.142419859817702 + ], + [ + -95.69426452894497, + 15.369193989221515 + ], + [ + -95.769861, + 15.002771 + ], + [ + -97.77106859905805, + 15.27341191646165 + ], + [ + -97.871467, + 14.786542 + ], + [ + -100.195102, + 15.101629 + ] + ], + [ + [ + -101.496842, + 18.994589 + ], + [ + -99.4890842416381, + 18.73564290048715 + ], + [ + -99.677156, + 17.76359 + ], + [ + -97.320828, + 17.454739 + ], + [ + -97.003814, + 18.983406 + ], + [ + -97.00386336584165, + 18.983412557901485 + ], + [ + -96.726181, + 20.316936 + ], + [ + -99.122849, + 20.629697 + ], + [ + -99.19288699980737, + 20.267572852053316 + ], + [ + -101.199859, + 20.529861 + ], + [ + -101.496842, + 18.994589 + ] + ] + ], + [ + [ + [ + -109.265893, + 19.372919 + ], + [ + -109.583371, + 17.844351 + ], + [ + -111.945059, + 18.152384 + ], + [ + -111.648078, + 19.687809 + ], + [ + -109.265893, + 19.372919 + ] + ] + ], + [ + [ + [ + -90.71481384648023, + 38.12699345159358 + ], + [ + -89.54614191828557, + 38.01095116150775 + ], + [ + -89.461446, + 38.428541 + ], + [ + -87.44393914518027, + 38.228988045446506 + ], + [ + -87.40243875413464, + 38.433237644862274 + ], + [ + -87.402978, + 38.433289 + ], + [ + -87.088773, + 39.963718 + ], + [ + -84.15958, + 39.6815 + ], + [ + -84.4125489739695, + 38.65502845572615 + ], + [ + -83.26509223789854, + 38.54212465651535 + ], + [ + -83.181058, + 38.954714 + ], + [ + -80.293637, + 38.671591 + ], + [ + -80.54313695056494, + 37.64392351753969 + ], + [ + -79.3594216589552, + 37.525471316048375 + ], + [ + -79.31621557937022, + 37.73925367199132 + ], + [ + -79.316738, + 37.739304 + ], + [ + -79.004337, + 39.270012 + ], + [ + -76.98665514798407, + 39.07336616463667 + ], + [ + -76.904029, + 39.477467 + ], + [ + -74.8869486420023, + 39.281527759426766 + ], + [ + -74.825354, + 39.582572 + ], + [ + -71.913298, + 39.30028 + ], + [ + -72.286003, + 37.778643 + ], + [ + -74.29580843727624, + 37.97122243092358 + ], + [ + -74.3210527872029, + 37.86800942129065 + ], + [ + -74.320958, + 37.868 + ], + [ + -74.5653764650578, + 36.849447219062974 + ], + [ + -72.557128, + 36.645666 + ], + [ + -72.87079575072894, + 35.31744897458617 + ], + [ + -72.87069, + 35.317438 + ], + [ + -73.224585, + 33.793883 + ], + [ + -75.23385454049891, + 33.99996922110786 + ], + [ + -75.26094693983968, + 33.88320196552858 + ], + [ + -75.260825, + 33.883189 + ], + [ + -75.609204, + 32.359017 + ], + [ + -77.61823148232216, + 32.57010604466519 + ], + [ + -77.66938151756068, + 32.345772901916376 + ], + [ + -77.669254, + 32.345759 + ], + [ + -78.012211, + 30.820949 + ], + [ + -80.02040876853867, + 31.037270007920295 + ], + [ + -80.07405237403228, + 30.79825779715265 + ], + [ + -80.07392, + 30.798243 + ], + [ + -80.27010261739578, + 29.913467678383153 + ], + [ + -78.263746, + 29.685209 + ], + [ + -78.55606252024144, + 28.354228650911647 + ], + [ + -78.555945, + 28.354215 + ], + [ + -78.84537290507694, + 27.022797436318594 + ], + [ + -78.845268, + 27.022785 + ], + [ + -79.13210668296087, + 25.690955208956908 + ], + [ + -79.132014, + 25.690944 + ], + [ + -79.41654612851282, + 24.358727005188413 + ], + [ + -79.416465, + 24.358717 + ], + [ + -79.741981, + 22.831581 + ], + [ + -82.182082, + 23.12859 + ], + [ + -82.0137350205497, + 24.000234051496854 + ], + [ + -84.024355, + 24.241126 + ], + [ + -83.7673596822297, + 25.570791586911806 + ], + [ + -83.767559, + 25.570815 + ], + [ + -83.57420846270112, + 26.569677100464805 + ], + [ + -85.587244, + 26.801769 + ], + [ + -85.32945111829979, + 28.130844420539592 + ], + [ + -85.329713, + 28.130874 + ], + [ + -85.15646983652286, + 29.021588926872592 + ], + [ + -86.6044760910545, + 29.182270152112643 + ], + [ + -86.339452, + 30.382055 + ], + [ + -88.34353875179835, + 30.607564305499295 + ], + [ + -88.143969, + 31.501628 + ], + [ + -90.15073928990486, + 31.723445378942092 + ], + [ + -89.949968, + 32.61346 + ], + [ + -89.95009099132669, + 32.61347335346651 + ], + [ + -89.646021, + 33.942827 + ], + [ + -91.65467695029679, + 34.15619173597566 + ], + [ + -91.418152, + 35.176083 + ], + [ + -93.4263900476446, + 35.38501396903705 + ], + [ + -93.213825, + 36.289209 + ], + [ + -93.2139436992666, + 36.28922111827927 + ], + [ + -92.896461, + 37.616978 + ], + [ + -92.89656108444849, + 37.61698798867143 + ], + [ + -92.57321, + 38.944104 + ], + [ + -93.45330468561636, + 39.02992624740197 + ], + [ + -93.369182, + 39.44152 + ], + [ + -90.462542, + 39.159025 + ], + [ + -90.71481384648023, + 38.12699345159358 + ] + ] + ], + [ + [ + [ + 144.904173, + 16.649291 + ], + [ + 147.242311, + 16.327881 + ], + [ + 146.9671355306802, + 14.99358606558588 + ], + [ + 146.967136, + 14.993586 + ], + [ + 146.67170021355525, + 13.559116810547001 + ], + [ + 146.37775, + 12.129659 + ], + [ + 144.083182, + 12.450956 + ], + [ + 144.3443331830697, + 13.782347147790649 + ], + [ + 144.344327, + 13.782348 + ], + [ + 144.61453713973094, + 15.163454721665513 + ], + [ + 144.904173, + 16.649291 + ] + ] + ], + [ + [ + [ + -64.27234250754583, + 18.104515136843332 + ], + [ + -62.270742, + 17.834621 + ], + [ + -62.586968, + 16.305734 + ], + [ + -64.5894343243949, + 16.572127564991558 + ], + [ + -64.666017, + 16.20179 + ], + [ + -67.005642, + 16.513503 + ], + [ + -66.83920776971483, + 17.370265318778884 + ], + [ + -68.844811, + 17.63358 + ], + [ + -68.547677, + 19.169116 + ], + [ + -66.54244622804332, + 18.902292432969887 + ], + [ + -66.450028, + 19.379952 + ], + [ + -64.073203, + 19.064494 + ], + [ + -64.27234250754583, + 18.104515136843332 + ] + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "priority": 1.0, + "orbit_pass": "DESCENDING" + }, + "geometry": { + "type": "MultiPolygon", + "coordinates": [ + [ + [ + [ + -156.98049608953517, + 19.301153492225318 + ], + [ + -158.987848, + 19.558146 + ], + [ + -158.7984947739037, + 20.537212794134525 + ], + [ + -160.4109280511417, + 20.740188039096033 + ], + [ + -160.5090080000014, + 20.27177299999891 + ], + [ + -162.90605100000153, + 20.574379999998918 + ], + [ + -162.6490288323307, + 21.904775861542664 + ], + [ + -162.64915100000152, + 21.904790999998987 + ], + [ + -162.35279600000158, + 23.43969499999908 + ], + [ + -160.34435403062042, + 23.187587632351523 + ], + [ + -160.25403700000146, + 23.65530899999909 + ], + [ + -157.80541300000132, + 23.34885299999908 + ], + [ + -158.01181793091814, + 22.369967661312153 + ], + [ + -156.007904, + 22.114757 + ], + [ + -156.18726302478902, + 21.25946143857833 + ], + [ + -154.18462400000115, + 21.000473999998967 + ], + [ + -154.3643410446923, + 20.139918653954812 + ], + [ + -152.362386000001, + 19.877001999998896 + ], + [ + -152.68043200000102, + 18.34850499999881 + ], + [ + -154.6832137302407, + 18.608063297445025 + ], + [ + -154.78083100000117, + 18.138519999998795 + ], + [ + -157.14588500000121, + 18.445809999998815 + ], + [ + -156.98049608953517, + 19.301153492225318 + ] + ] + ], + [ + [ + [ + -116.900919, + 24.441518 + ], + [ + -116.90042510058404, + 24.444063557167073 + ], + [ + -116.893446, + 24.48004 + ], + [ + -116.89344484197434, + 24.480039804066557 + ], + [ + -116.86867300240934, + 24.60771384398063 + ], + [ + -116.868674, + 24.607714 + ], + [ + -116.86356950796977, + 24.634017249953747 + ], + [ + -116.861198, + 24.64624 + ], + [ + -116.86119753751504, + 24.646239921942325 + ], + [ + -116.8364229083181, + 24.773902627735453 + ], + [ + -116.837669, + 24.774097 + ], + [ + -116.80541446126618, + 24.940282916181033 + ], + [ + -116.805415, + 24.940283 + ], + [ + -116.80258912242039, + 24.95483998452064 + ], + [ + -116.797932, + 24.978835 + ], + [ + -116.79793111404456, + 24.978834851217286 + ], + [ + -116.77315510650573, + 25.106463861344142 + ], + [ + -116.773156, + 25.106464 + ], + [ + -116.76900081788025, + 25.12786390912102 + ], + [ + -116.76567, + 25.145022 + ], + [ + -116.76566928527735, + 25.145021880271525 + ], + [ + -116.74088974648393, + 25.27264080597873 + ], + [ + -116.740891, + 25.272641 + ], + [ + -116.73518638428028, + 25.30201411124553 + ], + [ + -116.733402, + 25.311204 + ], + [ + -116.733401608727, + 25.31120393461849 + ], + [ + -116.70861858178299, + 25.43881193543625 + ], + [ + -116.708619, + 25.438812 + ], + [ + -116.7064242695674, + 25.450110466307084 + ], + [ + -116.701128, + 25.477381 + ], + [ + -116.70112699291306, + 25.477380832138632 + ], + [ + -116.67634085106017, + 25.60497982308938 + ], + [ + -116.676342, + 25.60498 + ], + [ + -116.67206252451548, + 25.627004636523505 + ], + [ + -116.668848, + 25.643553 + ], + [ + -116.66884713873833, + 25.643552856809038 + ], + [ + -116.63656, + 25.809721 + ], + [ + -116.251343, + 25.745837 + ], + [ + -115.87573045140614, + 25.68255514502163 + ], + [ + -115.864413, + 25.738907 + ], + [ + -115.433318, + 25.665504 + ], + [ + -115.00184193580043, + 25.590753875355084 + ], + [ + -114.987824, + 25.658051 + ], + [ + -114.62122224830233, + 25.593138073880567 + ], + [ + -114.5781964750687, + 25.815631173815646 + ], + [ + -114.5784, + 25.815655 + ], + [ + -114.40656701799283, + 26.702761924811526 + ], + [ + -116.419217, + 26.934347 + ], + [ + -116.24788698069278, + 27.817324740614605 + ], + [ + -117.72366505288487, + 27.984269092185613 + ], + [ + -117.794407, + 27.660878 + ], + [ + -120.337379, + 27.948942 + ], + [ + -120.07903115334993, + 29.277721624315536 + ], + [ + -120.079332, + 29.277755 + ], + [ + -119.779856, + 30.810983 + ], + [ + -117.76600431871553, + 30.584842275589736 + ], + [ + -117.7430769530651, + 30.70217456829537 + ], + [ + -117.743376, + 30.702207 + ], + [ + -117.54375760817682, + 31.71995850211689 + ], + [ + -119.560173, + 31.93427 + ], + [ + -119.38132081806494, + 32.8354320757446 + ], + [ + -121.396745, + 33.045819 + ], + [ + -121.19442907480436, + 34.06667315209423 + ], + [ + -123.2116, + 34.272991 + ], + [ + -123.02933087722926, + 35.1847211327989 + ], + [ + -125.046832, + 35.387153 + ], + [ + -124.78047880312593, + 36.71374071974656 + ], + [ + -124.780971, + 36.713789 + ], + [ + -124.51231152516962, + 38.039929143120084 + ], + [ + -124.512842, + 38.03998 + ], + [ + -124.199639, + 39.57055 + ], + [ + -121.287599, + 39.288113 + ], + [ + -121.51187381233545, + 38.37254541231225 + ], + [ + -119.502762, + 38.173828 + ], + [ + -119.74971291871361, + 37.14946333039447 + ], + [ + -118.54450747061455, + 37.027731911898826 + ], + [ + -118.460005, + 37.447063 + ], + [ + -116.44267949073974, + 37.24403339552847 + ], + [ + -116.382403, + 37.542917 + ], + [ + -113.550121, + 37.258292 + ], + [ + -113.76546643512938, + 36.354352227434575 + ], + [ + -111.761651, + 36.149276 + ], + [ + -111.97487346660006, + 35.24079026665356 + ], + [ + -109.966344, + 35.03124 + ], + [ + -110.20077850060053, + 34.018904732207254 + ], + [ + -108.88912043683881, + 33.87925931923791 + ], + [ + -108.804212, + 34.308291 + ], + [ + -106.78879368891761, + 34.094443966278455 + ], + [ + -106.76757724909528, + 34.20159612398846 + ], + [ + -106.767996, + 34.201639 + ], + [ + -106.461934, + 35.73338 + ], + [ + -104.44681319154815, + 35.524619107038966 + ], + [ + -104.40262593132547, + 35.745503492191894 + ], + [ + -104.403002, + 35.745541 + ], + [ + -104.13605036187022, + 37.07199828648421 + ], + [ + -104.13655, + 37.072047 + ], + [ + -103.825597, + 38.602935 + ], + [ + -101.80832365329272, + 38.40395331045967 + ], + [ + -101.725605, + 38.810487 + ], + [ + -98.843882, + 38.527177 + ], + [ + -99.16549074389836, + 37.19987203239505 + ], + [ + -99.165391, + 37.199862 + ], + [ + -99.48143979612506, + 35.87194964928443 + ], + [ + -99.481346, + 35.87194 + ], + [ + -99.837743, + 34.348705 + ], + [ + -99.84064286685464, + 34.34899985264641 + ], + [ + -100.10171186459888, + 33.21489738999149 + ], + [ + -100.101578, + 33.214883 + ], + [ + -100.4032901823478, + 31.885228850658514 + ], + [ + -100.403155, + 31.885214 + ], + [ + -100.62711720212536, + 30.885032484081357 + ], + [ + -99.2241669772028, + 30.72788197408642 + ], + [ + -99.17865062927376, + 30.96064834788546 + ], + [ + -99.178953, + 30.960681 + ], + [ + -98.87805, + 32.49349 + ], + [ + -96.8636319014908, + 32.273331145503185 + ], + [ + -96.84105985046004, + 32.38827584910812 + ], + [ + -96.841431, + 32.388315 + ], + [ + -96.57927369162118, + 33.71585076499739 + ], + [ + -96.579683, + 33.715893 + ], + [ + -96.31584415823876, + 35.04301441516588 + ], + [ + -96.316286, + 35.043059 + ], + [ + -96.05002373907946, + 36.36968921963996 + ], + [ + -96.050427, + 36.369729 + ], + [ + -95.78245919025518, + 37.69598368858035 + ], + [ + -95.782981, + 37.696034 + ], + [ + -95.75327043221387, + 37.84044778388717 + ], + [ + -95.741061, + 37.900876 + ], + [ + -95.74084287996756, + 37.90085423109014 + ], + [ + -95.468135, + 39.226402 + ], + [ + -92.57321, + 38.944104 + ], + [ + -92.89656108444849, + 37.61698798867143 + ], + [ + -92.896461, + 37.616978 + ], + [ + -93.2139436992666, + 36.28922111827927 + ], + [ + -93.213825, + 36.289209 + ], + [ + -93.4263900476446, + 35.38501396903705 + ], + [ + -91.418152, + 35.176083 + ], + [ + -91.65467695029679, + 34.15619173597566 + ], + [ + -89.646021, + 33.942827 + ], + [ + -89.95009099132669, + 32.61347335346651 + ], + [ + -89.949968, + 32.61346 + ], + [ + -90.15073928990486, + 31.723445378942092 + ], + [ + -88.143969, + 31.501628 + ], + [ + -88.34353875179835, + 30.607564305499295 + ], + [ + -86.339452, + 30.382055 + ], + [ + -86.63340037780272, + 29.051327637270393 + ], + [ + -86.633273, + 29.051313 + ], + [ + -86.96667, + 27.525284 + ], + [ + -88.97420028732857, + 27.753156817326122 + ], + [ + -89.069771, + 27.314886 + ], + [ + -91.604269, + 27.603435 + ], + [ + -91.43129574231524, + 28.488989935303177 + ], + [ + -92.89043599698809, + 28.65232582117906 + ], + [ + -92.960955, + 28.33175 + ], + [ + -94.96867257618797, + 28.556806988110694 + ], + [ + -95.02266464790934, + 28.310899675439945 + ], + [ + -95.022547, + 28.310886 + ], + [ + -95.31190051607713, + 26.97947651742836 + ], + [ + -95.311795, + 26.979464 + ], + [ + -95.59856887467346, + 25.64764236074018 + ], + [ + -95.598475, + 25.647631 + ], + [ + -95.924559, + 24.120572 + ], + [ + -97.93101587301972, + 24.36034102635524 + ], + [ + -98.003529, + 24.020563 + ], + [ + -100.0094697885234, + 24.26064853429258 + ], + [ + -100.105962, + 23.807851 + ], + [ + -102.11213810646072, + 24.048665875160612 + ], + [ + -102.185866, + 23.702521 + ], + [ + -104.644228, + 23.998142 + ], + [ + -104.47345200000511, + 24.881860042404185 + ], + [ + -106.01026098031433, + 25.063590006377403 + ], + [ + -106.107694, + 24.608505 + ], + [ + -108.1143616993191, + 24.84658662240543 + ], + [ + -108.14469097485342, + 24.704835004707913 + ], + [ + -108.144585, + 24.704822 + ], + [ + -108.42749986682979, + 23.37234261754101 + ], + [ + -108.427407, + 23.372331 + ], + [ + -108.749568, + 21.844633 + ], + [ + -111.173718, + 22.144011 + ], + [ + -111.00557661887163, + 23.0148574828279 + ], + [ + -113.015708, + 23.259138 + ], + [ + -112.82432894629709, + 24.24591484253214 + ], + [ + -114.37481820228146, + 24.431058510946173 + ], + [ + -114.3939045715325, + 24.341968213176077 + ], + [ + -114.391948, + 24.341612 + ], + [ + -114.43092333815105, + 24.159508071796584 + ], + [ + -114.469248, + 23.980261 + ], + [ + -114.902566, + 24.054801 + ], + [ + -115.28037074910871, + 24.118533200769228 + ], + [ + -115.290312, + 24.070541 + ], + [ + -115.741728, + 24.145917 + ], + [ + -116.14413980629716, + 24.21176577577844 + ], + [ + -116.156105, + 24.152007 + ], + [ + -116.55198, + 24.215399 + ], + [ + -116.93316, + 24.275319 + ], + [ + -116.9009189178707, + 24.441517987122708 + ], + [ + -116.900919, + 24.441518 + ] + ] + ], + [ + [ + [ + -99.122849, + 20.629697 + ], + [ + -96.726181, + 20.316936 + ], + [ + -97.00386336584165, + 18.983412557901485 + ], + [ + -97.003814, + 18.983406 + ], + [ + -97.320828, + 17.454739 + ], + [ + -99.677156, + 17.76359 + ], + [ + -99.4890842416381, + 18.73564290048715 + ], + [ + -101.496842, + 18.994589 + ], + [ + -101.199859, + 20.529861 + ], + [ + -99.19288699980737, + 20.267572852053316 + ], + [ + -99.122849, + 20.629697 + ] + ] + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/index.html b/src/index.html index 4767472ed..cf9adce63 100644 --- a/src/index.html +++ b/src/index.html @@ -28,7 +28,9 @@ + + diff --git a/src/styles.scss b/src/styles.scss index 65a075f49..6ab931060 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -492,6 +492,7 @@ ul { } } +.displacement-slider.noUi-horizontal, .sbas-column-2.noUi-horizontal { height: 8px; @@ -511,6 +512,10 @@ ul { font-size: 13px; top: 17px; } + + .noUi-tooltip { + font-size: 14px; + } } .tick > line { @@ -782,6 +787,18 @@ $d-height: 550px; max-width: 25%; } +.fx-80 { + flex: 1 1 100%; + box-sizing: border-box; + max-width: 80%; +} + +.fx-20 { + flex: 1 1 100%; + box-sizing: border-box; + max-width: 20%; +} + .fx-row-center { flex-direction: row; box-sizing: border-box; @@ -833,3 +850,10 @@ $d-height: 550px; .breadcrumb-list .mat-mdc-form-field { margin-top: -2px; } + +.ts-best-fit-formulas { + .cdk-virtual-scrollable { + overflow-y: clip; + overflow-x: auto; + } +} diff --git a/src/styles/_variables.scss b/src/styles/_variables.scss index b950334bd..3eb3acc41 100644 --- a/src/styles/_variables.scss +++ b/src/styles/_variables.scss @@ -1,7 +1,7 @@ // variables -$asf-font-size: '16px'; -$asf-line-height: '17px'; +$asf-font-size: 16px; +$asf-line-height: 17px; $asf-ribbon-icon-size: 18px; $uaf-primary-blue: #236192; diff --git a/src/styles/deluxe-menu-2.scss b/src/styles/deluxe-menu-2.scss index ba15285e7..deea2ceab 100644 --- a/src/styles/deluxe-menu-2.scss +++ b/src/styles/deluxe-menu-2.scss @@ -205,8 +205,6 @@ $light-grey: rgb(0 0 0 / 60%); } padding-top: 22px; font-size: 12px; - - } .hyp3-icon { diff --git a/tsconfig.json b/tsconfig.json index 5f3231341..4c60e108d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,33 +1,48 @@ -/* - This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience. - It is not intended to be used to perform a compilation. - To learn more about this file see: https://angular.io/config/solution-tsconfig. -*/ { - "files": [], - "references": [ - { - "path": "./src/tsconfig.app.json", - }, - { - "path": "./src/tsconfig.spec.json" - }, - { - "path": "./e2e/tsconfig.e2e.json" - } - ], - "include": [ - ".eslintrc.js", - ], + "compileOnSave": false, + "angularCompilerOptions": { + "strictTemplates": true + }, "compilerOptions": { "baseUrl": "./", - "outDir": "./dist/search-ui", + "outDir": "./dist/out-tsc", "sourceMap": true, "declaration": false, - "downlevelIteration": true, - "experimentalDecorators": true, "moduleResolution": "node", - "importHelpers": true, - } + "experimentalDecorators": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "typeRoots": [ + "node_modules/@types" + ], + "esModuleInterop": true, + "target": "ES2022", + "module": "ES2022", + "useDefineForClassFields": false, + "lib": [ + "ES2022", + "dom" + ], + "paths": { + "@components": ["src/app/components"], + "@services": ["src/app/services"], + "@pipes": ["src/app/pipes"], + "@models": ["src/app/models"], + "@directives": ["src/app/directives"], + "@store": ["src/app/store"], + "@shared": ["src/app/shared"], + "@environments": ["src/environments"], + "@testing": ["src/app/testing"], + "@components/*": ["src/app/components/*"], + "@services/*": ["src/app/services/*"], + "@pipes/*": ["src/app/pipes/*"], + "@models/*": ["src/app/models/*"], + "@directives/*": ["src/app/directives/*"], + "@store/*": ["src/app/store/*"], + "@shared/*": ["src/app/shared/*"], + "@environments/*": ["src/environments/*"], + "@testing/*": ["src/app/testing/*"] + }, + } }