From 909a9447f8eeb972dc6d9e3348e3d5ff4a0e6aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonia=20P=C3=A9rez-Cerezo?= Date: Wed, 12 Mar 2025 21:09:03 +0100 Subject: [PATCH] Make script work with new umap.openstreetmap.de --- scripts/umap-extractor.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/umap-extractor.py b/scripts/umap-extractor.py index 6e0bfb5..3e330c1 100755 --- a/scripts/umap-extractor.py +++ b/scripts/umap-extractor.py @@ -17,13 +17,19 @@ outdir = args.output_dir base = url.split("/map/")[0] r = requests.get(url) -regexp = re.compile(r'U.MAP = new U.Map[(]"map", (.+) }\)', re.DOTALL) +new_umap = False + +if "new Umap" in r.text : + new_umap = True + regexp = re.compile(r'U.MAP = new Umap."map",(.+}\))', re.DOTALL) +else : + regexp = re.compile(r'U.MAP = new U.Map[(]"map", (.+) }\)', re.DOTALL) data = json.loads(regexp.findall(r.text, re.DOTALL)[0].replace("})","}")) properties = data["properties"] layers = properties["datalayers"] -map_id = properties["umap_id"] +map_id = properties["id" if new_umap else "umap_id"] config = {} config["name"] = properties["name"]