Merge pull request #74 from ks905383/main

Add in main updates

docs/source/installation.rst

@@ -3,10 +3,10 @@ Installation
 The easiest and recommended way to install :py:mod:`xagg` is through ``conda`` or ``mamba``::
 
    # Mamba
-   mamba install -c conda-forge xagg==0.3.2.0
+   mamba install -c conda-forge xagg==0.3.2.1
 
    # Conda
-   conda install -c conda-forge xagg==0.3.2.0
+   conda install -c conda-forge xagg==0.3.2.1
 
 
 ``xagg`` can also be installed through ``pip``::

tests/test_export.py

@@ -188,11 +188,10 @@ def test_to_netcdf(agg=agg):
 	               			coords = {'poly_idx':(('poly_idx'),[0]),
 	                         'run':(('run'),[0,1])})
 
-		# Load
-		ds_out = xr.open_dataset('test.nc')
-
-		# Test
-		xr.testing.assert_allclose(ds_ref,ds_out)
+		# Load and Test
+		with xr.open_dataset('test.nc') as ds_out:
+			xr.testing.assert_allclose(ds_ref,ds_out)
+
 	finally:
 		# Remove test export file 
 		os.remove('test.nc')

xagg/diag.py

@@ -62,9 +62,15 @@ def diag_fig(wm,poly_id,pix_overlap_info,
 	        raise TypeError('If using list polygon ids, all list members must be integers corresponding to polygon idxs in `wm.agg`.')
 	    poly_idx = poly_id
 
+    # Turn into dataset if dataarray
+    if type(pix_overlap_info)==xr.core.dataarray.DataArray:
+      if pix_overlap_info.name is None:
+        pix_overlap_info = pix_overlap_info.to_dataset(name='var')
+      else:
+        pix_overlap_info = pix_overlap_info.to_dataset()
+
 	# Get pixel polygons/overlaps, if necessary
-	if ((type(pix_overlap_info) == xr.core.dataset.Dataset)
-	     or (type(pix_overlap_info) == xr.core.dataarray.DataArray)):
+	if ((type(pix_overlap_info) == xr.core.dataset.Dataset):
 	    pix_polys = create_raster_polygons(pix_overlap_info)
 	else:
 	    pix_polys = pix_overlap_info