From b8f074e6ac8933618eb150053a5a63f33846c623 Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Fri, 12 Jul 2024 12:09:30 -0700 Subject: [PATCH 01/13] WIP --- .../timeseries-results-menu.component.scss | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 index daadc9fa0..c436b94ba 100644 --- 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 @@ -11,8 +11,7 @@ .ts-chart-card { box-shadow: none; height: 100%; - width: 100%; - flex: 1 1 100%; + flex: 1 1 auto; box-sizing: border-box; } @@ -61,8 +60,7 @@ } .ts-layer-list { - flex-basis: 500px; - flex-grow: 0; + flex: 1 1 500px; } .ts-layer-list-header { From 94574b2f31424ad82ad47ce06a7c29a6013905b7 Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Mon, 15 Jul 2024 15:56:04 -0700 Subject: [PATCH 02/13] A good first draft A better starting place for an alternate Search Type menu. --- .../search-type-selector.component.html | 164 +++++++++--------- .../search-type-selector.component.scss | 16 ++ .../search-type-selector.component.ts | 7 - 3 files changed, 97 insertions(+), 90 deletions(-) diff --git a/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.html b/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.html index 8fafe448a..6f8cc9400 100644 --- a/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.html +++ b/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.html @@ -20,25 +20,71 @@
- -
-
-
- Search Types + + + + + + + + + + + + + + + + + + + @for(type of searchTypeSelectors.search; track type.nameKey; let last = $last) { + +
+
+
+ {{ type.nameKey | translate}} +
+
+ + {{ key | translate }} + +
+ + + + +
+
+ + {{ type.icon}} + + +
-
- A collection of different search types available for perusal. + @if(!last) { +
+ } +
+ } +
+ +
+
+
+ {{'DERIVED_DATASETS' | translate }} +
+
+ {{'DERIVED_DATASETS_CONTAIN_A_COLLECTION_OF_DATASETS_AVAILABLE_TO_VIEW_AND_DOWNLOAD'| translate }} +
+
+
+ {{ 'DATASET_LINKED' | translate }}
-
- - search - -
-
-
-
+ +
@@ -46,57 +92,14 @@ Tools
- A collection of different tools available for refining searches. + A collection of different tools available for refining searches: + SBAS, Baseline, Time Series, and On Demand Products
- gear - -
-
- -
- - -
-
-
- {{'ON_DEMAND_PRODUCTS' | translate}} - -
-
- {{'ON_DEMAND_SEARCH_ALLOWS_YOU_TO_VIEW_YOUR_SUBMITTED_ON_DEMAND_JOBS' | translate}} -
- - - - -
-
- -
-
- - -
- - -
-
-
- {{'DERIVED_DATASETS' | translate }} -
-
- {{'DERIVED_DATASETS_CONTAIN_A_COLLECTION_OF_DATASETS_AVAILABLE_TO_VIEW_AND_DOWNLOAD'| translate }} -
-
-
- {{ 'DATASET_LINKED' | translate }} + construction +
@@ -132,8 +135,8 @@ - - @for(type of searchTypeSelectors.search; track type.nameKey; let last = $last) { + + @for(type of searchTypeSelectors.tools; track type.nameKey; let last = $last) {
@@ -163,38 +166,33 @@
} - - - @for(type of searchTypeSelectors.tools; track type.nameKey; let last = $last) { - +
+
- {{ type.nameKey | translate}} + {{'ON_DEMAND_PRODUCTS' | translate}} +
- - {{ key | translate }} - + {{'ON_DEMAND_SEARCH_ALLOWS_YOU_TO_VIEW_YOUR_SUBMITTED_ON_DEMAND_JOBS' | translate}}
- - + +
- - {{ type.icon}} - - +
- @if(!last) { -
- } - } + - \ No newline at end of file + 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..7d720d392 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 @@ -20,6 +20,11 @@ padding: 0; } +.category-hr { + padding: 0; + border-top: 2px solid; +} + .mat-mdc-menu-item { padding: 0; } @@ -28,10 +33,21 @@ display: flex; } +.menu-item-inner { + min-width: 580px; +} + +.menu-item-content { + min-width: 450px; +} + .item-title { font-weight: bold; } +.item-content { +} + .mat-mdc-card-actions { padding: 0; margin: 0; 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 2629d4c71..2996fa76e 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 @@ -102,13 +102,6 @@ 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, } ]}; From 756054b5f4e700e9fca673b3412e034d3a8327fc Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Mon, 15 Jul 2024 16:18:30 -0700 Subject: [PATCH 03/13] Alignment tweaks needed when seen on the server --- .../search-type-selector.component.html | 6 +++--- .../search-type-selector.component.scss | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.html b/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.html index 6f8cc9400..f5e23f765 100644 --- a/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.html +++ b/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.html @@ -62,10 +62,10 @@ - @if(!last) { -
- } + @if(!last) { +
+ } }
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 7d720d392..27dadad3b 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 @@ -34,13 +34,17 @@ } .menu-item-inner { - min-width: 580px; + width: calc(100% - 20px); } .menu-item-content { min-width: 450px; } +.menu-item-aside { + min-width: 130px; +} + .item-title { font-weight: bold; } From 937a53fee5b339ee13ceeea496648691ece4512c Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Mon, 15 Jul 2024 16:34:27 -0700 Subject: [PATCH 04/13] Tweak - differences between local and real host --- .../search-type-selector/search-type-selector.component.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 27dadad3b..0634fb53e 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 @@ -34,7 +34,7 @@ } .menu-item-inner { - width: calc(100% - 20px); + width: calc(100% - 20px) !important; } .menu-item-content { @@ -42,7 +42,7 @@ } .menu-item-aside { - min-width: 130px; + //min-width: 130px; } .item-title { From 00f821466e85bc48372c98f982b7b4c21115d597 Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Thu, 18 Jul 2024 16:45:40 -0700 Subject: [PATCH 05/13] WIP --- .../docs-modal/docs-modal.component.html | 2 +- .../docs-modal/docs-modal.component.scss | 5 +++ .../shared/docs-modal/docs-modal.component.ts | 2 +- .../search-type-selector.component.html | 34 +++++++++---------- .../search-type-selector.component.scss | 15 ++++++-- .../search-type-selector.component.ts | 34 ++++++++++++++++++- src/index.html | 1 + src/styles.scss | 12 +++++++ src/styles/deluxe-menu-2.scss | 2 -- 9 files changed, 81 insertions(+), 26 deletions(-) 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..24770f6ab 100644 --- a/src/app/components/shared/docs-modal/docs-modal.component.html +++ b/src/app/components/shared/docs-modal/docs-modal.component.html @@ -5,6 +5,6 @@ - {{ 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..1db25789d 100644 --- a/src/app/components/shared/docs-modal/docs-modal.component.scss +++ b/src/app/components/shared/docs-modal/docs-modal.component.scss @@ -4,6 +4,11 @@ cursor: pointer; } +.icon-size { + height: 16px !important; + line-height: 16px !important; +} + .text-link { @include themify($themes) { color: themed('blue-link'); 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..5b53f4821 100644 --- a/src/app/components/shared/docs-modal/docs-modal.component.ts +++ b/src/app/components/shared/docs-modal/docs-modal.component.ts @@ -38,7 +38,7 @@ 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() tooltip: string; public docURL: string; public safeDocURL: any; diff --git a/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.html b/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.html index f5e23f765..6a67d223c 100644 --- a/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.html +++ b/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.html @@ -22,7 +22,7 @@
- + @@ -30,7 +30,7 @@ - + @@ -41,21 +41,18 @@ @for(type of searchTypeSelectors.search; track type.nameKey; let last = $last) {
-
+
{{ type.nameKey | translate}}
{{ key | translate }} +
- - - -
-
+
{{ type.icon}} @@ -70,7 +67,7 @@
-
+
{{'DERIVED_DATASETS' | translate }}
@@ -78,7 +75,7 @@ {{'DERIVED_DATASETS_CONTAIN_A_COLLECTION_OF_DATASETS_AVAILABLE_TO_VIEW_AND_DOWNLOAD'| translate }}
-
+
{{ 'DATASET_LINKED' | translate }}
@@ -87,7 +84,7 @@
-
+
Tools
@@ -96,7 +93,7 @@ SBAS, Baseline, Time Series, and On Demand Products
-
+
construction @@ -111,7 +108,7 @@ (click)="onOpenDerivedDataset(dataset.info_url, dataset.name); $event.stopPropagation();">
-
+
{{ dataset.name | translate }}
@@ -125,7 +122,7 @@ mat-button>{{ 'DOWNLOAD' | translate }}
-
+
@@ -139,7 +136,7 @@ @for(type of searchTypeSelectors.tools; track type.nameKey; let last = $last) {
-
+
{{ type.nameKey | translate}}
@@ -153,7 +150,7 @@
-
+
{{ type.icon}} @@ -170,7 +167,7 @@
-
+
{{'ON_DEMAND_PRODUCTS' | translate}}
-
+
@@ -194,5 +191,6 @@ +
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 0634fb53e..283a7324e 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; } @@ -35,10 +38,11 @@ .menu-item-inner { width: calc(100% - 20px) !important; + margin: 5px 5px 15px 15px; } .menu-item-content { - min-width: 450px; + min-width: 400px; } .menu-item-aside { @@ -202,7 +206,6 @@ } } - .login-prompt { font-style: italic; } @@ -210,3 +213,9 @@ .login-hidden { display: none; } + +.read-more-icon { + margin-top: 1px; + margin-left: 5px; + position: absolute; +} 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 2996fa76e..31b1f7ee5 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 @@ -67,8 +67,40 @@ export class SearchTypeSelectorComponent implements OnInit, OnDestroy { helpUrl:'https://docs.asf.alaska.edu/vertex/manual/#event-search-options', icon:'volcano', iconType: models.IconType.MATERIAL, + }, + { + searchType: models.SearchType.TIMESERIES, + nameKey:'TIMESERIES', + 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:[ + '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:'assets/icons/baseline-chart.jpg', + iconType: models.IconType.IMAGE, + }, { + 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, } - ], + ], 'tools':[ { diff --git a/src/index.html b/src/index.html index 4767472ed..84eed27cd 100644 --- a/src/index.html +++ b/src/index.html @@ -28,6 +28,7 @@ + diff --git a/src/styles.scss b/src/styles.scss index 5a38983b9..de432cbba 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -781,6 +781,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; 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 { From e07c8d32ceaa7345785d83602e553fdc81e10b01 Mon Sep 17 00:00:00 2001 From: ASF Discovery Machine User <60239462+ASF-Discovery@users.noreply.github.com> Date: Fri, 19 Jul 2024 14:54:32 -0800 Subject: [PATCH 06/13] Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state --- src/assets/i18n/en.json | 2 ++ src/assets/i18n/es.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index b622c5eb8..b388ca772 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -216,6 +216,7 @@ "DEVELOPER": "Developer", "DIRECTION": "Direction", "DISABLE": "Disable", + "DISPLACEMENT": "Some nice description for Displacement goes here.", "DISPLAYED_IF_YOU_WISH_TO_UNDO_THIS_ACTION": "displayed if you wish to undo this action.", "DISPLAYED_IN_THE_SEARCH_MENU_AT_THE_TOP_YOU_CAN_ACCESS_ALL_OF_THE_HIDDEN_FILTERS_BY": "displayed in the search menu at the top. You can access all of the hidden filters by", "DONE": "Done", @@ -623,6 +624,7 @@ "REMOVE_JOB": "Remove job", "REMOVE_RED_EYE": "remove_red_eye", "REMOVE_SCENE_FILES_FROM_DOWNLOADS": "Remove scene files from downloads", + "REQUEUE_PROJECT": "Add Project to Queue", "RESAMPLED_DEM_SRTM_OR_NED_USED_FOR_RTC_PROCESSING": "Resampled DEM (SRTM or NED) used for RTC processing.", "RESET_TO_DEFAULT": "Reset to Default", "RESTORE": "Restore", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 1f03620e7..9decefb7d 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -219,6 +219,7 @@ "DEVELOPER": "Desarrollador", "DIRECTION": "Dirección", "DISABLE": "Desactivar", + "DISPLACEMENT": "Una buena descripción de Desplazamiento va aquí.", "DISPLAYED_IF_YOU_WISH_TO_UNDO_THIS_ACTION": "aparecerá si desea deshacer esta acción.", "DISPLAYED_IN_THE_SEARCH_MENU_AT_THE_TOP_YOU_CAN_ACCESS_ALL_OF_THE_HIDDEN_FILTERS_BY": "que se muestra en el menú de búsqueda en la parte superior. ", "DONE": "Hecho", @@ -625,6 +626,7 @@ "REMOVE_JOB": "Quitar trabajo", "REMOVE_RED_EYE": "quitar_ojo_rojo", "REMOVE_SCENE_FILES_FROM_DOWNLOADS": "Eliminar archivos de escena de las descargas", + "REQUEUE_PROJECT": "Agregar proyecto a la lista", "RESAMPLED_DEM_SRTM_OR_NED_USED_FOR_RTC_PROCESSING": "DEM remuestreado (SRTM o NED) utilizado para el procesamiento de RTC.", "RESET_TO_DEFAULT": "Restablecen a los predeterminados", "RESTORE": "Restaurar", From 8b555d7939b610d41859546acde1abc14859e959 Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Fri, 19 Jul 2024 16:04:04 -0700 Subject: [PATCH 07/13] WIP --- .../components/header/header.component.html | 2 +- .../results-menu/results-menu.component.html | 4 +- .../scenes-list/scenes-list.component.html | 2 +- .../timeseries-results-menu.component.html | 2 +- .../timeseries-results-menu.component.ts | 30 ++-- .../search-type-selector.component.html | 164 +++++------------- .../search-type-selector.component.scss | 7 +- .../search-type-selector.component.ts | 55 +++--- src/app/models/search-type.model.ts | 4 +- 9 files changed, 97 insertions(+), 173 deletions(-) diff --git a/src/app/components/header/header.component.html b/src/app/components/header/header.component.html index a2d89a2e6..de31a757c 100644 --- a/src/app/components/header/header.component.html +++ b/src/app/components/header/header.component.html @@ -13,7 +13,7 @@ - + diff --git a/src/app/components/results-menu/results-menu.component.html b/src/app/components/results-menu/results-menu.component.html index f7514c19b..0eedc6fef 100644 --- a/src/app/components/results-menu/results-menu.component.html +++ b/src/app/components/results-menu/results-menu.component.html @@ -39,13 +39,13 @@ searchType !== SearchTypes.BASELINE && searchType !== SearchTypes.SBAS && searchType !== SearchTypes.SARVIEWS_EVENTS && - searchType !== SearchTypes.TIMESERIES + searchType !== SearchTypes.DISPLACEMENT " [class.small-size]="breakpoint === breakpoints.SMALL" [resize$]="resize$"> - +
diff --git a/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.html b/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.html index 2edb5cacc..7ef02a11a 100644 --- a/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.html +++ b/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.html @@ -75,7 +75,7 @@
- {{ 'TIMESERIES FILTERS' | translate }}more_horiz + {{ 'DISPLACEMENT FILTERS' | translate }}more_horiz
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 index 79a852767..14bac979a 100644 --- 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 @@ -79,63 +79,63 @@ export class TimeseriesResultsMenuComponent implements OnInit, OnDestroy { groupId: "string", isUnzippedFile: false, isDummyProduct: false, - + metadata: { date: moment(), stopDate: moment(), 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, // ALOS PALSAR faradayRotation: null, offNadirAngle: null, - + // AVNIR-2 instrument: null, pointingAngle: null, - + // UAVSAR missionName: null, - + // AIRSAR flightLine: null, - + // Baseline perpendicular: null, temporal: null, canInSAR: false, - + // SLC BURST burst: null, - + // OPERA-S1 opera: null, - + fileName: null, job:null, - + // versioning pgeVersion: null, - + // BURST XML, OPERA-S1 subproducts: [], parentID: "", - + // ARIA S1 GUNW ariaVersion: null, } } ], - "searchType": SearchType.TIMESERIES + "searchType": SearchType.DISPLACEMENT })) this.pointHistoryService.history$.subscribe(history => { this.pointHistory = history; diff --git a/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.html b/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.html index 6a67d223c..deea91c3a 100644 --- a/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.html +++ b/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.html @@ -20,86 +20,73 @@
- - - - - - - - - - - - - - - - - - - @for(type of searchTypeSelectors.search; track type.nameKey; let last = $last) { - -
-
-
- {{ type.nameKey | translate}} -
-
- - {{ key | translate }} - - -
-
-
- - {{ type.icon}} - - -
-
- - @if(!last) { -
- } - } -
- + @for(type of searchTypeSelectors.search; track type.nameKey; let last = $last) { +
- {{'DERIVED_DATASETS' | translate }} + {{ type.nameKey | translate}}
- {{'DERIVED_DATASETS_CONTAIN_A_COLLECTION_OF_DATASETS_AVAILABLE_TO_VIEW_AND_DOWNLOAD'| translate }} + + {{ key | translate }} + +
- {{ 'DATASET_LINKED' | translate }} + + {{ type.icon}} + +
- -
- + @if(!last) { +
+ } + } +
+
- Tools + {{'ON_DEMAND_PRODUCTS' | translate}} +
- A collection of different tools available for refining searches: - SBAS, Baseline, Time Series, and On Demand Products + {{'ON_DEMAND_SEARCH_ALLOWS_YOU_TO_VIEW_YOUR_SUBMITTED_ON_DEMAND_JOBS' | translate}} + +
- - construction - +
+ +
+ +
+
+
+ {{'DERIVED_DATASETS' | translate }} +
+
+ {{'DERIVED_DATASETS_CONTAIN_A_COLLECTION_OF_DATASETS_AVAILABLE_TO_VIEW_AND_DOWNLOAD'| translate }} +
+
+
+ {{ 'DATASET_LINKED' | translate }} +
+
+ +
@@ -131,66 +118,5 @@
- - - @for(type of searchTypeSelectors.tools; track type.nameKey; let last = $last) { - -
-
-
- {{ type.nameKey | translate}} -
-
- - {{ key | translate }} - -
- - - - -
-
- - {{ type.icon}} - - -
-
- @if(!last) { -
- } - - } - -
- -
-
-
- {{'ON_DEMAND_PRODUCTS' | translate}} - -
-
- {{'ON_DEMAND_SEARCH_ALLOWS_YOU_TO_VIEW_YOUR_SUBMITTED_ON_DEMAND_JOBS' | 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 283a7324e..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 @@ -71,7 +71,7 @@ } .limitTextHeight { - height: 37px; + height: 55px; overflow: hidden; } @@ -215,7 +215,6 @@ } .read-more-icon { - margin-top: 1px; - margin-left: 5px; - position: absolute; + 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 31b1f7ee5..37d6e1021 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 @@ -53,59 +53,58 @@ 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.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, }, { - searchType: models.SearchType.TIMESERIES, - nameKey:'TIMESERIES', + searchType: models.SearchType.SBAS, + nameKey:'SBAS', descriptionKeys:[ - 'BASELINE_SEARCH_PROVIDES_VISUALIZATION_OF_PERPENDICULAR_AND_TEMPORAL_BASELINE_DATA_FOR_A_CHOSEN', + '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/#baseline-search-options', - icon:'zoom', - iconType: models.IconType.MATERIAL, + 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', - 'REFERENCE_SCENE', ], helpUrl:'https://docs.asf.alaska.edu/vertex/manual/#baseline-search-options', icon:'assets/icons/baseline-chart.jpg', iconType: models.IconType.IMAGE, - }, { - 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.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, + }, + { + searchType: models.SearchType.DISPLACEMENT, + nameKey:'DISPLACEMENT', + descriptionKeys:['DISPLACEMENT_DESCRIPTION'], + helpUrl:'https://docs.asf.alaska.edu/vertex/manual/#baseline-search-options', + icon:'history_toggle_off', + iconType: models.IconType.MATERIAL, + }, ], 'tools':[ { - searchType: models.SearchType.TIMESERIES, - nameKey:'TIMESERIES', + searchType: models.SearchType.DISPLACEMENT, + nameKey:'DISPLACEMENT', descriptionKeys:[ 'BASELINE_SEARCH_PROVIDES_VISUALIZATION_OF_PERPENDICULAR_AND_TEMPORAL_BASELINE_DATA_FOR_A_CHOSEN', 'REFERENCE_SCENE', diff --git a/src/app/models/search-type.model.ts b/src/app/models/search-type.model.ts index c8d3906eb..80b171afd 100644 --- a/src/app/models/search-type.model.ts +++ b/src/app/models/search-type.model.ts @@ -4,7 +4,7 @@ export enum SearchType { BASELINE = 'Baseline Search', SBAS = 'SBAS Search', CUSTOM_PRODUCTS = 'On Demand', - TIMESERIES = 'TIMESERIES', + DISPLACEMENT = 'DISPLACEMENT', SARVIEWS_EVENTS = 'Event Search', DERIVED_DATASETS = 'Derived Datasets', } @@ -13,7 +13,7 @@ export const SearchTypeTranslation = { 'Geographic Search' : 'GEOGRAPHIC_SEARCH', 'List Search' : 'LIST_SEARCH', 'Baseline Search' : 'BASELINE_SEARCH', - 'Timeseries Tool' : 'TIMESERIES_TOOL', + 'Timeseries Tool' : 'DISPLACEMENT_TOOL', 'SBAS Search' : 'SBAS_SEARCH', 'On Demand' : 'ON_DEMAND', 'Event Search' : 'EVENT_SEARCH', From 1d6edc17e8c35deecef9c9291de4cbbdb00eae22 Mon Sep 17 00:00:00 2001 From: ASF Discovery Machine User <60239462+ASF-Discovery@users.noreply.github.com> Date: Fri, 19 Jul 2024 15:08:15 -0800 Subject: [PATCH 08/13] Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state --- src/assets/i18n/en.json | 6 +++--- src/assets/i18n/es.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 27a6f7053..91c921334 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -216,7 +216,8 @@ "DEVELOPER": "Developer", "DIRECTION": "Direction", "DISABLE": "Disable", - "DISPLACEMENT": "Some nice description for Displacement goes here.", + "DISPLACEMENT": "Displacement", + "DISPLACEMENT_DESCRIPTION": "Some nice description for Displacement goes here.", "DISPLAYED_IF_YOU_WISH_TO_UNDO_THIS_ACTION": "displayed if you wish to undo this action.", "DISPLAYED_IN_THE_SEARCH_MENU_AT_THE_TOP_YOU_CAN_ACCESS_ALL_OF_THE_HIDDEN_FILTERS_BY": "displayed in the search menu at the top. You can access all of the hidden filters by", "DONE": "Done", @@ -632,7 +633,6 @@ "RESTRICTED_DATA_USE_AGREEMENT": "Restricted Data Use Agreement", "RESUBMIT_JOB": "Resubmit Job", "RESUBMIT_PROJECT": "Resubmit Project", - "REQUEUE_PROJECT": "Add Project to Queue", "RESULTS_TO_ON_DEMAND_QUEUE": "results to On Demand queue", "RESULTS_WILL_NOW_CONTAIN_ONLY_SCENES_WITH_THE_SAME_PATH_AND_FRAME": "results will now contain only scenes with the same path and frame.", "REVIEW": "Review", @@ -917,4 +917,4 @@ "ZOOM_TO_FIT": "Zoom To Fit", "ZOOM_TO_RESULTS": "Zoom to results", "ZOOM_TO_SCENE": "Zoom to scene" -} +} \ No newline at end of file diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index d33818a62..0ce7a8535 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -219,7 +219,8 @@ "DEVELOPER": "Desarrollador", "DIRECTION": "Dirección", "DISABLE": "Desactivar", - "DISPLACEMENT": "Una buena descripción de Desplazamiento va aquí.", + "DISPLACEMENT": "Desplazamiento", + "DISPLACEMENT_DESCRIPTION": "Una buena descripción de Desplazamiento va aquí.", "DISPLAYED_IF_YOU_WISH_TO_UNDO_THIS_ACTION": "aparecerá si desea deshacer esta acción.", "DISPLAYED_IN_THE_SEARCH_MENU_AT_THE_TOP_YOU_CAN_ACCESS_ALL_OF_THE_HIDDEN_FILTERS_BY": "que se muestra en el menú de búsqueda en la parte superior. ", "DONE": "Hecho", @@ -634,7 +635,6 @@ "RESTRICTED_DATA_USE_AGREEMENT": "Acuerdo de Uso de Datos Restringidos", "RESUBMIT_JOB": "Reenviar trabajo...", "RESUBMIT_PROJECT": "Reenviar Proyecto", - "REQUEUE_PROJECT": "Agregar proyecto a la cola", "RESULTS_TO_ON_DEMAND_QUEUE": "resultados a la lista On Demand", "RESULTS_WILL_NOW_CONTAIN_ONLY_SCENES_WITH_THE_SAME_PATH_AND_FRAME": "los resultados ahora contendrán solo escenas con la misma ruta y marco.", "REVIEW": "Revisar", @@ -917,4 +917,4 @@ "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 From b0bd4c0b437fd96a4a2dc28870ccb2a65d97beda Mon Sep 17 00:00:00 2001 From: ASF Discovery Machine User <60239462+ASF-Discovery@users.noreply.github.com> Date: Fri, 19 Jul 2024 15:19:47 -0800 Subject: [PATCH 09/13] Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state --- src/assets/i18n/en.json | 2 +- src/assets/i18n/es.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 91c921334..0e9696c8f 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -217,7 +217,7 @@ "DIRECTION": "Direction", "DISABLE": "Disable", "DISPLACEMENT": "Displacement", - "DISPLACEMENT_DESCRIPTION": "Some nice description for Displacement goes here.", + "DISPLACEMENT_DESCRIPTION": "Some nice description for Displacement goes here. Blah, blah, blah, and more blah, blah blah to occupy space.", "DISPLAYED_IF_YOU_WISH_TO_UNDO_THIS_ACTION": "displayed if you wish to undo this action.", "DISPLAYED_IN_THE_SEARCH_MENU_AT_THE_TOP_YOU_CAN_ACCESS_ALL_OF_THE_HIDDEN_FILTERS_BY": "displayed in the search menu at the top. You can access all of the hidden filters by", "DONE": "Done", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 0ce7a8535..41e26b58f 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -220,7 +220,7 @@ "DIRECTION": "Dirección", "DISABLE": "Desactivar", "DISPLACEMENT": "Desplazamiento", - "DISPLACEMENT_DESCRIPTION": "Una buena descripción de Desplazamiento va aquí.", + "DISPLACEMENT_DESCRIPTION": "Una buena descripción de Desplazamiento va aquí. Bla, bla, bla, y más bla, bla bla para ocupar espacio.", "DISPLAYED_IF_YOU_WISH_TO_UNDO_THIS_ACTION": "aparecerá si desea deshacer esta acción.", "DISPLAYED_IN_THE_SEARCH_MENU_AT_THE_TOP_YOU_CAN_ACCESS_ALL_OF_THE_HIDDEN_FILTERS_BY": "que se muestra en el menú de búsqueda en la parte superior. ", "DONE": "Hecho", From bcb0f4a917d448aa0a10bec7e9a2c385012544fa Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Fri, 19 Jul 2024 16:27:14 -0700 Subject: [PATCH 10/13] WIP --- .../search-type-selector/search-type-selector.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 37d6e1021..db45ee6cf 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 @@ -96,7 +96,7 @@ export class SearchTypeSelectorComponent implements OnInit, OnDestroy { nameKey:'DISPLACEMENT', descriptionKeys:['DISPLACEMENT_DESCRIPTION'], helpUrl:'https://docs.asf.alaska.edu/vertex/manual/#baseline-search-options', - icon:'history_toggle_off', + icon:'track_changes', iconType: models.IconType.MATERIAL, }, ], From 9359c7880c3a0ab4937f5619bf6da9890eba954d Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Fri, 19 Jul 2024 16:29:51 -0700 Subject: [PATCH 11/13] WIP --- .../search-type-selector.component.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 db45ee6cf..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 @@ -83,14 +83,6 @@ export class SearchTypeSelectorComponent implements OnInit, OnDestroy { icon:'assets/icons/baseline-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, - }, { searchType: models.SearchType.DISPLACEMENT, nameKey:'DISPLACEMENT', @@ -99,6 +91,14 @@ export class SearchTypeSelectorComponent implements OnInit, OnDestroy { 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':[ From 6a74a2e6091c71875cc20ee92bae63c6b202ef4c Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Thu, 25 Jul 2024 13:27:04 -0700 Subject: [PATCH 12/13] Merge Clean-up --- .../filters-dropdown/filters-dropdown.component.html | 6 +++--- .../map/map-controls/map-controls.component.html | 2 +- .../draw-selector/draw-selector.component.html | 2 +- .../full-burst-selector.component.html | 4 ++-- src/app/services/search-params.service.ts | 2 +- src/app/store/scenes/scenes.action.ts | 2 +- src/app/store/search/search.action.ts | 4 ++-- src/app/store/search/search.effect.ts | 12 ++++++------ src/app/store/search/search.reducer.ts | 2 +- src/app/store/user/user.effect.ts | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/app/components/filters-dropdown/filters-dropdown.component.html b/src/app/components/filters-dropdown/filters-dropdown.component.html index e7b0df435..45fb71ca7 100644 --- a/src/app/components/filters-dropdown/filters-dropdown.component.html +++ b/src/app/components/filters-dropdown/filters-dropdown.component.html @@ -34,8 +34,8 @@ {{ 'EVENT_SEARCH' | translate }} - @if(selectedSearchType === searchTypes.TIMESERIES) { - {{ 'TIMESERIES_SEARCH' | translate }} + @if(selectedSearchType === searchTypes.DISPLACEMENT) { + {{ 'DISPLACEMENT_SEARCH' | translate }} }
@@ -66,7 +66,7 @@ - @if(selectedSearchType === searchTypes.TIMESERIES) { + @if(selectedSearchType === searchTypes.DISPLACEMENT) { }
diff --git a/src/app/components/map/map-controls/map-controls.component.html b/src/app/components/map/map-controls/map-controls.component.html index 2436efd18..3a2396e02 100644 --- a/src/app/components/map/map-controls/map-controls.component.html +++ b/src/app/components/map/map-controls/map-controls.component.html @@ -49,7 +49,7 @@
-
+
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 29cfb3f37..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,7 +28,7 @@ place {{ 'PLACE_A_POINT' | translate }} - @if(searchType !== searchTypes.TIMESERIES) { + @if(searchType !== searchTypes.DISPLACEMENT) {