Tweak raster read for back compatibility; update some unit tests

Signed-off-by: Jason T. Brown <[email protected]>

Author: vpipkt

pyrasterframes/src/main/python/pyrasterframes/__init__.py

@@ -134,6 +134,9 @@ def _raster_reader(
 
     from pandas import DataFrame as PdDataFrame
 
+    if 'catalog' in options:
+        source = options['catalog']  # maintain back compatibility with 0.8.0
+
     def to_csv(comp):
         if isinstance(comp, str):
             return comp

pyrasterframes/src/main/python/tests/RasterFunctionsTests.py

@@ -286,7 +286,7 @@ def test_render_composite(self):
         cat = self.spark.createDataFrame([
             Row(red=self.l8band_uri(4), green=self.l8band_uri(3), blue=self.l8band_uri(2))
         ])
-        rf = self.spark.read.raster(catalog = cat, catalog_col_names=['red', 'green', 'blue'])
+        rf = self.spark.read.raster(catalog=cat, catalog_col_names=cat.columns)
 
         # Test composite construction
         rgb = rf.select(rf_tile(rf_rgb_composite('red', 'green', 'blue')).alias('rgb')).first()['rgb']

pyrasterframes/src/main/python/tests/RasterSourceTest.py

@@ -28,7 +28,6 @@
 
 class RasterSourceTest(TestEnvironment):
 
-
     @staticmethod
     def path(scene, band):
         scene_dict = {

pyrasterframes/src/main/python/tests/RasterSourceTests.py

@@ -113,14 +113,12 @@ def path(scene, band):
             {'b1': path(2, 1), 'b2': path(2, 2), 'b3': path(2, 3)},
             {'b1': path(3, 1), 'b2': path(3, 2), 'b3': path(3, 3)},
         ])
-        # comma separated list of column names containing URI's to read.
-        catalog_columns = ','.join(path_pandas.columns.tolist())  # 'b1,b2,b3'
         path_table = self.spark.createDataFrame(path_pandas)
 
         path_df = self.spark.read.raster(
             tile_dimensions=(512, 512),
             catalog=path_table,
-            catalog_col_names=catalog_columns,
+            catalog_col_names=path_table.columns,
             lazy_tiles=True # We'll get an OOM error if we try to read 9 scenes all at once!
         )