From dde3b35b469f5b58e1575a76ec0a35aaeafc020a Mon Sep 17 00:00:00 2001 From: Eric Duminil <eric.duminil@gmail.com> Date: Sun, 23 Mar 2025 17:06:33 +0100 Subject: [PATCH] Slight refactor --- download_files_from_LGL_BW.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/download_files_from_LGL_BW.py b/download_files_from_LGL_BW.py index 6971dfc..9e4724c 100644 --- a/download_files_from_LGL_BW.py +++ b/download_files_from_LGL_BW.py @@ -10,7 +10,7 @@ This script downloads the required tiles for given regions Usage: python download_files_from_LGL_BW.py StuttgartCenter "POLYGON((9.175287 48.780916, 9.185501 48.777522, 9.181467 48.773704, 9.174429 48.768472, 9.168807 48.773902, 9.175287 48.780916))" python download_files_from_LGL_BW.py Freiburg "79098,79102" - python download_files_from_LGL_BW.py MyRegion "70567" --download-only + python download_files_from_LGL_BW.py Möhringen "70567" --download-only python download_files_from_LGL_BW.py CustomPath "POLYGON(...)" --simstadt-folder "/path/to/SimStadt" Required: @@ -29,7 +29,6 @@ import urllib.request import time import zipfile import logging -import sys from pyproj import CRS from pyproj import Transformer @@ -43,10 +42,7 @@ from get_coordinates_by_zipcode import get_coordinates_by_zipcode # Setup logging logging.basicConfig( level=logging.INFO, - format='%(asctime)s - %(levelname)s - %(message)s', - handlers=[ - logging.StreamHandler(sys.stdout) - ] + format='%(levelname)s - %(message)s', ) logger = logging.getLogger(__name__) @@ -116,6 +112,7 @@ def download_whole_region(output_dir: Path, wkt_region: str, x1: int, x2: int, y wgs84_region = wkt.loads(wkt_region) local_region = transform(TO_LOCAL_CRS.transform, wgs84_region) + for x in range(x1, x2 + 1, RASTER): for y in range(y1, y2 + 1, RASTER): tile_center = Point((x + 1) * KILOMETER, (y + 1) * KILOMETER) @@ -225,7 +222,7 @@ def parse_arguments(): Examples: python download_files_from_LGL_BW.py StuttgartCenter "POLYGON((9.175287 48.780916, 9.185501 48.777522, 9.181467 48.773704, 9.174429 48.768472, 9.168807 48.773902, 9.175287 48.780916))" python download_files_from_LGL_BW.py Freiburg "79098,79102" - python download_files_from_LGL_BW.py MyRegion "70567" --download-only + python download_files_from_LGL_BW.py Möhringen "70567" --download-only """ ) @@ -272,12 +269,11 @@ def main(): # Extract region if not download-only if not download_only: + simstadt_folder = simstadt_folder or find_simstadt_folder() if not simstadt_folder: - simstadt_folder = find_simstadt_folder() - if not simstadt_folder: - logger.error( - "No SimStadt installation found! Please provide --simstadt-folder or use --download-only.") - return + logger.error( + "No SimStadt installation found! Please provide --simstadt-folder or use --download-only.") + return extract_region(output_dir, location_name, wkt_str, simstadt_folder) else: -- GitLab