topo_map_processor 0.1.18__tar.gz → 0.1.19__tar.gz

{topo_map_processor-0.1.18 → topo_map_processor-0.1.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: topo_map_processor
-Version: 0.1.18
+Version: 0.1.19
 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
@@ -31,6 +31,7 @@ License: This is free and unencumbered software released into the public domain.
         For more information, please refer to <https://unlicense.org>
 License-File: LICENSE
 Requires-Python: >=3.12
+Requires-Dist: gh-release-tools>=0.1.12
 Requires-Dist: mercantile>=1.2.1
 Requires-Dist: pmtiles-mosaic>=0.1.0
 Requires-Dist: requests>=2.32.4
@@ -57,6 +58,7 @@ Requires-Dist: click==8.3.0; extra == 'pinned'
 Requires-Dist: colorama==0.4.6; (sys_platform == 'win32') and extra == 'pinned'
 Requires-Dist: colorlog==6.9.0; extra == 'pinned'
 Requires-Dist: frozenlist==1.7.0; extra == 'pinned'
+Requires-Dist: gh-release-tools==0.1.12; extra == 'pinned'
 Requires-Dist: idna==3.10; extra == 'pinned'
 Requires-Dist: mercantile==1.2.1; extra == 'pinned'
 Requires-Dist: multidict==6.6.4; extra == 'pinned'

{topo_map_processor-0.1.18 → topo_map_processor-0.1.19}/pyproject.toml

@@ -8,6 +8,7 @@ authors = [
     { name = "Sreeram Kandimalla", email = "kandimalla.sreeram@gmail.com" },
 ]
 dependencies = [
+    "gh-release-tools>=0.1.12",
     "mercantile>=1.2.1",
     "pmtiles-mosaic>=0.1.0",
     "requests>=2.32.4",
@@ -42,6 +43,7 @@ pinned = [
     "colorama==0.4.6 ; sys_platform == 'win32'",
     "colorlog==6.9.0",
     "frozenlist==1.7.0",
+    "gh-release-tools==0.1.12",
     "idna==3.10",
     "mercantile==1.2.1",
     "multidict==6.6.4",

{topo_map_processor-0.1.18 → topo_map_processor-0.1.19}/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.18'
-__version_tuple__ = version_tuple = (0, 1, 18)
+__version__ = version = '0.1.19'
+__version_tuple__ = version_tuple = (0, 1, 19)
 
 __commit_id__ = commit_id = None

{topo_map_processor-0.1.18 → topo_map_processor-0.1.19}/topo_map_processor/processor.py

@@ -134,6 +134,8 @@ class TopoMapProcessor:
         self.jpeg_export_quality = extra.get('jpeg_export_quality', 75)
         self.warp_jpeg_export_quality = extra.get('warp_jpeg_export_quality', 75)
         self.warp_output_height = extra.get('warp_output_height', 6500)
+        self.warp_resampling_method = extra.get('warp_resampling_method', 'bilinear')
+        self.export_resampling_method = extra.get('export_resampling_method', 'nearest') # nearest for backwards compatibility
 
 
         self.color_map = {
@@ -1790,15 +1792,17 @@ class TopoMapProcessor:
         warp_quality_config.update({'TILED': 'YES'})
         warp_quality_options = ' '.join([ f'-co {k}={v}' for k,v in warp_quality_config.items() ])
         if not set_resolution:
-            reproj_options = f'-tps -ts 0 {self.warp_output_height} -r bilinear -t_srs "EPSG:3857"' 
+            res_options = f'-ts 0 {self.warp_output_height}'
         else:
             res = self.get_resolution()
             if res == 'auto':
-                reproj_options = '-tps -r bilinear -t_srs "EPSG:3857"'
+                res_options = ''
             else:
                 if type(res) is not list:
                     res = [res, res]
-                reproj_options = f'-tps -tr {res[0]} {res[1]} -r bilinear -t_srs "EPSG:3857"' 
+                res_options = f'-tr {res[0]} {res[1]}' 
+
+        reproj_options = f'-tps {res_options} -r {self.warp_resampling_method} -t_srs "EPSG:3857"' 
 
         #nodata_options = '-dstnodata 0'
         nodata_options = '-dstalpha'
@@ -1903,7 +1907,8 @@ class TopoMapProcessor:
         mask_options = '--config GDAL_TIFF_INTERNAL_MASK YES  -b 1 -b 2 -b 3 -mask 4'
         perf_options = '--config GDAL_CACHEMAX 512'
         cog_options = '-of COG'
-        cmd = f'gdal_translate {perf_options} {mask_options} {creation_opts} {cog_options} {filename} {out_filename}'
+        resampling_options = f'-r {self.export_resampling_method}'
+        cmd = f'gdal_translate {perf_options} {mask_options} {creation_opts} {cog_options} {resampling_options} {filename} {out_filename}'
         self.run_external(cmd)
 
     def export(self):

{topo_map_processor-0.1.18 → topo_map_processor-0.1.19}/topo_map_processor/tools/retile_e2e.py

@@ -8,6 +8,7 @@ from pathlib import Path
 from multiprocessing import set_start_method
 
 from pmtiles_mosaic.partition import partition_main
+from release_tools.download_from_release import cli as download_from_release_main
 
 from .retile import retile_main
 from .create_force_redo_bounds import main as create_force_redo_bounds_main
@@ -112,15 +113,13 @@ def cli():
 
     # Download TIFFs
     print("Downloading TIFFs...")
-    with open(sheets_to_pull_list_outfile) as f:
-        for line in f:
-            fname = line.strip()
-            if fname:
-                print(f"Pulling {fname}")
-                try:
-                    run_command(["gh", "release", "download", args.gtiffs_release, "-p", fname, "-D", str(tiffs_dir), "--clobber"])
-                except subprocess.CalledProcessError as e:
-                    print(f"Failed to download {fname}. It might be a dummy sheet from force redo. Continuing...")
+    # The download script will report if files are not found, which is expected for dummy sheets.
+    if download_from_release_main([
+        "--release", args.gtiffs_release,
+        "--output-dir", str(tiffs_dir),
+        "--file-list", str(sheets_to_pull_list_outfile),
+    ]) != 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()