diff --git a/label_maker/images.py b/label_maker/images.py index ebf0975..85a9890 100644 --- a/label_maker/images.py +++ b/label_maker/images.py @@ -70,6 +70,7 @@ def class_test(value): # get image acquisition function based on imagery string image_function = get_image_function(imagery) + kwargs['imagery_offset'] = imagery_offset for tile in tiles: - image_function(tile, imagery, tiles_dir, imagery_offset, kwargs) + image_function(tile, imagery, tiles_dir, kwargs) diff --git a/label_maker/utils.py b/label_maker/utils.py index cce8ca0..0d25466 100644 --- a/label_maker/utils.py +++ b/label_maker/utils.py @@ -35,7 +35,7 @@ def download_tile_tms(tile, imagery, folder, kwargs): w.write(r.content) return tile_img -def get_tile_tif(tile, imagery, folder, imagery_offset, kwargs): +def get_tile_tif(tile, imagery, folder, kwargs): """ Read a GeoTIFF with a window corresponding to a TMS tile @@ -46,7 +46,7 @@ def get_tile_tif(tile, imagery, folder, imagery_offset, kwargs): http://www.cogeo.org/in-depth.html """ bound = bounds(*[int(t) for t in tile.split('-')]) - imagery_offset = imagery_offset or [0, 0] + imagery_offset = kwargs.get('imagery_offset') or [0, 0] with rasterio.open(imagery) as src: x_res, y_res = src.transform[0], src.transform[4] p1 = Proj({'init': 'epsg:4326'}) @@ -88,7 +88,7 @@ def get_tile_tif(tile, imagery, folder, imagery_offset, kwargs): return tile_img -def get_tile_wms(tile, imagery, folder, imagery_offset, kwargs): +def get_tile_wms(tile, imagery, folder, kwargs): """ Read a WMS endpoint with query parameters corresponding to a TMS tile