Pass tiles directory as a parameter, don't hardcode

Author: drewbo

label_maker/images.py

@@ -66,12 +66,12 @@ def class_test(value):
 
     # download tiles
     tiles = class_tiles + background_tiles
-    print('Downloading {} tiles to {}'.format(len(tiles), op.join(dest_folder, 'tiles')))
+    print('Downloading {} tiles to {}'.format(len(tiles), tiles_dir))
 
     # get image acquisition function based on imagery string
     image_function = download_tile_tms
     if is_tif(imagery):
         image_function = get_tile_tif
 
     for tile in tiles:
-        image_function(tile, imagery, dest_folder, imagery_offset)
+        image_function(tile, imagery, tiles_dir, imagery_offset)

label_maker/preview.py

@@ -56,11 +56,8 @@ def preview(dest_folder, number, classes, imagery, ml_type, imagery_offset=False
         # create class directory
         class_dir = op.join(dest_folder, 'examples', cl.get('name'))
 
-        # the download process downloads into a tiles subdirectory so create that here
-        class_tile_dir = op.join(class_dir, 'tiles')
-
-        if not op.isdir(class_tile_dir):
-            makedirs(class_tile_dir)
+        if not op.isdir(class_dir):
+            makedirs(class_dir)
 
         class_tiles = (t for t in tiles.files
                        if class_match(ml_type, tiles[t], i + 1))

label_maker/utils.py

@@ -24,16 +24,16 @@ def class_match(ml_type, label, i):
         return np.count_nonzero(label == i)
     return None
 
-def download_tile_tms(tile, imagery, dest_folder, *args):
+def download_tile_tms(tile, imagery, folder, *args):
     """Download a satellite image tile from a tms endpoint"""
     o = urlparse(imagery)
     _, image_format = op.splitext(o.path)
     r = requests.get(url(tile.split('-'), imagery))
-    tile_img = op.join(dest_folder, 'tiles', '{}{}'.format(tile, image_format))
+    tile_img = op.join(folder, '{}{}'.format(tile, image_format))
     open(tile_img, 'wb').write(r.content)
     return tile_img
 
-def get_tile_tif(tile, imagery, dest_folder, imagery_offset):
+def get_tile_tif(tile, imagery, folder, imagery_offset):
     """
     Read a GeoTIFF with a window corresponding to a TMS tile
 
@@ -80,7 +80,7 @@ def get_tile_tif(tile, imagery, dest_folder, imagery_offset):
             src.read(k, window=window, out=data[k - 1], boundless=True)
 
         # save
-        tile_img = op.join(dest_folder, 'tiles', '{}{}'.format(tile, '.jpg'))
+        tile_img = op.join(folder, '{}{}'.format(tile, '.jpg'))
         img = Image.fromarray(np.moveaxis(data, 0, -1), mode='RGB')
         img.save(tile_img)