Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Fixed rimo import

Browse Source
This commit is contained in:
Frank Schubert
2024-06-20 13:34:07 +02:00
parent 49880ede42
commit 8de0dfa389
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/AddressDB/AddressDB.php
View File

@@ -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;

4
scripts/adb-rimo-import/ADBAddressHelper/address_helper.php
View File

@@ -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;
}

13
scripts/adb-rimo-import/rimo-import-test.php
View File

@@ -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);