Sketch out writing a tile.json file

Doesn't work because it doesn't include the tiles key

Author: awesomephant

tasks/make_boundaries/src/entities/Tileset.py

@@ -15,5 +15,5 @@ def __init__(
         self.make_fn = make_fn
         self.make_args = make_args
 
-    def make(self) -> str | None:
+    def make(self) -> list[str] | None:
         return self.make_fn(**self.make_args)

tasks/make_boundaries/src/main.py

@@ -88,7 +88,7 @@ def run():
         print(f"Making {k}...")
         f = tilesets[k].make()
         if f:
-            new_files.append(f)
+            new_files.extend(f)
         else:
             failed_files.append(k)
 

tasks/make_boundaries/src/usecases/make_admin.py

@@ -1,3 +1,4 @@
+import os
 from datetime import date
 
 import geopandas as gp
@@ -15,8 +16,10 @@ def make_admin(cache_dir: str, output_dir: str, date: date):
 
     # 1. Fetch the BKG data we need
     ds = date.strftime("%Y-%m-%d")
-    json_path = f"{cache_dir}/admin_boundaries_{ds}.geojson"
-    versatiles_path = f"{output_dir}/admin_boundaries_{ds}.versatiles"
+    json_path = os.path.join(cache_dir, f"admin_boundaries_{ds}.geojson")
+    versatiles_path = os.path.join(output_dir, f"admin_boundaries_{ds}.versatiles")
+    tilejson_path = versatiles_path.replace(".versatiles", ".json")
+
     fp = "vg250_01-01.utm32s.shape.ebenen/vg250_ebenen_0101"
 
     zip_name = "vg250_01-01.utm32s.shape.ebenen.zip"
@@ -88,9 +91,9 @@ def make_admin(cache_dir: str, output_dir: str, date: date):
     print(f"Wrote to {json_path}")
 
     try:
-        make_versatiles(json_path, versatiles_path, date)
+        make_versatiles(json_path, versatiles_path, tilejson_path, date)
     except Exception:
         print(f"Failed to build {versatiles_path}")
         return
 
-    return versatiles_path
+    return [versatiles_path]

tasks/make_boundaries/src/usecases/make_admin_labels.py

@@ -1,4 +1,5 @@
 import datetime
+import os
 from typing import Dict
 
 import geopandas as gp
@@ -33,8 +34,11 @@ def make_admin_labels(cache_dir: str, output_dir: str, date: datetime.date):
 
     # 1. Fetch the BKG data we need
     ds = date.strftime("%Y-%m-%d")
-    json_path = f"{cache_dir}/admin_labels_{ds}.geojson"
-    versatiles_path = f"{output_dir}/admin_labels_{ds}.versatiles"
+
+    json_path = os.path.join(cache_dir, f"admin_labels_{ds}.geojson")
+    versatiles_path = os.path.join(output_dir, f"admin_labels_{ds}.versatiles")
+    tilejson_path = versatiles_path.replace(".versatiles", ".json")
+
     fp = "vg250_01-01.utm32s.shape.ebenen/vg250_ebenen_0101"
 
     zip_name = "vg250_01-01.utm32s.shape.ebenen.zip"
@@ -123,9 +127,11 @@ def make_admin_labels(cache_dir: str, output_dir: str, date: datetime.date):
 
     # 4. Convert to versatiles
     try:
-        make_versatiles(json_path, versatiles_path, date, ["--base-zoom=5"])
+        make_versatiles(
+            json_path, versatiles_path, tilejson_path, date, ["--base-zoom=5"]
+        )
     except Exception:
         print(f"Failed to build {versatiles_path}")
         return
 
-    return versatiles_path
+    return [versatiles_path]

tasks/make_boundaries/src/usecases/make_versatiles.py

@@ -3,7 +3,11 @@
 
 
 def make_versatiles(
-    input_path: str, output_path: str, date: dt.date, tc_args: list[str] = []
+    input_path: str,
+    output_path: str,
+    tilejson_path: str,
+    date: dt.date,
+    tc_args: list[str] = [],
 ):
     mbtiles_path = output_path.replace(".versatiles", ".mbtiles")
     mbtiles_path_tmp = mbtiles_path.replace(".mbtiles", "_tmp.mbtiles")
@@ -36,10 +40,9 @@ def make_versatiles(
 
     # Unclear to me why this fixes overzoom but it does
     subprocess.run(["tile-join", "-f", "-o", mbtiles_path_tmp, mbtiles_path])
-
     print("done")
-    print("Converting to versatiles... ", end="")
 
+    print("Converting to versatiles... ", end="")
     subprocess.run(
         [
             "versatiles",
@@ -51,6 +54,20 @@ def make_versatiles(
     ).check_returncode()
     print("done")
 
+    print("Writing tiles.json... ", end="")
+    with open(tilejson_path, "w") as f:
+        subprocess.run(
+            [
+                "versatiles",
+                "dev",
+                "print-tilejson",
+                "-p",
+                output_path,
+            ],
+            stdout=f,
+        ).check_returncode()
+        print("done")
+
     print("Cleaning up temporary files... ", end="")
     subprocess.run(["rm", mbtiles_path]).check_returncode()
     subprocess.run(["rm", mbtiles_path_tmp]).check_returncode()