diff --git a/Layout/default/Preorder/include/preorder-detail.php b/Layout/default/Preorder/include/preorder-detail.php
index 07e3120c0..59069f186 100644
--- a/Layout/default/Preorder/include/preorder-detail.php
+++ b/Layout/default/Preorder/include/preorder-detail.php
@@ -8,6 +8,9 @@
Details
Adressdetails
RIMO
+ is("Admin") && $preorder->adb_hausnummer->borderpoint_lat && $preorder->adb_hausnummer->borderpoint_long): ?>
+ Übergabepunkt
+
@@ -424,12 +427,45 @@
+ is("Admin")): ?>
+
+
+
+
\ No newline at end of file
diff --git a/db/migrations/20240208151159_hausnummer_add_borderpoint_lat_long.php b/db/migrations/20240208151159_hausnummer_add_borderpoint_lat_long.php
index 52e19f439..c3f67302b 100644
--- a/db/migrations/20240208151159_hausnummer_add_borderpoint_lat_long.php
+++ b/db/migrations/20240208151159_hausnummer_add_borderpoint_lat_long.php
@@ -16,6 +16,7 @@ final class HausnummerAddBorderpointLatLong extends AbstractMigration
$table->addColumn("borderpoint_lat", "decimal",["null" => true, "default" => null, "precision" => 15, "scale" => 10, "after" => "gps_long"]);
$table->addColumn("borderpoint_long", "decimal", ["null" => true, "default" => null, "precision" => 15, "scale" => 10, "after" => "borderpoint_lat"]);
$table->addColumn("trenches", "json", ["null" => true, "default" => null, "after" => "borderpoint_long"]);
+ $table->addColumn("home_trench", "json", ["null" => true, "default" => null, "after" => "trenches"]);
$table->save();
}
}
@@ -27,8 +28,9 @@ final class HausnummerAddBorderpointLatLong extends AbstractMigration
}
if($this->getEnvironment() == "addressdb") {
- $table = $this->table("Hausnummer");
- //$table->removeColumn("trenches");
+ $table = $this->table("home_trench");
+ $table->removeColumn("home_trench");
+ $table->removeColumn("trenches");
$table->removeColumn("borderpoint_long");
$table->removeColumn("borderpoint_lat");
$table->save();
diff --git a/scripts/adb-rimo-import/ADBAddressHelper/Network/Network-62383-mureck.php b/scripts/adb-rimo-import/ADBAddressHelper/Network/Network-62383-mureck.php
new file mode 100644
index 000000000..cf4af46e8
--- /dev/null
+++ b/scripts/adb-rimo-import/ADBAddressHelper/Network/Network-62383-mureck.php
@@ -0,0 +1,35 @@
+ $log, "db" => $adb, "netzgebiet" => $adb_netzgebiet]);
@@ -449,7 +449,21 @@ foreach($netowners as $apiOwner) {
if(is_object($geodataResponse)) {
if(property_exists($geodataResponse, "homeSection")) {
-
+ if(property_exists($geodataResponse->homeSection, "features") && is_array($geodataResponse->homeSection->features)) {
+ foreach($geodataResponse->homeSection->features as $feature) {
+ $home_trench = [];
+ foreach($feature->geometry->coordinates as $coords) {
+ $long = $coords[0];
+ $lat = $coords[1];
+ $home_trench[] = [$lat, $long];
+ }
+ if($hausnummer->home_trench != $home_trench) {
+ $hausnummer->home_trench = json_encode($home_trench);
+ $hausnummer->save();
+ }
+
+ }
+ }
}
if(property_exists($geodataResponse, "borderPoint")) {
if(property_exists($geodataResponse->borderPoint, "features") && is_array($geodataResponse->borderPoint->features)) {
@@ -470,7 +484,8 @@ foreach($netowners as $apiOwner) {
$trenches = [];
foreach($geodataResponse->trenches->features as $feature) {
$feature_coords = [];
- foreach($feature->geometry->coordinates as $coord) {
+ //var_dump($feature->geometry->coordinates);exit;
+ foreach($feature->geometry->coordinates as $coords) {
$long = $coords[0];
$lat = $coords[1];
$feature_coords[] = [$lat, $long];