Commit 6f0a25e3 authored by jlaura's avatar jlaura Committed by Jason R Laura
Browse files

Test updates for windows.

parent 08e6d5ad

plio/io/io_gdal.py

+19 −11
Original line number Diff line number Diff line
@@ -468,30 +468,39 @@ class GeoDataset(object): 


def array_to_raster(array, file_name, projection=None,

                    geotransform=None, outformat='GTiff',

                    ndv=None):

                    ndv=None, bittype='GDT_Float64'):

    """

    Converts the given NumPy array to a raster format using the GeoDataset class.



    Parameters

    ----------

    array : ndarray

            

            The data to be written via GDAL



    file_name : str

                The output file PATH (relative or absolute)



    projection : 

                 Default projection=None.

    projection : object

                 A GDAL readable projection object, WKT string, PROJ4 string, etc.

                 Default: None



    geotransform : object

                   Default geotransform=None.

                   A six parameter geotransformation

                   Default:None.



    outformat : str

                Default outformat='GTiff'.

                A GDAL supported output format

                Default: 'GTiff'.



    ndv : float

          The no data value for the given band. See no_data_value(). Default ndv=None.

          The no data value for the given band.

          Default: None.



    bittype : str

              A GDAL supported bittype, e.g. GDT_Int32

              Default: GDT_Float64

    """



    driver = gdal.GetDriverByName(outformat)

    try:

        y, x, bands = array.shape
@@ -501,8 +510,7 @@ def array_to_raster(array, file_name, projection=None, 
        y, x = array.shape

        single = True



    #This is a crappy hard code to 32bit.

    dataset = driver.Create(file_name, x, y, bands, gdal.GDT_Float64)

    dataset = driver.Create(file_name, x, y, bands, getattr(gdal, bittype))



    if geotransform:

        dataset.SetGeoTransform(geotransform)

plio/io/tests/test_io_gdal.py

+3 −3
Original line number Diff line number Diff line
@@ -179,14 +179,14 @@ class TestWriter(unittest.TestCase): 
        dataset = io_gdal.GeoDataset('test.tif')

        self.assertEqual(gt, dataset.geotransform)



    def test_with_no_data_value(self):

    def test_with_no_data_value_nd(self):

        no_data_value = 0.0

        #nd array

        io_gdal.array_to_raster(self.ndarr, 'test.tif', ndv=no_data_value)

        dataset = io_gdal.GeoDataset('test.tif')

        self.assertEqual(dataset.no_data_value, no_data_value)



        #array

    def test_with_no_data_value(self):

        no_data_value = 0.0

        io_gdal.array_to_raster(self.arr, 'test.tif', ndv=no_data_value)

        dataset = io_gdal.GeoDataset('test.tif')

        self.assertEqual(dataset.no_data_value, no_data_value)

plio/io/tests/test_io_hdf.py

+5 −5
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ class TestHDF(unittest.TestCase): 
        cls.df = pd.DataFrame(cls.x[['bar', 'baz']], index=cls.x['index'],

                              columns=['bar', 'baz'])



    @classmethod

    def tearDownClass(cls):

        os.remove('test_io_hdf.hdf')



    def test_df_sarray(self):

        converted = self.hdf.df_to_sarray(self.df.reset_index())

        np.testing.assert_array_equal(converted, self.x)
@@ -29,4 +25,8 @@ class TestHDF(unittest.TestCase): 
        converted = self.hdf.sarray_to_df(self.x)

        self.assertTrue((self.df == converted).all().all())



    @classmethod

    def tearDownClass(cls):

        try:

            os.remove('test_io_hdf.hdf')

        except: pass