From 60a5c15fbde673a69b869510ddbc37f8962d9c85 Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Thu, 18 Sep 2025 02:56:24 +0200 Subject: [PATCH] work --- README.md | 3 ++- modules/tile_gen/tile_gen_lib/btrfs.py | 4 ++-- modules/tile_gen/tile_gen_lib/config.py | 1 - modules/tile_gen/tile_gen_lib/planetiler.py | 15 ++++++++------- modules/tile_gen/tile_gen_lib/rclone.py | 2 +- modules/tile_gen/tile_gen_lib/set_version.py | 4 ++-- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 115daae..b41e2cf 100644 --- a/README.md +++ b/README.md @@ -187,7 +187,8 @@ See [dev setup docs](docs/dev_setup.md). ##### v0.9 -Updated Planetiler version to 33b22c +Updated Planetiler version to latest + ##### v0.8 diff --git a/modules/tile_gen/tile_gen_lib/btrfs.py b/modules/tile_gen/tile_gen_lib/btrfs.py index 353a0a2..71a4475 100644 --- a/modules/tile_gen/tile_gen_lib/btrfs.py +++ b/modules/tile_gen/tile_gen_lib/btrfs.py @@ -3,8 +3,8 @@ import shutil import subprocess from pathlib import Path -from tile_gen_lib.config import config -from tile_gen_lib.utils import python_venv_executable +from .config import config +from .utils import python_venv_executable IMAGE_SIZE = '200G' diff --git a/modules/tile_gen/tile_gen_lib/config.py b/modules/tile_gen/tile_gen_lib/config.py index cfa870d..e64eebe 100644 --- a/modules/tile_gen/tile_gen_lib/config.py +++ b/modules/tile_gen/tile_gen_lib/config.py @@ -1,7 +1,6 @@ import json import subprocess from pathlib import Path -from pprint import pprint class Configuration: diff --git a/modules/tile_gen/tile_gen_lib/planetiler.py b/modules/tile_gen/tile_gen_lib/planetiler.py index 76d4e78..d3dbb89 100644 --- a/modules/tile_gen/tile_gen_lib/planetiler.py +++ b/modules/tile_gen/tile_gen_lib/planetiler.py @@ -4,8 +4,8 @@ import subprocess from datetime import datetime, timezone from pathlib import Path -from tile_gen_lib.btrfs import cleanup_folder -from tile_gen_lib.config import config +from .btrfs import cleanup_folder +from .config import config def run_planetiler(area: str) -> Path: @@ -16,12 +16,13 @@ def run_planetiler(area: str) -> Path: area_dir = config.runs_dir / area # delete all previous runs for the given area - for subdir in area_dir.iterdir(): - cleanup_folder(subdir) + if area_dir.is_dir(): + for subdir in area_dir.iterdir(): + cleanup_folder(subdir) - print('running rmtree') - shutil.rmtree(area_dir, ignore_errors=True) - print('rmtree done') + print('running rmtree') + shutil.rmtree(area_dir, ignore_errors=True) + print('rmtree done') run_folder = area_dir / f'{date}_pt' run_folder.mkdir(parents=True, exist_ok=True) diff --git a/modules/tile_gen/tile_gen_lib/rclone.py b/modules/tile_gen/tile_gen_lib/rclone.py index 5f05981..2d6c50c 100644 --- a/modules/tile_gen/tile_gen_lib/rclone.py +++ b/modules/tile_gen/tile_gen_lib/rclone.py @@ -1,7 +1,7 @@ import subprocess import sys -from tile_gen_lib.config import config +from .config import config def upload_area(area): diff --git a/modules/tile_gen/tile_gen_lib/set_version.py b/modules/tile_gen/tile_gen_lib/set_version.py index 2f873eb..0629c64 100644 --- a/modules/tile_gen/tile_gen_lib/set_version.py +++ b/modules/tile_gen/tile_gen_lib/set_version.py @@ -1,7 +1,7 @@ import subprocess -from tile_gen_lib.config import config -from tile_gen_lib.shared import check_host_version, get_deployed_version, get_versions_for_area +from .config import config +from .shared import check_host_version, get_deployed_version, get_versions_for_area def check_and_set_version(area, version):