Reveresed migration to h5netcdf

rosepearson · Oct 10, 2024 · 53d9804 · 53d9804
1 parent db17f68
commit 53d9804
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/environment_CI.yml b/environment_CI.yml
@@ -10,5 +10,5 @@ dependencies:
   - python-pdal >= 3.3.0
   - dask >= 2023.6.0
   - distributed >= 2023.6.0
-  - h5netcdf
+  - netcdf4
   - libgdal-hdf5
diff --git a/src/geofabrics/dem.py b/src/geofabrics/dem.py
@@ -360,10 +360,10 @@ def save_dem(
                         compression["dtype"] = dem[key].dtype
                         encoding[key] = compression
                     dem.to_netcdf(
-                        filename, format="NETCDF4", engine="h5netcdf", encoding=encoding
+                        filename, format="NETCDF4", engine="netcdf4", encoding=encoding
                     )
                 else:
-                    dem.to_netcdf(filename, format="NETCDF4", engine="h5netcdf")
+                    dem.to_netcdf(filename, format="NETCDF4", engine="netcdf4")
             elif filename.suffix.lower() == ".tif":
                 for key, array in dem.data_vars.items():
                     filename_layer = (
@@ -438,20 +438,13 @@ def _write_netcdf_conventions_in_place(
             A dict with horizontal and vertical CRS information.
         """
 
-        reserved_names = ["_NCProperties", "_Netcdf4Coordinates", "_Netcdf4Dimid"]
 
         dem.rio.write_crs(crs_dict["horizontal"], inplace=True)
         dem.rio.write_transform(inplace=True)
-        for reserved_name in reserved_names:
-            if reserved_name in dem.attrs.keys():
-                del dem.attrs[reserved_name]
         for layer in ["z", "data_source", "lidar_source", "zo"]:
             if layer in dem:
-                dem[layer].rio.write_crs(crs_dict["horizontal"], inplace=True)
-                dem[layer].rio.write_nodata(numpy.nan, encoded=True, inplace=True)
-                for reserved_name in reserved_names:
-                    if reserved_name in dem[layer].attrs.keys():
-                        del dem[layer].attrs[reserved_name]
+                dem[layer] = dem[layer].rio.write_crs(crs_dict["horizontal"])
+                dem[layer] = dem[layer].rio.write_nodata(numpy.nan, encoded=True)
 
     def _extents_from_mask(self, mask: numpy.ndarray, transform: dict):
         """Define the spatial extents of the pixels in the DEM as defined by the mask