From ee10501a38c4c74bf81bcf277998764054026e2b Mon Sep 17 00:00:00 2001 From: Paul Norman Date: Tue, 19 Nov 2024 12:08:42 -0800 Subject: [PATCH] Make progress bar optional --- tilekiln/scripts/generate.py | 17 +++++++++++++---- tilekiln/tilerange.py | 3 +++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/tilekiln/scripts/generate.py b/tilekiln/scripts/generate.py index c488db6..02ea2c4 100644 --- a/tilekiln/scripts/generate.py +++ b/tilekiln/scripts/generate.py @@ -33,9 +33,11 @@ def generate() -> None: @click.option('--storage-host') @click.option('--storage-port') @click.option('--storage-username') +@click.option('--progress/--no-progress', help='Display progress bar') def tiles(config: int, num_threads: int, source_dbname: str, source_host: str, source_port: int, source_username: str, - storage_dbname: str, storage_host: str, storage_port: int, storage_username: str) -> None: + storage_dbname: str, storage_host: str, storage_port: int, storage_username: str, + progress: bool) -> None: '''Generate specific tiles. A list of z/x/y tiles is read from stdin and those tiles are generated and saved @@ -57,7 +59,10 @@ def tiles(config: int, num_threads: int, "host": storage_host, "port": storage_port, "user": storage_username} - tilekiln.generator.generate(c, source_kwargs, storage_kwargs, tqdm(tiles), threads) + if progress: + tilekiln.generator.generate(c, source_kwargs, storage_kwargs, tqdm(tiles), threads) + else: + tilekiln.generator.generate(c, source_kwargs, storage_kwargs, tiles, threads) @generate.command() @@ -74,10 +79,11 @@ def tiles(config: int, num_threads: int, @click.option('--storage-username') @click.option('--min-zoom', type=click.INT, required=True) @click.option('--max-zoom', type=click.INT, required=True) +@click.option('--progress/--no-progress', help='Display progress bar') def zooms(config: int, num_threads: int, source_dbname: str, source_host: str, source_port: int, source_username: str, storage_dbname: str, storage_host: str, storage_port: int, storage_username: str, - min_zoom: int, max_zoom: int) -> None: + min_zoom: int, max_zoom: int, progress: bool) -> None: c = tilekiln.load_config(config) @@ -92,4 +98,7 @@ def zooms(config: int, num_threads: int, "host": storage_host, "port": storage_port, "user": storage_username} - tilekiln.generator.generate(c, source_kwargs, storage_kwargs, tqdm(tiles), threads) + if progress: + tilekiln.generator.generate(c, source_kwargs, storage_kwargs, tqdm(tiles), threads) + else: + tilekiln.generator.generate(c, source_kwargs, storage_kwargs, tiles, threads) diff --git a/tilekiln/tilerange.py b/tilekiln/tilerange.py index 431f836..78f21e8 100644 --- a/tilekiln/tilerange.py +++ b/tilekiln/tilerange.py @@ -12,3 +12,6 @@ def __iter__(self): def __len__(self): return self.maxid - self.minid + + def __contains__(self, value): + raise NotImplementedError