topo_map_processor 0.1.21__tar.gz → 0.1.23__tar.gz

{topo_map_processor-0.1.21 → topo_map_processor-0.1.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: topo_map_processor
-Version: 0.1.21
+Version: 0.1.23
 Summary: Library for processing topographic maps
 Project-URL: homepage, https://github.com/ramSeraph/topo_map_processor
 Project-URL: repository, https://github.com/ramSeraph/topo_map_processor.git
@@ -303,7 +303,8 @@ tile --tiles-dir <dir> --tiffs-dir <dir> --max-zoom <zoom> --name <name> --descr
 ```
 
 -   `--tiles-dir`: Directory to store the output tiles. (Required)
--   `--tiffs-dir`: Directory containing the input GeoTIFF files. (Required)
+-   `--tiffs-dir`: Directory containing the input GeoTIFF files. (Optional if `--tiffs-list-file` is used)
+-   `--tiffs-list-file`: File containing a list of tiff files to tile. (Optional if `--tiffs-dir` is used)
 -   `--max-zoom`: Maximum zoom level for tiling. (Required)
 -   `--name`: Name of the mosaic. (Required)
 -   `--description`: Description of the mosaic. (Required)

{topo_map_processor-0.1.21 → topo_map_processor-0.1.23}/README.md

@@ -226,7 +226,8 @@ tile --tiles-dir <dir> --tiffs-dir <dir> --max-zoom <zoom> --name <name> --descr
 ```
 
 -   `--tiles-dir`: Directory to store the output tiles. (Required)
--   `--tiffs-dir`: Directory containing the input GeoTIFF files. (Required)
+-   `--tiffs-dir`: Directory containing the input GeoTIFF files. (Optional if `--tiffs-list-file` is used)
+-   `--tiffs-list-file`: File containing a list of tiff files to tile. (Optional if `--tiffs-dir` is used)
 -   `--max-zoom`: Maximum zoom level for tiling. (Required)
 -   `--name`: Name of the mosaic. (Required)
 -   `--description`: Description of the mosaic. (Required)

{topo_map_processor-0.1.21 → topo_map_processor-0.1.23}/topo_map_processor/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.1.21'
-__version_tuple__ = version_tuple = (0, 1, 21)
+__version__ = version = '0.1.23'
+__version_tuple__ = version_tuple = (0, 1, 23)
 
 __commit_id__ = commit_id = None

{topo_map_processor-0.1.21 → topo_map_processor-0.1.23}/topo_map_processor/tools/retile_e2e.py

@@ -50,11 +50,14 @@ def cli():
     parser = argparse.ArgumentParser(description="End-to-end retiling script.")
     parser.add_argument("-p", "--pmtiles-release", required=True, help="PMTiles release tag")
     parser.add_argument("-g", "--gtiffs-release", required=True, help="GeoTIFFs release tag")
+    parser.add_argument("-r", "--repo", required=False, help="Github repo to download from and upload to")
     parser.add_argument("-x", "--pmtiles-prefix", required=True, help="Prefix for PMTiles files")
     parser.add_argument("--bounds-file-tiled", required=True, help="Name of the bounds file in the pmtiles release (the old bounds file)")
     parser.add_argument("--no-cache", action='store_true', required=False, help="Don't cache files locally during pmtiles partitioning")
     args = parser.parse_args()
 
+    repo_arg = ["--repo", args.repo] if args.repo else []
+
     # Define paths and filenames
     sheets_to_pull_list_outfile = Path("sheets_to_pull_list.txt")
     tiles_dir = Path("staging/tiles/")
@@ -75,10 +78,10 @@ def cli():
 
     # Download bounds files
     print("Downloading new bounds file from gtiffs release...")
-    run_command(["gh", "release", "download", args.gtiffs_release, "-p", "bounds.geojson", "--clobber", "-O", str(new_bounds_file)])
+    run_command(["gh", "release", "download", args.gtiffs_release, "-p", "bounds.geojson", "--clobber", "-O", str(new_bounds_file)] + repo_arg)
     
     print("Downloading old bounds file from pmtiles release...")
-    run_command(["gh", "release", "download", args.pmtiles_release, "-p", args.bounds_file_tiled, "--clobber", "-O", str(old_bounds_file)])
+    run_command(["gh", "release", "download", args.pmtiles_release, "-p", args.bounds_file_tiled, "--clobber", "-O", str(old_bounds_file)] + repo_arg)
 
     # Create force redo bounds file
     print("Creating force redo bounds file...")
@@ -98,7 +101,7 @@ def cli():
 
     # Download original PMTiles
     print("Getting original PMTiles files...")
-    run_command(["gh", "release", "download", args.pmtiles_release, "-D", str(from_pmtiles_dir), "-p", f"{args.pmtiles_prefix}*"])
+    run_command(["gh", "release", "download", args.pmtiles_release, "-D", str(from_pmtiles_dir), "-p", f"{args.pmtiles_prefix}*"] + repo_arg)
 
     # Get list of sheets to pull
     print("Getting list of sheets to pull...")
@@ -115,11 +118,12 @@ def cli():
     # Download TIFFs
     print("Downloading TIFFs...")
     # The download script will report if files are not found, which is expected for dummy sheets.
-    if download_from_release_main([
+    download_args = [
         "--release", args.gtiffs_release,
         "--output-dir", str(tiffs_dir),
         "--file-list", str(sheets_to_pull_list_outfile),
-    ]) != 0:
+    ] + repo_arg
+    if download_from_release_main(download_args) != 0:
         print("Some TIFFs failed to download. This may be expected for dummy sheets from force redo. Continuing...", file=sys.stderr)
 
     sheets_to_pull_list_outfile.unlink()
@@ -150,18 +154,18 @@ def cli():
     print("Deleting old PMTiles files from the release...")
     old_pmtiles = glob.glob(f"{from_pmtiles_dir}/{args.pmtiles_prefix}*")
     for pmtile in old_pmtiles:
-        run_command(["gh", "release", "delete-asset", args.pmtiles_release, Path(pmtile).name, "-y"])
+        run_command(["gh", "release", "delete-asset", args.pmtiles_release, Path(pmtile).name, "-y"] + repo_arg)
 
     print("Uploading new PMTiles files...")
     new_pmtiles = glob.glob(f"{to_pmtiles_prefix}*")
-    run_command(["gh", "release", "upload", args.pmtiles_release, "--clobber"] + new_pmtiles)
+    run_command(["gh", "release", "upload", args.pmtiles_release, "--clobber"] + repo_arg + new_pmtiles)
 
     # Handle bounds file
     print("Uploading new bounds file to pmtiles release...")
     upload_bounds_file = Path(args.bounds_file_tiled)
     new_bounds_file.rename(upload_bounds_file)
     
-    run_command(["gh", "release", "upload", args.pmtiles_release, str(upload_bounds_file), "--clobber"])
+    run_command(["gh", "release", "upload", args.pmtiles_release, str(upload_bounds_file), "--clobber"] + repo_arg)
     
     upload_bounds_file.unlink()
 

{topo_map_processor-0.1.21 → topo_map_processor-0.1.23}/topo_map_processor/tools/tile.py

@@ -75,7 +75,9 @@ def cli():
 
     parser = argparse.ArgumentParser(description='Tile the GTiffs and create a TileJSON file')
     parser.add_argument('--tiles-dir', required=True, help='Directory to store the tiles')
-    parser.add_argument('--tiffs-dir', required=True, help='Directory with GTiffs to tile')
+    tiffs_group = parser.add_mutually_exclusive_group(required=True)
+    tiffs_group.add_argument('--tiffs-dir', help='Directory with GTiffs to tile')
+    tiffs_group.add_argument('--tiffs-list-file', help='File containing a list of tiff files to tile')
     parser.add_argument('--max-zoom', type=int, required=True, help='Maximum zoom level for tiling')
     parser.add_argument('--min-zoom', type=int, default=0, help='Minimum zoom level for tiling')
     parser.add_argument('--tile-extension', type=str, default='webp', choices=SUPPORTED_FORMATS, help='Tile file extension (default: webp)')
@@ -102,8 +104,15 @@ def cli():
     tiles_dir = Path(args.tiles_dir)
     tiles_dir.mkdir(parents=True, exist_ok=True)
 
-    file_names = list(glob.glob(f'{args.tiffs_dir}/*.tif'))
-    file_names = [ str(Path(f).resolve()) for f in file_names ]
+    if args.tiffs_dir:
+        file_names = list(glob.glob(f'{args.tiffs_dir}/*.tif'))
+        file_names = [ str(Path(f).resolve()) for f in file_names ]
+    else:
+        tiff_list_path = Path(args.tiffs_list_file)
+        if not tiff_list_path.exists():
+            parser.error(f'Tiffs list file {args.tiffs_list_file} does not exist')
+        file_names = [str(Path(line.strip()).resolve()) for line in tiff_list_path.read_text().splitlines() if line.strip()]
+
     print(f'total files: {len(file_names)}')
 
     file_list_file = Path('files_to_tile.txt')