Skip to content

Commit fd803f4

Browse files
authored
zarr_driver.py: Minor cleanup. (OSGeo#11896)
* zarr_driver.py: Minor cleanup. - Break up massive wkt string in test_zarr_read_crs - Wrap a few places with gdal.quiet_errors where ZARR_V3 gives "Warning 1: fill_value = null is invalid" on open - Remove a commented out debugging print * zarr_driver.py: Convert some quiet_errors to quiet_warnings. Changes the quiet_errors from 566fe9c now that 1c404c6 is in.
1 parent e873236 commit fd803f4

File tree

1 file changed

+29
-8
lines changed

1 file changed

+29
-8
lines changed

autotest/gdrivers/zarr_driver.py

+29-8
Original file line numberDiff line numberDiff line change
@@ -845,7 +845,23 @@ def test_zarr_read_crs(crs_member):
845845
},
846846
"id": {"authority": "EPSG", "code": 4326},
847847
},
848-
"wkt": 'GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]',
848+
"wkt": (
849+
'GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",'
850+
'MEMBER["World Geodetic System 1984 (Transit)"],'
851+
'MEMBER["World Geodetic System 1984 (G730)"],'
852+
'MEMBER["World Geodetic System 1984 (G873)"],'
853+
'MEMBER["World Geodetic System 1984 (G1150)"],'
854+
'MEMBER["World Geodetic System 1984 (G1674)"],'
855+
'MEMBER["World Geodetic System 1984 (G1762)"],'
856+
'ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],'
857+
"ENSEMBLEACCURACY[2.0]],"
858+
'PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],'
859+
"CS[ellipsoidal,2],"
860+
'AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],'
861+
'AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],'
862+
'USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],'
863+
'ID["EPSG",4326]]'
864+
),
849865
"url": "http://www.opengis.net/def/crs/EPSG/0/4326",
850866
}
851867
}
@@ -5529,7 +5545,9 @@ def test_zarr_driver_rename(format):
55295545
try:
55305546
drv.Create(filename, 1, 1, options=["FORMAT=" + format])
55315547

5532-
assert gdal.Open(filename)
5548+
with gdal.quiet_warnings():
5549+
# ZARR_V3 gives: "Warning 1: fill_value = null is invalid" on open.
5550+
assert gdal.Open(filename)
55335551

55345552
assert drv.Rename(newfilename, filename) == gdal.CE_None
55355553

@@ -5538,7 +5556,9 @@ def test_zarr_driver_rename(format):
55385556
gdal.Open(filename)
55395557

55405558
assert gdal.VSIStatL(newfilename)
5541-
assert gdal.Open(newfilename)
5559+
with gdal.quiet_warnings():
5560+
# ZARR_V3 gives: "Warning 1: fill_value = null is invalid" on open.
5561+
assert gdal.Open(newfilename)
55425562

55435563
finally:
55445564
if gdal.VSIStatL(filename):
@@ -5566,12 +5586,13 @@ def test_zarr_driver_copy_files(format):
55665586

55675587
assert drv.CopyFiles(newfilename, filename) == gdal.CE_None
55685588

5569-
assert gdal.VSIStatL(filename)
5570-
assert gdal.Open(filename)
5589+
with gdal.quiet_warnings():
5590+
# ZARR_V3 gives: "Warning 1: fill_value = null is invalid" on open.
5591+
assert gdal.VSIStatL(filename)
5592+
assert gdal.Open(filename)
55715593

5572-
assert gdal.VSIStatL(newfilename)
5573-
# print(gdal.ReadDirRecursive(newfilename))
5574-
assert gdal.Open(newfilename)
5594+
assert gdal.VSIStatL(newfilename)
5595+
assert gdal.Open(newfilename)
55755596

55765597
finally:
55775598
if gdal.VSIStatL(filename):

0 commit comments

Comments
 (0)