From fd47ecdf0544e62aca7d42472b658b1e5d1c2032 Mon Sep 17 00:00:00 2001 From: bbrauzzi Date: Wed, 27 Sep 2023 17:21:12 +0200 Subject: [PATCH] ESACPE-1690 satelite number fix in the title --- ..._INPE_CBERS_4A_WFI_20230214_109_060_L2_compose.json | 10 +++++----- ...ers_4a_wfi_20230214_109_060_l2_compose-metadata.csv | 2 +- .../Model/Metadata/Cbers/Schemas/MetadataCsv.cs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Stars.Data.Tests/Resources/INPE/CBERS-4A/WFI/MetadataExtractorsTests_urn_ogc_def_EOP_INPE_CBERS_4A_WFI_20230214_109_060_L2_compose.json b/src/Stars.Data.Tests/Resources/INPE/CBERS-4A/WFI/MetadataExtractorsTests_urn_ogc_def_EOP_INPE_CBERS_4A_WFI_20230214_109_060_L2_compose.json index 0e79b5cf..6be3f44b 100644 --- a/src/Stars.Data.Tests/Resources/INPE/CBERS-4A/WFI/MetadataExtractorsTests_urn_ogc_def_EOP_INPE_CBERS_4A_WFI_20230214_109_060_L2_compose.json +++ b/src/Stars.Data.Tests/Resources/INPE/CBERS-4A/WFI/MetadataExtractorsTests_urn_ogc_def_EOP_INPE_CBERS_4A_WFI_20230214_109_060_L2_compose.json @@ -41,15 +41,15 @@ "start_datetime": "2023-02-14T08:31:25Z", "end_datetime": "2023-02-14T08:33:13Z", "datetime": "2023-02-14T08:32:19Z", - "constellation": "cbers-4", - "platform": "cbers-4", - "mission": "cbers-4", + "constellation": "cbers-4a", + "platform": "cbers-4a", + "mission": "cbers-4a", "instruments": [ "wfi" ], "sensor_type": "optical", "gsd": 55.0, - "title": "CBERS-4 WFI L2 2023-02-14 08:32:19", + "title": "CBERS-4A WFI L2 2023-02-14 08:32:19", "eo:bands": [ { "name": "band-13", @@ -174,7 +174,7 @@ "title": "Metadata file", "href": "data/CBERS-4A-urn_ogc_def_EOP_INPE_CBERS_4A_WFI_20230214_109_060_L2_compose/urn_ogc_def_eop_inpe_cbers_4a_wfi_20230214_109_060_l2_compose-metadata.csv", "filename": "urn_ogc_def_eop_inpe_cbers_4a_wfi_20230214_109_060_l2_compose-metadata.csv", - "file:size": 551 + "file:size": 552 }, "overview": { "type": "image/png", diff --git a/src/Stars.Data.Tests/Resources/INPE/CBERS-4A/WFI/data/CBERS-4A-urn_ogc_def_EOP_INPE_CBERS_4A_WFI_20230214_109_060_L2_compose/urn_ogc_def_eop_inpe_cbers_4a_wfi_20230214_109_060_l2_compose-metadata.csv b/src/Stars.Data.Tests/Resources/INPE/CBERS-4A/WFI/data/CBERS-4A-urn_ogc_def_EOP_INPE_CBERS_4A_WFI_20230214_109_060_L2_compose/urn_ogc_def_eop_inpe_cbers_4a_wfi_20230214_109_060_l2_compose-metadata.csv index 92dcc4a9..e115b4a4 100644 --- a/src/Stars.Data.Tests/Resources/INPE/CBERS-4A/WFI/data/CBERS-4A-urn_ogc_def_EOP_INPE_CBERS_4A_WFI_20230214_109_060_L2_compose/urn_ogc_def_eop_inpe_cbers_4a_wfi_20230214_109_060_l2_compose-metadata.csv +++ b/src/Stars.Data.Tests/Resources/INPE/CBERS-4A/WFI/data/CBERS-4A-urn_ogc_def_EOP_INPE_CBERS_4A_WFI_20230214_109_060_L2_compose/urn_ogc_def_eop_inpe_cbers_4a_wfi_20230214_109_060_l2_compose-metadata.csv @@ -1,2 +1,2 @@ AGENCY,SATELLITE,INSTRUMENT,MODE,IDENTIFIER,START_DATE,COMPLETE_DATE,FOOTPRINT,PRODUCT_URL,AOI,FORMAT,PROCESSING_LEVEL,PROCESSING_LEVEL_DESCRIPTION,PROJECTION,EPSG,PATH,ROW,OFF_NADIR,SUN_AZIMUTH,SUN_ELEVATION,ABSOLUTE_CALIBRATION_COEFFICIENTS -INPE,CBERS4,WFI,,urn_ogc_def_EOP_INPE_CBERS_4A_WFI_20230214_109_060_L2_compose,2023-02-14T08:31:25+0000,2023-02-14T08:33:13+0000," 42.936 43.164 42.944 43.824 42.584 43.83 42.576 43.174 42.936 43.164",,,GeoTiff,L1B,,Geocoded,32638,109,060,0,165.439,32.9467,band0:1.4351 band1:1.4351 band2:1.6559 band3:1.6559 \ No newline at end of file +INPE,CBERS4A,WFI,,urn_ogc_def_EOP_INPE_CBERS_4A_WFI_20230214_109_060_L2_compose,2023-02-14T08:31:25+0000,2023-02-14T08:33:13+0000," 42.936 43.164 42.944 43.824 42.584 43.83 42.576 43.174 42.936 43.164",,,GeoTiff,L1B,,Geocoded,32638,109,060,0,165.439,32.9467,band0:1.4351 band1:1.4351 band2:1.6559 band3:1.6559 \ No newline at end of file diff --git a/src/Stars.Data/Model/Metadata/Cbers/Schemas/MetadataCsv.cs b/src/Stars.Data/Model/Metadata/Cbers/Schemas/MetadataCsv.cs index 81dbfd71..c9ceae7a 100644 --- a/src/Stars.Data/Model/Metadata/Cbers/Schemas/MetadataCsv.cs +++ b/src/Stars.Data/Model/Metadata/Cbers/Schemas/MetadataCsv.cs @@ -33,7 +33,7 @@ public Metadata getMetadata() { metadata.satellite = new prdfSatellite(); metadata.satellite.name = "CBERS"; - string pattern = @"CBERS(\d+)"; + string pattern = @"CBERS(.*)"; Match match = Regex.Match(SATELLITE, pattern); if (match.Success) { string numberString = match.Groups[1].Value;