Fix bugs in produce_lod1.py

produce_lod1.py

@@ -5,6 +5,16 @@ from pathlib import Path
 from typing import Tuple, List
 import argparse
 
+SCHEMA = {
+        "geometry": "Polygon",
+        "properties":{
+            "source": "str",
+            "id": "str",
+            "region": "str",
+            "height": "float",
+            "var": "float"
+            }
+        }
 
 # ============================================================
 # 1. JSON → SQLite (streaming, memory safe)
@@ -46,78 +56,65 @@ def build_sqlite_index(json_path: Path, sqlite_path: Path):
 # 2. GeoJSON enrichment (streaming)
 # ============================================================
 def enrich_geojson(
-    geojson1: Path,      # primary geometry + properties
-    geojson2: Path,      # secondary geometry + properties
-    sqlite_path: Path,   # height/var index
+    geojson1: Path,
+    geojson2: Path,
+    sqlite_path: Path,
     geojson_out: Path,
 ):
     geojson_out.parent.mkdir(parents=True, exist_ok=True)
 
     # ---------------------------------------------------------
-    # 1. Index GeoJSON2 by key (properties only)
+    # Open SQLite
     # ---------------------------------------------------------
-    props_index = {}
+    conn = sqlite3.connect(sqlite_path)
+    cur = conn.cursor()
+
+    # ---------------------------------------------------------
+    # Read schema from geojson1 (assumed compatible)
+    # ---------------------------------------------------------
+    meta = {}
+    meta["schema"] = SCHEMA
+    meta["crs"] = "EPSG:3857"
+
+    # ---------------------------------------------------------
+    # Write output
+    # ---------------------------------------------------------
+    with fiona.open(geojson_out, "w", **meta) as dst:
+
+        # ---- helper to enrich & write one feature
+        def process_feature(feat):
+            p = dict(feat["properties"])
 
-    with fiona.open(geojson2, "r") as src2:
-        for feat in src2:
-            p = feat["properties"]
             key = (
                 str(p.get("source", "")) +
                 str(p.get("id", "")) +
                 str(p.get("region", ""))
             )
-            props_index[key] = dict(p)
 
-    # ---------------------------------------------------------
-    # 2. Open SQLite
-    # ---------------------------------------------------------
-    conn = sqlite3.connect(sqlite_path)
-    cur = conn.cursor()
-
-    # ---------------------------------------------------------
-    # 3. Stream GeoJSON1 and merge
-    # ---------------------------------------------------------
-    with fiona.open(geojson1, "r") as src1:
-        meta = src1.meta
+            cur.execute(
+                "SELECT height, var FROM kv WHERE key=?",
+                (key,)
+            )
+            row = cur.fetchone()
 
-        # Extend schema
-        schema_props = meta["schema"]["properties"]
-        schema_props["height"] = "float"
-        schema_props["var"] = "float"
-        meta["schema"]["properties"] = schema_props
+            if row:
+                p["height"], p["var"] = row
+            else:
+                p["height"] = None
+                p["var"] = None
 
-        # Enforce CRS if needed
-        meta["crs"] = "EPSG:3857"
+            feat["properties"] = p
+            dst.write(feat)
 
-        with fiona.open(geojson_out, "w", **meta) as dst:
+        # ---- stream geojson1
+        with fiona.open(geojson1, "r") as src1:
             for feat in src1:
-                p = dict(feat["properties"])
-
-                key = (
-                    str(p.get("source", "")) +
-                    str(p.get("id", "")) +
-                    str(p.get("region", ""))
-                )
-
-                # ---- merge properties from GeoJSON2
-                if key in props_index:
-                    p.update(props_index[key])
-
-                # ---- lookup height / var
-                cur.execute(
-                    "SELECT height, var FROM kv WHERE key=?",
-                    (key,)
-                )
-                row = cur.fetchone()
-
-                if row:
-                    p["height"], p["var"] = row
-                else:
-                    p["height"] = None
-                    p["var"] = None
-
-                feat["properties"] = p
-                dst.write(feat)
+                process_feature(feat)
+
+        # ---- stream geojson2
+        with fiona.open(geojson2, "r") as src2:
+            for feat in src2:
+                process_feature(feat)
 
     conn.close()
 # ============================================================