Skip to content

Commit e2dc974

Browse files
committed
SAR_CEOS2: fix missing metadata in PALSAR-2/3 products (master only)
1 parent c942690 commit e2dc974

File tree

2 files changed

+25
-4
lines changed

2 files changed

+25
-4
lines changed

autotest/gdrivers/sar_ceos.py

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,14 @@ def test_sar_ceos_alos2_L1_1():
5252
assert ds.RasterYSize == 32971
5353
assert ds.RasterCount == 1
5454
assert ds.GetRasterBand(1).DataType == gdal.GDT_CFloat32
55-
assert ds.GetMetadata() == {
55+
md = ds.GetMetadata()
56+
count_removed = 0
57+
for key in list(md.keys()):
58+
if key.startswith("CEOS_PLATFORM_POS_VECTOR_"):
59+
del md[key]
60+
count_removed += 1
61+
assert count_removed == int(md["CEOS_PLATFORM_POS_NUMBER_POINTS"]) * 6
62+
assert md == {
5663
"CEOS_LOGICAL_VOLUME_ID": "AL2SAR20140212",
5764
"CEOS_PROCESSING_FACILITY": "SCMO",
5865
"CEOS_PROCESSING_AGENCY": "JAXA",
@@ -440,7 +447,14 @@ def test_sar_ceos_alos2_L1_5():
440447
assert ds.RasterYSize == 32294
441448
assert ds.RasterCount == 1
442449
assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt16
443-
assert ds.GetMetadata() == {
450+
md = ds.GetMetadata()
451+
count_removed = 0
452+
for key in list(md.keys()):
453+
if key.startswith("CEOS_PLATFORM_POS_VECTOR_"):
454+
del md[key]
455+
count_removed += 1
456+
assert count_removed == int(md["CEOS_PLATFORM_POS_NUMBER_POINTS"]) * 6
457+
assert md == {
444458
"CEOS_LOGICAL_VOLUME_ID": "AL2SAR20150316",
445459
"CEOS_PROCESSING_FACILITY": "EICS",
446460
"CEOS_PROCESSING_AGENCY": "JAXA",
@@ -832,7 +846,14 @@ def test_sar_ceos_alos4_L1_1():
832846
assert ds.RasterYSize == 40633
833847
assert ds.RasterCount == 1
834848
assert ds.GetRasterBand(1).DataType == gdal.GDT_CFloat32
835-
assert ds.GetMetadata() == {
849+
md = ds.GetMetadata()
850+
count_removed = 0
851+
for key in list(md.keys()):
852+
if key.startswith("CEOS_PLATFORM_POS_VECTOR_"):
853+
del md[key]
854+
count_removed += 1
855+
assert count_removed == int(md["CEOS_PLATFORM_POS_NUMBER_POINTS"]) * 6
856+
assert md == {
836857
"CEOS_LOGICAL_VOLUME_ID": "AL4SAR20250509",
837858
"CEOS_PROCESSING_FACILITY": "EICS",
838859
"CEOS_PROCESSING_AGENCY": "JAXA",

frmts/ceos2/sar_ceosdataset.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1239,7 +1239,7 @@ void SAR_CEOSDataset::ScanForMetadata()
12391239
{
12401240
SetMetadataItem(sDef.pszMetadataItemName, osField.c_str());
12411241
if (EQUAL(sDef.pszMetadataItemName,
1242-
"CEOS_PLATFORM_POS_NUMBER_DATA_POINTS"))
1242+
"CEOS_PLATFORM_POS_NUMBER_POINTS"))
12431243
{
12441244
nPoints = std::clamp(atoi(osField), 0,
12451245
(record->Length - OFFSET_POINT_1) /

0 commit comments

Comments
 (0)