From 4898cc865f79edf1605682fdf697b97956de8b45 Mon Sep 17 00:00:00 2001 From: ASF Discovery Machine User <60239462+ASF-Discovery@users.noreply.github.com> Date: Thu, 13 Mar 2025 20:45:03 -0800 Subject: [PATCH 1/6] 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 From ff7ccc5e3ac992fa71991dc644eec2918da2fca3 Mon Sep 17 00:00:00 2001 From: William Horn Date: Sat, 15 Mar 2025 11:36:17 -0800 Subject: [PATCH 2/6] fix users with trouble loading results --- src/app/store/scenes/scenes.reducer.ts | 2 +- src/app/store/search/search.effect.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/store/scenes/scenes.reducer.ts b/src/app/store/scenes/scenes.reducer.ts index ac1e387dc..035d06338 100644 --- a/src/app/store/scenes/scenes.reducer.ts +++ b/src/app/store/scenes/scenes.reducer.ts @@ -168,7 +168,7 @@ export function scenesReducer(state = initState, action: ScenesActions): ScenesS ...jobProduct.metadata.job?.job_parameters, } }; - const jobFile = !!job.files ? + const jobFile = job.files?.length > 0 ? job.files[0] : { size: -1, url: '', filename: product.name }; diff --git a/src/app/store/search/search.effect.ts b/src/app/store/search/search.effect.ts index 847f00214..3e1de15de 100644 --- a/src/app/store/search/search.effect.ts +++ b/src/app/store/search/search.effect.ts @@ -456,10 +456,11 @@ export class SearchEffects { private hyp3JobToProducts(jobs, products) { const virtualProducts = jobs + .filter(job => job.job_type in models.hyp3JobTypes) .filter(job => products[job.job_parameters.granules[0]]) .map(job => { const product = products[job.job_parameters.granules[0]]; - const jobFile = !!job.files ? + const jobFile = job.files?.length > 0 ? job.files[0] : { size: -1, url: '', filename: product.name }; From a709a04599f2ade677f44ecc872abbbccea4f33c Mon Sep 17 00:00:00 2001 From: tcchase Date: Mon, 17 Mar 2025 10:58:57 -0400 Subject: [PATCH 3/6] feat: move OPERA-DISP to product type --- .../scene-metadata.component.html | 4 +- src/app/models/dataset.model.ts | 2 - src/app/models/datasets/index.ts | 3 +- src/app/models/datasets/opera_disp.ts | 41 ------------------- src/app/models/datasets/opera_s1.ts | 4 ++ .../services/dataset-for-product.service.ts | 2 +- src/app/services/product.service.ts | 2 +- 7 files changed, 9 insertions(+), 49 deletions(-) delete mode 100644 src/app/models/datasets/opera_disp.ts diff --git a/src/app/components/shared/scene-metadata/scene-metadata.component.html b/src/app/components/shared/scene-metadata/scene-metadata.component.html index 1b51271da..4f0a62229 100644 --- a/src/app/components/shared/scene-metadata/scene-metadata.component.html +++ b/src/app/components/shared/scene-metadata/scene-metadata.component.html @@ -56,7 +56,7 @@ -
  • +
  • {{ 'BEAM_MODE' |translate }} • {{ scene.metadata.beamMode }} {{ 'FLIGHT_LINE' | translate }} • {{ scene.metadata.flightLine }}
    • -
  • {{'ABSOLUTE_ORBIT' | translate}} • {{ scene.metadata.absoluteOrbit | join: ', ' }}
    • diff --git a/src/app/models/dataset.model.ts b/src/app/models/dataset.model.ts index 9a564ce2d..dcf40d5a0 100644 --- a/src/app/models/dataset.model.ts +++ b/src/app/models/dataset.model.ts @@ -56,7 +56,6 @@ export type DatasetSubtypes = DatasetSubtype[]; export const sentinel_1 = fromDatasets.sentinel_1; export const sentinel_1_bursts = fromDatasets.sentinel_1_bursts; export const opera_s1 = fromDatasets.opera_s1; -export const opera_disp = fromDatasets.opera_disp; export const alos = fromDatasets.alos; export const alos_2 = fromDatasets.alos_2; export const avnir = fromDatasets.avnir; @@ -72,7 +71,6 @@ export const seasat = fromDatasets.seasat; export const datasetList: Dataset[] = [ fromDatasets.alos_2, - fromDatasets.opera_disp, fromDatasets.sentinel_1, fromDatasets.sentinel_1_bursts, fromDatasets.opera_s1, diff --git a/src/app/models/datasets/index.ts b/src/app/models/datasets/index.ts index 51c4aa7a5..1e5f66525 100644 --- a/src/app/models/datasets/index.ts +++ b/src/app/models/datasets/index.ts @@ -12,5 +12,4 @@ export * from './sirc'; export * from './avnir'; export * from './sentinel-1-burst'; export * from './opera_s1'; -export * from './alos_2'; -export * from './opera_disp'; \ No newline at end of file +export * from './alos_2'; \ No newline at end of file diff --git a/src/app/models/datasets/opera_disp.ts b/src/app/models/datasets/opera_disp.ts deleted file mode 100644 index 31bc5e4db..000000000 --- a/src/app/models/datasets/opera_disp.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { Props } from '../filters.model'; - -export const opera_disp = { - id: 'OPERA-DISP', - name: 'OPERA-DISP', - subName: '', - beta: false, - properties: [ - Props.DATE, - Props.FLIGHT_DIRECTION, - Props.POLARIZATION, - ], - apiValue: { - dataset: 'OPERA-DISP' }, - date: { start: new Date('2014/06/15 03:44:43 UTC') }, - infoUrl: 'https://asf.alaska.edu/datasets/daac/opera/', - citationUrl: 'https://asf.alaska.edu/datasets/daac/opera/', - frequency: 'C-Band', - source: { - name: 'OPERA-JPL', - url: 'https://www.jpl.nasa.gov/go/opera' - }, - productTypes: [ - ], - beamModes: [ - ], - polarizations: [ - 'VV', 'HH', 'HV', 'VH' - ], - subtypes: [], -// calibrationDatasets: ['OPERA-S1-CALVAL'], - calibrationProductTypes: [{ - apiValue: 'RTC', - displayName: 'L2 Radiometric Terrain Corrected (RTC)', - }, { - apiValue: 'CSLC', - displayName: 'L2 Co-registered Single Look Complex (CSLC)', - }], - platformDesc: 'OPERA_DISP_DESC', - platformIcon: '/assets/icons/satellite_alt_black_48dp.svg', -}; diff --git a/src/app/models/datasets/opera_s1.ts b/src/app/models/datasets/opera_s1.ts index 2e01ac87f..3f55911a1 100644 --- a/src/app/models/datasets/opera_s1.ts +++ b/src/app/models/datasets/opera_s1.ts @@ -35,6 +35,10 @@ export const opera_s1 = { }, { apiValue: 'CSLC-STATIC', displayName: 'L2 Co-registered Single Look Complex Static Layer (CSLC-STATIC)' + }, + { + apiValue: 'DISP-S1', + displayName: 'Opera Displacement (DISP-S1)', } ], beamModes: [ diff --git a/src/app/services/dataset-for-product.service.ts b/src/app/services/dataset-for-product.service.ts index 662e941d5..a2a560f08 100644 --- a/src/app/services/dataset-for-product.service.ts +++ b/src/app/services/dataset-for-product.service.ts @@ -19,7 +19,7 @@ export class DatasetForProductService { } if(scene.id.startsWith('OPERA')) { if(scene.id.startsWith('OPERA_L3_DISP')) { - return models.opera_disp; + // return models.opera_disp; } return models.opera_s1; } diff --git a/src/app/services/product.service.ts b/src/app/services/product.service.ts index 1e1c0b490..75fb6d28e 100644 --- a/src/app/services/product.service.ts +++ b/src/app/services/product.service.ts @@ -73,7 +73,7 @@ export class ProductService { path: +g.p, frame: +g.f, - absoluteOrbit: Array.isArray(g.o) ? g.o.map(val => +val) : [+g.o], + absoluteOrbit: Array.isArray(g.o) ? g.o.map(val => +val) : g.o !== null ? [+g.o] : [], faradayRotation: +g.fr, offNadirAngle: +g.on, From 5bf7bdcd25f02d6679e5a8237b8c3a35554da88c Mon Sep 17 00:00:00 2001 From: tcchase Date: Mon, 17 Mar 2025 11:04:56 -0400 Subject: [PATCH 4/6] feat: use only first browse for opera-disp --- src/app/services/product.service.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/services/product.service.ts b/src/app/services/product.service.ts index 75fb6d28e..2d2763046 100644 --- a/src/app/services/product.service.ts +++ b/src/app/services/product.service.ts @@ -29,6 +29,9 @@ export class ProductService { browses = ['/assets/no-browse.png']; } } + if(g.pt == 'DISP-S1') { + browses = [browses[0]]; // only show the first browse for displacement for now + } const thumbnail = (g.t ? g.t.replace('{gn}', g.gn) : g.t) || (!browses[0].includes('no-browse') ? browses[0].replace('{gn}', g.gn) : '/assets/no-thumb.png'); let filename = g.fn.replace('{gn}', g.gn); From 8dd7928508a9baf6591a2783cc4b62bb3850ae42 Mon Sep 17 00:00:00 2001 From: tcchase Date: Mon, 17 Mar 2025 14:16:04 -0400 Subject: [PATCH 5/6] style: change alos_2 to alos-2 --- src/app/models/datasets/alos_2.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/models/datasets/alos_2.ts b/src/app/models/datasets/alos_2.ts index dd9fc4d41..f3b94a77b 100644 --- a/src/app/models/datasets/alos_2.ts +++ b/src/app/models/datasets/alos_2.ts @@ -2,7 +2,7 @@ import { Props } from '../filters.model'; export const alos_2 = { id: 'ALOS-2', - name: 'ALOS_2', + name: 'ALOS-2', subName: '', beta: false, properties: [ From 2028a2de76e9e8a511692b521973f99434082b19 Mon Sep 17 00:00:00 2001 From: ASF Discovery Machine User <60239462+ASF-Discovery@users.noreply.github.com> Date: Tue, 18 Mar 2025 14:24:04 -0800 Subject: [PATCH 6/6] 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 | 5 ++++- src/assets/i18n/es.json | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index e764aa8fe..211eccabf 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -77,6 +77,7 @@ "AT_THE_BOTTOM_OF_THE_LIST_OF_FILES_IS_A_FOOTER_BAR_THAT_SHOWS_SEVERAL_BUTTONS": "At the bottom of the list of files is a footer bar that shows several buttons.", "AUTO_RIFT_PAIR": "AutoRIFT pair", "AUTORIFT_DESC": "autoRIFT is a highly accurate and efficient algorithm for finding the pixel displacement between two radar images. ", + "AZIMUTH_ANGLE": "Azimuth Angle", "AZIMUTH_ANX_TIME": "Azimuth Anx Time", "AZIMUTH_TIME": "Azimuth Time", "BACK": "Back", @@ -207,7 +208,7 @@ "DEFINING_DATA_SEARCHES": "Defining Data Searches", "DEFORMATION": "Deformation", "DELETE": "Delete", - "DELETE_ALL_SERIES": "Delete all series.", + "DELETE_ALL_SERIES": "Delete all series", "DELETE_FOREVER": "delete_forever", "DEM": "DEM", "DEM NAME": "DEM Name", @@ -355,6 +356,7 @@ "GLACIER_SPEED": "Glacier Speed", "GLOBAL_SEASONAL_SENTINEL": "Global Seasonal Sentinel-1 Interferometric Coherence & Backscatter Dataset", "GRATICULE_OVERLAY": "Graticule Overlay", + "GRAZING_ANGLE": "Grazing Angle", "GRIDLINES_OVERLAY": "Gridlines Overlay", "GROUP_ID": "Group ID", "GROUP_ID_INFO_BAR": "Group ID", @@ -761,6 +763,7 @@ "SHARE_SAVE_INFORMATION": "Share this search with others and manage your searches", "SHARE_SEARCH": "Share Search", "SHARE_WITH_EMAIL": "Share With Email", + "SHIFT_TO_ZERO": "Shift to zero", "SHORTWAVE_DISPLACEMENT": "Short Wavelength Displacement", "SHOW_LINEAR_FIT": "Show Linear Fit", "SHOW_LINES": "Show Lines", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index dbb6247cb..5b07d6b14 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -77,6 +77,7 @@ "AT_THE_BOTTOM_OF_THE_LIST_OF_FILES_IS_A_FOOTER_BAR_THAT_SHOWS_SEVERAL_BUTTONS": "En la parte inferior de la lista de archivos hay una barra de pie de página que muestra varios botones.", "AUTO_RIFT_PAIR": "Par AutoRIFT", "AUTORIFT_DESC": "autoRIFT es un algoritmo altamente preciso y eficiente para encontrar el desplazamiento de píxeles entre dos imágenes de radar.", + "AZIMUTH_ANGLE": "Ángulo de Acimut", "AZIMUTH_ANX_TIME": "Tiempo Acimut Anx", "AZIMUTH_TIME": "Tiempo de Acimut", "BACK": "Atrás", @@ -208,7 +209,7 @@ "DEFINING_DATA_SEARCHES": "Definición de búsquedas de datos", "DEFORMATION": "Deformación", "DELETE": "Eliminar", - "DELETE_ALL_SERIES": "Eliminar todas las series.", + "DELETE_ALL_SERIES": "Eliminar todas las series", "DELETE_FOREVER": "borrar para siempre", "DEM": "DEM", "DEM NAME": "DEM Name", @@ -358,6 +359,7 @@ "GLACIER_SPEED": "Velocidad del Glaciar", "GLOBAL_SEASONAL_SENTINEL": "Conjunto de Datos de Estacionales Globales de Retrodispersión y Coherencia Del Sentinel-1 ", "GRATICULE_OVERLAY": "Superposición de Retícula", + "GRAZING_ANGLE": "Ángulo Rasante", "GRIDLINES_OVERLAY": "Superposición de líneas de cuadrícula", "GROUP_ID": "ID de grupo", "GROUP_ID_INFO_BAR": "ID de grupo", @@ -740,7 +742,7 @@ "SENTINEL_1_INTERFEROGRAM_BETA_DESC": "El nivel 2 son productos de interferograma Sentinel-1 estandarizados y generados por el proyecto Advanced Rapid Imaging and Analysis (ARIA) del JPL.", "SENTINEL_DESC": "Sentinel-1 incluye satélites gemelos, cada uno de los cuales lleva un radar de apertura sintética (SAR) de banda C, juntos brindan imágenes de la superficie de la Tierra para todo clima, día y noche.", "SEP_OCT_NOV": "Sep, Oct, Nov", - "SERIES": "Serie", + "SERIES": "Series", "SET": "Colocar", "SET_AS_BASELINE": "Fijar Línea base", "SET_AS_BOTH": "Establecer como ambos", @@ -761,6 +763,7 @@ "SHARE_SAVE_INFORMATION": "Comparta esta búsqueda con otras personas y administre sus búsquedas", "SHARE_SEARCH": "Compartir Búsqueda", "SHARE_WITH_EMAIL": "Compartir Con Correo Electrónico", + "SHIFT_TO_ZERO": "Restablecer a cero", "SHORTWAVE_DISPLACEMENT": "Desplazamiento", "SHOW_LINEAR_FIT": "Mostrar Ajuste Lineal", "SHOW_LINES": "Mostrar Líneas",