mirrors/PMTiles
1
0
Fork 0
mirror of https://github.com/protomaps/PMTiles.git synced 2026-02-04 10:51:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #478 with correct y-flip logic where the default is y=0 at top; add 'tms' scheme for zxy with flipped y (#479)

Browse Source
This commit is contained in:
Lars Maxfield
2024-10-12 07:08:44 +02:00
committed by GitHub
parent 66303480b6
commit 28960a9e6f
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/bin/pmtiles-convert
View File

@@ -19,7 +19,7 @@ parser.add_argument(
"--overwrite", help="Overwrite the existing output.", action="store_true" "--overwrite", help="Overwrite the existing output.", action="store_true"
) )
parser.add_argument( parser.add_argument(
"--scheme", help="Tiling scheme of the input directory ('ags', 'gwc', 'zyx', 'zxy' (default))." "--scheme", help="Tiling scheme of the input directory ('ags', 'gwc', 'tms', 'zyx', 'zxy' (default))."
) )
parser.add_argument( parser.add_argument(
"--format", help="Raster image format of tiles in the input directory ('png', 'jpeg', 'webp', 'avif') if not provided in the metadata.", dest="tile_format" "--format", help="Raster image format of tiles in the input directory ('png', 'jpeg', 'webp', 'avif') if not provided in the metadata.", dest="tile_format"

15
python/pmtiles/convert.py
View File

@@ -193,7 +193,7 @@ def disk_to_pmtiles(directory_path, output, maxzoom, **kwargs):
maxzoom (int, "auto"): Max zoom level to use. If "auto", uses highest zoom in directory. maxzoom (int, "auto"): Max zoom level to use. If "auto", uses highest zoom in directory.
Keyword args: Keyword args:
scheme (str): Tiling scheme of the directory ('ags', 'gwc', 'zyx', 'zxy' (default)). scheme (str): Tiling scheme of the directory ('ags', 'gwc', 'tms', 'zyx', 'zxy' (default)).
tile_format (str): Image format of the tiles ('png', 'jpeg', 'webp', 'avif') if not given in the metadata. tile_format (str): Image format of the tiles ('png', 'jpeg', 'webp', 'avif') if not given in the metadata.
verbose (bool): Set True to print progress. verbose (bool): Set True to print progress.
@@ -247,11 +247,11 @@ def disk_to_pmtiles(directory_path, output, maxzoom, **kwargs):
count = 0 count = 0
for row_dir in get_dirs(os.path.join(directory_path, zoom_dir)): for row_dir in get_dirs(os.path.join(directory_path, zoom_dir)):
if scheme == 'ags': if scheme == 'ags':
y = flip_y(z, int(row_dir.replace("R", ""), 16)) y = int(row_dir.replace("R", ""), 16)
elif scheme == 'gwc': elif scheme == 'gwc':
pass pass
elif scheme == 'zyx': elif scheme == 'zyx':
y = flip_y(int(z), int(row_dir)) y = int(row_dir)
else: else:
x = int(row_dir) x = int(row_dir)
for current_file in os.listdir(os.path.join(directory_path, zoom_dir, row_dir)): for current_file in os.listdir(os.path.join(directory_path, zoom_dir, row_dir)):
@@ -259,21 +259,20 @@ def disk_to_pmtiles(directory_path, output, maxzoom, **kwargs):
pass pass
else: else:
file_name, _ = current_file.split('.',1) file_name, _ = current_file.split('.',1)
if scheme == 'xyz': if scheme == 'tms':
y = flip_y(int(z), int(file_name)) y = flip_y(z, int(file_name))
elif scheme == 'ags': elif scheme == 'ags':
x = int(file_name.replace("C", ""), 16) x = int(file_name.replace("C", ""), 16)
elif scheme == 'gwc': elif scheme == 'gwc':
x, y = file_name.split('_') x, y = file_name.split('_')
x = int(x) x = int(x)
y = int(y) y = flip_y(z, int(y))
elif scheme == 'zyx': elif scheme == 'zyx':
x = int(file_name) x = int(file_name)
else: else:
y = int(file_name) y = int(file_name)
flipped = (1 << z) - 1 - y tileid = zxy_to_tileid(z, x, y)
tileid = zxy_to_tileid(z, x, flipped)
filepath = os.path.join(directory_path, zoom_dir, row_dir, current_file) filepath = os.path.join(directory_path, zoom_dir, row_dir, current_file)
tileid_path_set.append((tileid, filepath)) tileid_path_set.append((tileid, filepath))
count = count + 1 count = count + 1