From 5852565db40063d389a35a1003070d1335edb113 Mon Sep 17 00:00:00 2001
From: Daniel Baron <daniel@barooney.com>
Date: Sat, 6 Dec 2025 21:44:26 +0100
Subject: [PATCH] Added columns for planting year and object numbers. Fixed
 typo in migration comment for trees table. Modified existing columns to match
 new export format. :( Modified import script to match new export format.

---
 preparation/import.py                            | 16 +++++++++-------
 .../20240316110547_create_trees_table.sql        |  2 +-
 ...193003_add_trees_columns_from_city_import.sql |  6 ++++++
 3 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 supabase/migrations/20251206193003_add_trees_columns_from_city_import.sql

diff --git a/preparation/import.py b/preparation/import.py
index 4713120..0a64b10 100644
--- a/preparation/import.py
+++ b/preparation/import.py
@@ -36,15 +36,15 @@ def create_insert_data(feature, provider_id):
         "source_id": feature["properties"]["pitID"],
         "location": feature["properties"]["Standort_N"],
         "location_addition": feature["properties"]["Zusatz"],
-        "current_number": feature["properties"]["laufende_n"],
-        "chopped": feature["properties"]["gefaellt"],
+        "current_number": feature["properties"]["laufende_N"],
+        "chopped": 1 if feature["properties"]["gefaellt"] == "WAHR" else 0,
         "trunk_diameter": feature["properties"]["Stammdurch"],
         "trunk_circumference": feature["properties"]["Stammumfan"],
         "crown_diameter": feature["properties"]["Kronendurc"],
         "height": feature["properties"]["Baumhoehe_"],
-        "tree_group": feature["properties"]["Baumgruppe"],
+        "tree_group": feature["properties"]["Baumgruppe"] or "",
         "district_number": feature["properties"]["Bezirk_Nr"],
-        "district_name": feature["properties"]["Bezirk_Bez"],
+        "district_name": feature["properties"]["Bezirk_Bez"] if "Bezirk_Bez" in feature["properties"] else None,
         "object_number": feature["properties"]["Objekt_Nr"],
         "object_name": feature["properties"]["Objekt_Bez"],
         "tree_type_botanic": feature["properties"]["Baumart_bo"],
@@ -52,9 +52,11 @@ def create_insert_data(feature, provider_id):
         "tree_type_short": feature["properties"]["Baumart_ku"],
         "care_number": feature["properties"]["PflE_Art_N"],
         "care_type": feature["properties"]["PflE_Art_B"],
-        "trunk_radius": feature["properties"]["Stammradiu"],
-        "crown_radius": feature["properties"]["Kronenradi"],
-        "geocoordinates": "POINT(" + str(feature["geometry"]["coordinates"][0]) + " " + str(feature["geometry"]["coordinates"][1]) + ")"
+        "trunk_radius": feature["properties"]["Stammdurch"] / 2 if feature["properties"]["Stammdurch"] is not None else None,
+        "crown_radius": feature["properties"]["Kronendurc"] / 2 if feature["properties"]["Kronendurc"] is not None else None,
+        "geocoordinates": "POINT(" + str(feature["geometry"]["coordinates"][0]) + " " + str(feature["geometry"]["coordinates"][1]) + ")",
+        "object_number_1": feature["properties"]["Standort_N"],
+        "planting_year": feature["properties"]["Pflanzjahr"] or 0,
     }
 
 
diff --git a/supabase/migrations/20240316110547_create_trees_table.sql b/supabase/migrations/20240316110547_create_trees_table.sql
index 517134e..c4ec793 100644
--- a/supabase/migrations/20240316110547_create_trees_table.sql
+++ b/supabase/migrations/20240316110547_create_trees_table.sql
@@ -12,7 +12,7 @@ create table public.trees
     uuid                uuid default uuid_generate_v4() primary key,
     provider_id         uuid references public.providers (uuid) on delete set null on update cascade default null,
     source_id           varchar not null, -- ID from the source (pitID)
-    location            bigint not null,  -- Standord_N
+    location            bigint not null,  -- Standort_N
     location_addition   varchar, -- Zusatz
     current_number      bigint, -- laufende_n
     chopped             boolean, -- gefaellt
diff --git a/supabase/migrations/20251206193003_add_trees_columns_from_city_import.sql b/supabase/migrations/20251206193003_add_trees_columns_from_city_import.sql
new file mode 100644
index 0000000..af5886d
--- /dev/null
+++ b/supabase/migrations/20251206193003_add_trees_columns_from_city_import.sql
@@ -0,0 +1,6 @@
+ALTER TABLE public.trees 
+    ALTER COLUMN tree_group TYPE VARCHAR USING tree_group::varchar,
+    ALTER COLUMN object_number TYPE VARCHAR USING object_number::varchar,
+    ADD COLUMN object_number_1 BIGINT NOT NULL,
+    ADD COLUMN planting_year SMALLINT;
+