Merge branch 'GITC-7208' of https://github.com/nasa/harmony-browse-image-generator into GITC-7208

Author: jackiryan

hybig/browse.py

@@ -314,7 +314,7 @@ def scale_paletted_1band(
     data_array: DataArray, palette: ColorPalette
 ) -> tuple[ndarray, ColorMap]:
     """Scale a 1-band image with palette into modified image and associated color_map.
-    
+
     Use the palette's levels and values, transform the input data_array into
     the correct levels indexed from 0-255 return the scaled array along side of
     a colormap corresponding to the new levels.

hybig/color_utility.py

@@ -98,7 +98,7 @@ def get_color_palette(
                 # (usually the only one)
                 ds_cmap['nv'] = ds_cmap[ndv_tuple[0]]
                 # then remove the value associated with the ndv key
-                ds_cmap.pop(ndv_tuple[0]) 
+                ds_cmap.pop(ndv_tuple[0])
             return convert_colormap_to_palette(ds_cmap)
         except ValueError:
             return None

tests/unit/test_browse.py

@@ -220,7 +220,7 @@ def test_create_browse_imagery_with_mocks(
                 src_crs=da_mock.rio.crs,
                 dst_transform=target_transform,
                 dst_crs=CRS.from_string('EPSG:4326'),
-                dst_nodata=255, # NODATA_IDX
+                dst_nodata=255,  # NODATA_IDX
                 resampling=Resampling.nearest,
             ),
         ]
@@ -305,19 +305,18 @@ def test_convert_singleband_to_raster_with_colormap(self):
             dtype='uint8',
         )
         expected_palette = {
-            0: (255, 0, 0, 255), # red
-            1: (255, 255, 0, 255), # yellow
-            2: (0, 255, 0, 255), # green
-            3: (0, 0, 255, 255), # blue
-            4: (0, 0, 0, 0), # alpha
+            0: (255, 0, 0, 255),  # red
+            1: (255, 255, 0, 255),  # yellow
+            2: (0, 255, 0, 255),  # green
+            3: (0, 0, 255, 255),  # blue
+            4: (0, 0, 0, 0),  # alpha
         }
         # Read down: red, yellow, green, blue
         image_palette = convert_colormap_to_palette(self.colormap)
         actual_raster, actual_palette = convert_singleband_to_raster(ds, image_palette)
         assert_array_equal(expected_raster, actual_raster, strict=True)
         assert_equal(expected_palette, actual_palette)
 
-
     def test_convert_singleband_to_raster_with_colormap_and_bad_data(self):
         data_array = np.array(self.data, dtype='float')
         data_array[0, 0] = np.nan
@@ -337,11 +336,11 @@ def test_convert_singleband_to_raster_with_colormap_and_bad_data(self):
             dtype='uint8',
         )
         expected_palette = {
-            0: (255, 0, 0, 255), # red
-            1: (255, 255, 0, 255), # yellow
-            2: (0, 255, 0, 255), # green
-            3: (0, 0, 255, 255), # blue
-            4: (10, 20, 30, 40), # nv
+            0: (255, 0, 0, 255),  # red
+            1: (255, 255, 0, 255),  # yellow
+            2: (0, 255, 0, 255),  # green
+            3: (0, 0, 255, 255),  # blue
+            4: (10, 20, 30, 40),  # nv
         }
 
         colormap = {**self.colormap, 'nv': nv_color}