Added Mureck import & borderpoint testing

Layout/default/Preorder/include/preorder-detail.php

@@ -8,6 +8,9 @@
           <li class="nav-item"><a class="nav-link active" href="#preorder-detail-<?=$preorder->id?>-detail" data-toggle="tab" aria-expanded="false">Details</a></li>
           <li class="nav-item"><a class="nav-link" href="#preorder-detail-<?=$preorder->id?>-address" data-toggle="tab" aria-expanded="false">Adressdetails</a></li>
           <li class="nav-item"><a class="nav-link" href="#preorder-detail-<?=$preorder->id?>-rimo" data-toggle="tab" aria-expanded="false">RIMO</a></li>
+          <?php if($me->is("Admin") && $preorder->adb_hausnummer->borderpoint_lat && $preorder->adb_hausnummer->borderpoint_long): ?>
+          <li class="nav-item"><a class="nav-link" href="#preorder-detail-<?=$preorder->id?>-map" data-toggle="tab" aria-expanded="false" onclick="loadBorderpointMap(<?=$preorder->id?>)">Übergabepunkt</a></li>
+          <?php endif; ?>
         </ul>
       </div>
 
@@ -424,12 +427,45 @@
         </div>
       </div>
 
+      <?php if($me->is("Admin")): ?>
+      <div 
+        id="preorder-detail-<?=$preorder->id?>-map" 
+        class="tab-pane" 
+        data-lat="<?=$preorder->adb_hausnummer->borderpoint_lat?>" 
+        data-long="<?=$preorder->adb_hausnummer->borderpoint_long?>"
+        data-blat="<?=$preorder->adb_hausnummer->gps_lat?>"
+        data-blong="<?=$preorder->adb_hausnummer->gps_long?>"
+        data-trench="<?=$preorder->adb_hausnummer->trenches?>"
+        data-home-trench="<?=$preorder->adb_hausnummer->home_trench?>"
+      >
+        <div class="row justify-content-center">
+          <div class="col-12">
+            <div class="card">
+              <div class="card-body">
+                
+                <div class="card">
+                  <div class="card-body">
 
+                    <div class="row" id="map-row">
+                      <div id="preorder-map-<?=$preorder->id?>" style="height:50vh; width: 100%"></div>
+                    </div>
+                    
+                  </div>
+                </div>
+                
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <?php endif; ?>
 
     </div>
 
   </div>
+
 </div>
+
 <script type="text/javascript">
   
   function togglePortdata(pid) {
@@ -612,4 +648,78 @@
     
     return false;
   }
+  
+  var maps = {};
+  
+  function loadBorderpointMap(id) {
+    var lat = $("#preorder-detail-" + id + "-map").data("lat");
+    var long = $("#preorder-detail-" + id + "-map").data("long");
+    
+    var blat = $("#preorder-detail-" + id + "-map").data("blat");
+    var blong = $("#preorder-detail-" + id + "-map").data("blong");
+    
+    var trenches = $("#preorder-detail-" + id + "-map").data("trench");
+    var home_trench = $("#preorder-detail-" + id + "-map").data("home-trench");
+    
+    if(!("map-" + id in maps)) {
+    
+      var map = L.map('preorder-map-' + id).setView([lat, long], 20);
+
+      var tileLayer = L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token={accessToken}', {
+        attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="https://www.mapbox.com/">Mapbox</a>',
+        minZoom: 6,
+        maxZoom: 22,
+        id: "mapbox/satellite-streets-v12",
+        accessToken: '<?=TT_MAPBOX_TILE_API_TOKEN?>'
+      }).addTo(map);
+      
+      //map.invalidateSize();
+      
+      //var marker = L.marker([lat, long], {icon: icon}).addTo(preorderMap);
+      /*L.circleMarker([lat, long], {
+        color: '#FF9999'
+      }).addTo(map);
+      */
+     
+      var circle = L.circle([lat,long], {
+        color: 'orange',
+        fillColor: 'orange',
+        fillOpacity: 0.5,
+        radius: 1
+      }).bindTooltip(lat + ", " + long).addTo(map);
+      
+      /*var circle = L.circle([blat,blong], {
+        color: 'black',
+        fillColor: 'limegreen',
+        fillOpacity: 0.5,
+        radius: 1
+      }).addTo(map);*/
+      
+      if(trenches) {
+        trenches.forEach((trench) => {
+          //console.log(trench);
+          var trench_line = L.polyline(trench, {
+            color: "limegreen"
+          }).addTo(map);
+          //trench.forEach((segment) => {
+            
+          //});
+        });
+      }
+      
+      if(home_trench) {
+        var home_line = L.polyline(home_trench, {
+          color: "aqua"
+          }).addTo(map);
+      }
+      
+      maps["map-" + id] = map;
+      
+      setTimeout((id) => {maps["map-" + id].invalidateSize()}, 50, id);
+    }
+  }
+  
+  function addMarkers(id) {
+    
+  }
 </script>

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

scripts/adb-rimo-import/ADBAddressHelper/Network/Network-62383-mureck.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace ADBRimoImport\ADBAddressHelper\Network;
+
+/*
+ * Netzgebiet
+ * Premstätten Süd
+ */
+class Network_62383 {
+  
+  public function checkAddress($data) {
+    /*
+     * array keys are a reference their original variables and must be manipulated directly
+     */
+    
+    // dererence input array keys into copies
+    foreach(["name", "strasse_name", "hausnummer_name", "addresszusatz", "gem_kz", "gem_name", "ort_name", "plz_name"] as $var) {
+      $$var = $data[$var];
+    }
+    
+    if($strasse_name == "Peter-Rosegger-Weg") $strasse_name = "Peter Rosegger-Weg";
+    if($strasse_name == "Doktor-Franz-Platzer-Straße") $strasse_name = "Dr. Franz Platzer-Straße";
+    if($strasse_name == "Johann-Joseph-Fux-Gasse") $strasse_name = "Johann Joseph Fux-Gasse";
+    if($strasse_name == "Adolf- Kolping-Straße") $strasse_name = "Adolph Kolping-Straße";
+
+    if($ort_name == "Südoststeiermark") $ort_name = "Mureck";
+    
+    // put new values back into original pointer
+    foreach(["name", "strasse_name", "hausnummer_name", "addresszusatz", "gem_kz", "gem_name", "ort_name", "plz_name"] as $var) {
+      $data[$var] = $$var;
+    }
+    
+    return true;
+  }
+}

scripts/adb-rimo-import/rimo-import-test.php

@@ -116,10 +116,10 @@ foreach($netowners as $apiOwner) {
     }
     
     
-    /*if($cluster_rimo_id != "SDISalesCluster_126657212929_1678961358") {
-      // prem sued
+    if($cluster_rimo_id != "SDISalesCluster_85942336257_1707118316") {
+      // wettmannstaettten
       continue;
-    }*/
+    }
     
     $AddressHelper = new ADBAddressHelper\AddressHelper(["log" => $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];