From 4326d079faea04f2d9061cbbe0e4ce17d71fda53 Mon Sep 17 00:00:00 2001 From: David Hoese <david.hoese@ssec.wisc.edu> Date: Tue, 19 May 2020 11:01:57 -0500 Subject: [PATCH] Fix a few bugs introduced in tile generation --- tile_gen/generate_tiles.py | 2 ++ tile_gen/run.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tile_gen/generate_tiles.py b/tile_gen/generate_tiles.py index d57be4f..65079a9 100644 --- a/tile_gen/generate_tiles.py +++ b/tile_gen/generate_tiles.py @@ -90,6 +90,8 @@ def main(): help="Input geotiffs to generate tiles for (separate from product lists with '--')") args = parser.parse_args() + # allow for glob patterns to reduce number of files passed through command line + args.input_files = [fn for glob_pat in args.input_files for fn in glob(glob_pat)] groups = group_files(args.products, args.input_files) all_added = set() all_removed = set() diff --git a/tile_gen/run.sh b/tile_gen/run.sh index a7f328e..d4c82c2 100755 --- a/tile_gen/run.sh +++ b/tile_gen/run.sh @@ -67,7 +67,9 @@ run_tile_gen() { fi echo "Generating tiles in directory: ${out_dir}" for product in ${G2G_PRODUCTS}; do + set -x json_times_changed=$(python3 generate_tiles.py ${TILE_ARGS} --json-times -p ${product} -- ${out_dir} "${path}") + set +x # OUT/<product>/<product>.shp glob_pattern="${out_dir/\{product\}/${product}}/*.shp" # Remove the /data prefix -- GitLab