From 8de0dfa3893f3da83feda65d374857329b841eb0 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 20 Jun 2024 13:34:07 +0200
Subject: [PATCH] Fixed rimo import

---
 application/AddressDB/AddressDB.php                 |  3 ++-
 .../ADBAddressHelper/address_helper.php             |  4 ++--
 scripts/adb-rimo-import/rimo-import-test.php        | 13 ++++++++-----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/application/AddressDB/AddressDB.php b/application/AddressDB/AddressDB.php
index a102b4928..55ce94410 100644
--- a/application/AddressDB/AddressDB.php
+++ b/application/AddressDB/AddressDB.php
@@ -250,7 +250,8 @@ class AddressDB {
     
     // build hausnummer data
     //$hausnummer_data['oaid'] = (array_key_exists("oaid", $data) && $data['oaid']) ? $data['oaid'] : null;
-    $hausnummer_data['adrcd'] = ($data['adrcd']) ? $data['adrcd'] : null;
+    $hausnummer_data['adrcd'] = ($adrcd) ? $adrcd : null;
+    $hausnummer_data['subcd'] = ($subcd) ? $subcd : null;
     $hausnummer_data['extref'] = ($data['extref']) ? $data['extref'] : null;
     $hausnummer_data['rimo_id'] = ($data['rimo_id']) ? $data['rimo_id'] : null;
     $hausnummer_data['netzgebiet_id'] = $netzgebiet_id;
diff --git a/scripts/adb-rimo-import/ADBAddressHelper/address_helper.php b/scripts/adb-rimo-import/ADBAddressHelper/address_helper.php
index 286db60ae..c8db51e04 100644
--- a/scripts/adb-rimo-import/ADBAddressHelper/address_helper.php
+++ b/scripts/adb-rimo-import/ADBAddressHelper/address_helper.php
@@ -302,9 +302,9 @@ class AddressHelper
                 $this->logFindAddressError("[CC] Neues Gebäude erstellt ($addr_dbg_str)");
             }
         }
-
+        
         if($execution_state_id == "99" && !$hausnummer->netzgebiet_id) {
-            // dont import Hausnummer if Canceled in Rimo
+            // don't import Hausnummer if Canceled in Rimo
             echo "== not setting netzgebite_id because execution state $execution_state_id ($execution_state_label)\n";
             return false;
         }
diff --git a/scripts/adb-rimo-import/rimo-import-test.php b/scripts/adb-rimo-import/rimo-import-test.php
index 2d5d6d979..0ef486953 100755
--- a/scripts/adb-rimo-import/rimo-import-test.php
+++ b/scripts/adb-rimo-import/rimo-import-test.php
@@ -64,11 +64,6 @@ foreach ($netowners as $apiOwner) {
     }
 
     $epGetClusters = $apiUrl . RIMO_API_JSON_EP_GET_CLUSTERS;
-    $epGetBuildings = $apiUrl . RIMO_API_JSON_EP_GET_BUILDINGS;
-    $epGetWorkorders = $apiUrl . RIMO_API_JSON_EP_QUERY_WORKORDERS;
-    $epGetService = $apiUrl . RIMO_API_JSON_EP_QUERY_SERVICE;
-    $epGetGeoJsonForBuilding = $apiUrl . RIMO_API_JSON_EP_GET_JSON_FOR_BUILDING;
-    $epGetGeoJsonForCluster = $apiUrl . RIMO_API_JSON_EP_GET_JSON_FOR_CLUSTER;
 
     $import_count = 0;
 
@@ -147,11 +142,19 @@ foreach ($clusters as $cluster_data) {
         }
     }
 
+    $baseParams = ['apiKey' => $apiToken];
+
+    $epGetBuildings = $apiUrl . RIMO_API_JSON_EP_GET_BUILDINGS;
+    $epGetWorkorders = $apiUrl . RIMO_API_JSON_EP_QUERY_WORKORDERS;
+    $epGetService = $apiUrl . RIMO_API_JSON_EP_QUERY_SERVICE;
+    $epGetGeoJsonForBuilding = $apiUrl . RIMO_API_JSON_EP_GET_JSON_FOR_BUILDING;
+    $epGetGeoJsonForCluster = $apiUrl . RIMO_API_JSON_EP_GET_JSON_FOR_CLUSTER;
 
     /*
      * get Cluster Outline Coords
      */
 
+
     $params = $baseParams;
     $params['clusterId'] = $cluster_rimo_id;
     $qs = http_build_query($params);