remove band count from config and determin it from band indicies

Author: martham93

docs/parameters.rst

@@ -73,9 +73,6 @@ Here is the full list of configuration parameters you can specify in a ``config.
 **over_zoom**: int
  	An integer greater than 0. If set for XYZ tiles, it will fetch tiles from `zoom` + `over_zoom`, to create higher resolution tiles which fill out the bounds of the original zoom level.
 
-**band_count**: int 
-	An integret greater than 1. If not specified defaults to 3 for the typical r,g,b imagery. 
-
 **band_indicies**: list
-	A list of band incidies to pull from a tiff. Defaults to (1, 2, 3) if not specified. For using non-RGB tifs, ie MS tifs this should be over-written 
-	for example to [5, 3, 2, 7] to extract Red, Green, Blue, and NIR bands from the MS spacenet imagery. 
+	A list of band incidies to pull from a tiff. Defaults to (1, 2, 3) if not specified. For using non-RGB tifs, ie MS tifs this should be over-written
+	for example to [5, 3, 2, 7] to extract Red, Green, Blue, and NIR bands from the MS spacenet imagery.

label_maker/utils.py

@@ -138,24 +138,21 @@ def get_tile_tif(tile, imagery, folder, kwargs):
         window = ((top, bottom), (left, right))
 
         # read the first three bands (assumed RGB) of the TIF into an array
-
-        try:
-            kwargs['band_count']
-            band_count =  kwargs['band_count']
-        except KeyError:
-            band_count = 3
         try:
             kwargs['band_indicies']
             band_indicies =  tuple(kwargs['band_indicies'])
+            band_count = len(kwargs['band_indicies'])
         except KeyError:
             band_indicies = (1, 2, 3)
+            band_count = 3
 
         arr_shape = tuple([band_count, 256, 256])
         data = np.empty(shape=(arr_shape)).astype(src.profile['dtype'])
+
         for i, k in enumerate(band_indicies):
             src.read(k, window=window, out=data[i], boundless=True)
         # save
-        if band_indicies == (1, 2, 3) and band_count == 3:
+        if band_indicies == (1, 2, 3):
             tile_img = op.join(folder, '{}{}'.format(tile, '.jpg'))
             img = Image.fromarray(np.moveaxis(data, 0, -1))
             img.save(tile_img)

label_maker/validate.py

@@ -35,7 +35,6 @@
     'split_vals': {'type': 'list', 'schema': {'type': 'float'}},
     'split_names': {'type': 'list', 'schema': {'type': 'string'}},
     'tms_image_format': {'type': 'string'},
-    'over_zoom': {'type': 'integer', 'min': 1}, 
-    'band_count': {'type': 'integer', 'min': 1},
+    'over_zoom': {'type': 'integer', 'min': 1},
     'band_indicies': {'type': 'list'}
 }

test/fixtures/integration/config.integration.bands.json

@@ -8,6 +8,5 @@
     "imagery": "integration-ms/ms-img.tif",
     "background_ratio": 0,
     "ml_type": "classification",
-    "band_count": 2,
     "band_indicies": [5, 7]
   }