From d7054a926fe8f48875d1c0398dbd39d751601ecb Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Tue, 14 Mar 2023 16:35:23 +0100
Subject: [PATCH] changed colors in preorder map and added more cache

---
 Layout/default/Preorder/Index.php               | 17 +++++++++++++++--
 application/ADBHausnummer/ADBHausnummer.php     | 14 ++++----------
 lib/mvcfronk/mfValuecache/mfValuecache.php      | 12 ++++++++++++
 ...Locations__FTTx_premstaetten_2023-03-07.csv# |  1 -
 4 files changed, 31 insertions(+), 13 deletions(-)
 delete mode 100644 scripts/addressdb/premstaetten/import/.~lock.SDIBuilding__Locations__FTTx_premstaetten_2023-03-07.csv#

diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index 3e5f96097..193e9392b 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -373,8 +373,21 @@
           
           var marker_popup_content = '<?php include(realpath(dirname(__FILE__))."/include/preorder_popup.php");?>';
 
-          [["street", preorder.adb_strasse], ["hausnummer", preorder.adb_hausnummer], ["zip", preorder.adb_plz], ["city", preorder.adb_ort], ["type", preorder.type_label], ["adrcd", preorder.adrcd], ["extref", preorder.extref], ["gps", preorder.gps_lat + ", " + preorder.gps_long],
-            ["contact", (preorder.company ? preorder.company + " " : preorder.firstname + " " + preorder.lastname)], ["phone", preorder.phone], ["email", preorder.email], ["connectiontype", preorder.connection_type_label], ["count", preorder.connection_count]
+          // popup fields
+          [
+            ["street", preorder.adb_strasse],
+            ["hausnummer", preorder.adb_hausnummer],
+            ["zip", preorder.adb_plz],
+            ["city", preorder.adb_ort],
+            ["type", preorder.type_label],
+            ["adrcd", preorder.adrcd],
+            ["extref", preorder.extref ? preorder.extref : ""],
+            ["gps", (preorder.gps_lat && preorder.gps_long) ? preorder.gps_lat + ", " + preorder.gps_long : ""],
+            ["contact", (preorder.company ? preorder.company + " " : preorder.firstname + " " + preorder.lastname)],
+            ["phone", preorder.phone ? preorder.phone : ""],
+            ["email", preorder.email ? preorder.email : ""],
+            ["connectiontype", preorder.connection_type_label],
+            ["count", preorder.connection_count]
           ].forEach(function(item) {
             marker_popup_content = marker_popup_content.replaceAll("{{" + item[0].toUpperCase() + "}}", item[1]);
           });
diff --git a/application/ADBHausnummer/ADBHausnummer.php b/application/ADBHausnummer/ADBHausnummer.php
index 284df5ae5..eceb1d695 100644
--- a/application/ADBHausnummer/ADBHausnummer.php
+++ b/application/ADBHausnummer/ADBHausnummer.php
@@ -85,28 +85,22 @@ class ADBHausnummer extends mfBaseModel {
       }
       
       if($name == "netzgebiet") {
-        $this->netzgebiet = new ADBNetzgebiet($this->netzgebiet_id);
+        $this->netzgebiet = mfValuecache::singleton()->getMfObject("ADBNetzgebiet", $this->netzgebiet_id);
         return $this->netzgebiet;
       }
       
       if($name == "ortschaft") {
-        $this->ortschaft = new ADBOrtschaft($this->ortschaft_id);
+        $this->ortschaft = mfValuecache::singleton()->getMfObject("ADBOrtschaft", $this->ortschaft_id);
         return $this->ortschaft;
       }
       
       if($name == "strasse") {
-        $this->strasse = new ADBStrasse($this->strasse_id);
+        $this->strasse = mfValuecache::singleton()->getMfObject("ADBStrasse", $this->strasse_id);
         return $this->strasse;
       }
       
       if($name == "plz") {
-        $this->plz = mfValuecache::singleton()->get("adbplz-".$this->plz_id);
-        if($this->plz === null) {
-          $this->plz = new ADBPlz($this->plz_id);
-          if($this->plz->id) {
-            mfValuecache::singleton()->set("adplz-".$this->plz_id, $this->plz);
-          }
-        }
+        $this->plz = mfValuecache::singleton()->getMfObject("ADBPlz", $this->plz_id);
         return $this->plz;
       }
       
diff --git a/lib/mvcfronk/mfValuecache/mfValuecache.php b/lib/mvcfronk/mfValuecache/mfValuecache.php
index 3c7f16529..b4d4fbcc5 100644
--- a/lib/mvcfronk/mfValuecache/mfValuecache.php
+++ b/lib/mvcfronk/mfValuecache/mfValuecache.php
@@ -28,4 +28,16 @@ class mfValuecache {
   public function getCache() {
     return $this->cache;
   }
+  
+  public function getMfObject($objectname, $id) {
+    $object = $this->get("mfObjectmodel-$objectname-".$id);
+    if(!$object) {
+      $object = new $objectname($id);
+      if($object->id) {
+        $this->set("mfObjectmodel-$objectname-".$id, $object);
+      }
+    }
+    
+    return $object;
+  }
 }
\ No newline at end of file
diff --git a/scripts/addressdb/premstaetten/import/.~lock.SDIBuilding__Locations__FTTx_premstaetten_2023-03-07.csv# b/scripts/addressdb/premstaetten/import/.~lock.SDIBuilding__Locations__FTTx_premstaetten_2023-03-07.csv#
deleted file mode 100644
index f2850562c..000000000
--- a/scripts/addressdb/premstaetten/import/.~lock.SDIBuilding__Locations__FTTx_premstaetten_2023-03-07.csv#
+++ /dev/null
@@ -1 +0,0 @@
-,fronk,fronk-nb,14.03.2023 14:13,file:///home/fronk/.config/libreoffice/4;
\ No newline at end of file