Move json metadata saving to end of tile generation
This commit is contained in:
parent
28e5196412
commit
dd2105a1a7
60
ipmap.py
60
ipmap.py
|
@ -81,39 +81,15 @@ def generate_tiles(parquet_path: Path, tiles_dir: Path, *, tile_size = default_t
|
|||
else:
|
||||
raise ValueError(f"unknown variant '{variant}'")
|
||||
|
||||
if json_path:
|
||||
if json_path is not None:
|
||||
if json_path.is_dir():
|
||||
raise ValueError("json path must not be a directory")
|
||||
try:
|
||||
tiles_dir_parts = tiles_dir.relative_to(json_path.parent).parts
|
||||
except ValueError:
|
||||
raise ValueError("tiles path must be relative to the json path")
|
||||
try:
|
||||
text = json_path.read_text(encoding = "UTF-8")
|
||||
except:
|
||||
if not quiet:
|
||||
print("json file not found at provided path, so it will be created instead")
|
||||
tile_metadata = {}
|
||||
else:
|
||||
try:
|
||||
tile_metadata: dict = json.loads(text)
|
||||
except:
|
||||
raise ValueError("invalid json found at provided path")
|
||||
tile_metadata_cur = tile_metadata
|
||||
for part in tiles_dir_parts:
|
||||
if not part in tile_metadata_cur:
|
||||
tile_metadata_cur[part] = {}
|
||||
tile_metadata_cur = tile_metadata_cur[part]
|
||||
for variant in variants:
|
||||
if not variant in tile_metadata_cur:
|
||||
tile_metadata_cur[variant] = colormaps
|
||||
else:
|
||||
tile_metadata_cur[variant] = dedup_preserving_order(tile_metadata_cur[variant] + colormaps)
|
||||
if not quiet:
|
||||
print(f"writing metadata to json file at '{json_path}'...", end = " ", flush = True)
|
||||
json_path.write_text(json.dumps(tile_metadata, indent=2), encoding = "UTF-8")
|
||||
if not quiet:
|
||||
print("done")
|
||||
else:
|
||||
tiles_dir_parts = None
|
||||
|
||||
if not quiet:
|
||||
print(f"reading parquet '{parquet_path}'...", end = " ", flush = True)
|
||||
|
@ -186,6 +162,36 @@ def generate_tiles(parquet_path: Path, tiles_dir: Path, *, tile_size = default_t
|
|||
if tiles_per_side == 1:
|
||||
break
|
||||
scale_down_coords()
|
||||
|
||||
if json_path is not None and tiles_dir_parts is not None:
|
||||
try:
|
||||
text = json_path.read_text(encoding = "UTF-8")
|
||||
except:
|
||||
if not quiet:
|
||||
print("json file not found at provided path, so it will be created instead")
|
||||
tile_metadata = {}
|
||||
else:
|
||||
try:
|
||||
tile_metadata: dict = json.loads(text)
|
||||
except:
|
||||
if not quiet:
|
||||
print("invalid json found at provided path, so re-creating file")
|
||||
tile_metadata = {}
|
||||
tile_metadata_cur = tile_metadata
|
||||
for part in tiles_dir_parts:
|
||||
if not part in tile_metadata_cur:
|
||||
tile_metadata_cur[part] = {}
|
||||
tile_metadata_cur = tile_metadata_cur[part]
|
||||
for variant in variants:
|
||||
if not variant in tile_metadata_cur:
|
||||
tile_metadata_cur[variant] = colormaps
|
||||
else:
|
||||
tile_metadata_cur[variant] = dedup_preserving_order(tile_metadata_cur[variant] + colormaps)
|
||||
if not quiet:
|
||||
print(f"writing metadata to json file at '{json_path}'...", end = " ", flush = True)
|
||||
json_path.write_text(json.dumps(tile_metadata, indent=2), encoding = "UTF-8")
|
||||
if not quiet:
|
||||
print("done")
|
||||
|
||||
def remove_tiles(tiles_dir: Path, *, json_path: Path | None = None, quiet = False):
|
||||
if not tiles_dir.is_dir():
|
||||
|
|
Loading…
Reference in New Issue