fix starsystem database

st-universe · Sep 9, 2023 · f95ecee · f95ecee
1 parent 52d0f1c
commit f95ecee
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 41 deletions.
diff --git a/src/Lib/Map/VisualPanel/SignaturePanelEntry.php b/src/Lib/Map/VisualPanel/SignaturePanelEntry.php
@@ -15,14 +15,14 @@ class SignaturePanelEntry implements VisualPanelElementInterface
 
     private ?LayerInterface $layer;
 
-    private EncodedMapInterface $encodedMap;
+    private ?EncodedMapInterface $encodedMap;
 
     private string $cssClass = 'lss';
 
     public function __construct(
         VisualPanelEntryData $data,
         ?LayerInterface $layer,
-        EncodedMapInterface $encodedMap
+        ?EncodedMapInterface $encodedMap
     ) {
         $this->data = $data;
         $this->layer = $layer;
@@ -72,9 +72,10 @@ private function getMapGraphicPath(): ?string
             return null;
         }
 
-        if ($layer->isEncoded()) {
+        $encodedMap = $this->encodedMap;
+        if ($layer->isEncoded() && $encodedMap !== null) {
 
-            return $this->encodedMap->getEncodedMapPath(
+            return $encodedMap->getEncodedMapPath(
                 $this->data->getMapfieldType(),
                 $layer
             );

diff --git a/src/Lib/Map/VisualPanel/SystemScanPanelEntry.php b/src/Lib/Map/VisualPanel/SystemScanPanelEntry.php
@@ -4,7 +4,6 @@
 
 namespace Stu\Lib\Map\VisualPanel;
 
-use Stu\Component\Map\EncodedMapInterface;
 use Stu\Orm\Entity\StarSystemInterface;
 
 class SystemScanPanelEntry extends SignaturePanelEntry
@@ -13,10 +12,9 @@ class SystemScanPanelEntry extends SignaturePanelEntry
 
     public function __construct(
         VisualPanelEntryData $data,
-        EncodedMapInterface $encodedMap,
         StarSystemInterface $system
     ) {
-        parent::__construct($data, null, $encodedMap);
+        parent::__construct($data, null, null);
 
         $this->system = $system;
     }

diff --git a/src/Lib/Map/VisualPanel/VisualPanelEntryData.php b/src/Lib/Map/VisualPanel/VisualPanelEntryData.php
@@ -57,11 +57,25 @@ public function getSystemId(): ?int
         return $this->sysid;
     }
 
+    public function setSystemId(int $systemId): VisualPanelEntryData
+    {
+        $this->sysid = $systemId;
+
+        return $this;
+    }
+
     public function getMapfieldType(): int
     {
         return $this->type;
     }
 
+    public function setMapfieldType(int $type): VisualPanelEntryData
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
     public function getShipCount(): int
     {
         return $this->shipcount;

diff --git a/src/Module/Database/View/DatabaseEntry/DatabaseEntry.php b/src/Module/Database/View/DatabaseEntry/DatabaseEntry.php
@@ -7,6 +7,8 @@
 use Stu\Component\Database\DatabaseEntryTypeEnum;
 use Stu\Component\Ship\Crew\ShipCrewCalculatorInterface;
 use Stu\Exception\AccessViolation;
+use Stu\Lib\Map\VisualPanel\SignaturePanelEntry;
+use Stu\Lib\Map\VisualPanel\VisualPanelEntryData;
 use Stu\Module\Control\GameControllerInterface;
 use Stu\Module\Control\ViewControllerInterface;
 use Stu\Module\Database\View\Category\Category;
@@ -149,7 +151,8 @@ protected function addSpecialVars(GameControllerInterface $game, DatabaseEntryIn
                 $userHasColonyInSystem = $this->hasUserColonyInSystem($game->getUser(), $entry_object_id);
                 foreach ($starSystem->getFields() as $obj) {
                     $fields['fields'][$obj->getSY()][] = [
-                        'map' => $obj,
+                        'entry' => $this->createSignaturePanelEntry($obj),
+                        'colony' => $obj->getColony(),
                         'showPm' => $userHasColonyInSystem && $this->showPmHref($obj, $game->getUser())
                     ];
                 }
@@ -161,6 +164,15 @@ protected function addSpecialVars(GameControllerInterface $game, DatabaseEntryIn
         }
     }
 
+    private function createSignaturePanelEntry(StarSystemMapInterface $systemMap): SignaturePanelEntry
+    {
+        $data = new VisualPanelEntryData();
+        $data->setMapfieldType($systemMap->getFieldId())
+            ->setSystemId($systemMap->getSystemId());
+
+        return new SignaturePanelEntry($data, null, null);
+    }
+
     private function hasUserColonyInSystem(UserInterface $user, int $systemId): bool
     {
         foreach ($user->getColonies() as $colony) {

diff --git a/src/Module/Station/Lib/StationUiFactory.php b/src/Module/Station/Lib/StationUiFactory.php
@@ -4,7 +4,6 @@
 
 namespace Stu\Module\Station\Lib;
 
-use Stu\Component\Map\EncodedMapInterface;
 use Stu\Lib\Map\VisualPanel\SystemScanPanelEntry;
 use Stu\Lib\Map\VisualPanel\VisualPanelEntryData;
 use Stu\Module\Logging\LoggerUtilInterface;
@@ -30,20 +29,16 @@ final class StationUiFactory implements StationUiFactoryInterface
 
     private ShipRepositoryInterface $shipRepository;
 
-    private EncodedMapInterface $encodedMap;
-
     public function __construct(
         UserRepositoryInterface $userRepository,
         AllianceRepositoryInterface $allianceRepository,
         FactionRepositoryInterface $factionRepository,
-        ShipRepositoryInterface $shipRepository,
-        EncodedMapInterface $encodedMap
+        ShipRepositoryInterface $shipRepository
     ) {
         $this->userRepository = $userRepository;
         $this->allianceRepository = $allianceRepository;
         $this->factionRepository = $factionRepository;
         $this->shipRepository = $shipRepository;
-        $this->encodedMap = $encodedMap;
     }
 
     public function createSystemScanPanel(
@@ -68,7 +63,6 @@ public function createSystemScanPanelEntry(
     ): SystemScanPanelEntry {
         return new SystemScanPanelEntry(
             $data,
-            $this->encodedMap,
             $system
         );
     }

diff --git a/src/Orm/Entity/StarSystemMap.php b/src/Orm/Entity/StarSystemMap.php
@@ -189,24 +189,6 @@ public function setFieldType(MapFieldTypeInterface $mapFieldType): StarSystemMap
         return $this;
     }
 
-    public function getBackgroundId(): string
-    {
-
-        $x = (string)$this->getSx();
-        $y = (string)$this->getSy();
-
-
-        $x = str_pad($x, 2, '0', STR_PAD_LEFT);
-        $y = str_pad($y, 2, '0', STR_PAD_LEFT);
-
-
-        $backgroundId = $y . $x;
-
-        return $backgroundId;
-    }
-
-
-
     public function getColony(): ?ColonyInterface
     {
         return $this->colony;

diff --git a/src/Orm/Entity/StarSystemMapInterface.php b/src/Orm/Entity/StarSystemMapInterface.php
@@ -30,8 +30,6 @@ public function getFieldId(): int;
 
     public function getFieldType(): MapFieldTypeInterface;
 
-    public function getBackgroundId(): string;
-
     public function setFieldType(MapFieldTypeInterface $mapFieldType): StarSystemMapInterface;
 
     public function getColony(): ?ColonyInterface;

diff --git a/src/html/databasemacros.xhtml b/src/html/databasemacros.xhtml
@@ -107,15 +107,15 @@
       <tr tal:repeat="yaxis map/fields">
         <th tal:content="repeat/yaxis/key">CY</th>
         <td tal:repeat="xaxis yaxis" class="lss" style="background-size: cover;">
-          <div class="lssobj imgOverlayText"
+          <div class="lssobj imgOverlayText" tal:define="lssCellData xaxis/entry/getLssCellData"
             style=" position: relative !important; top: 0px; height: 30px; width: 30px">
-            <img src="assets/map/starmap/${xaxis/map/getBackgroundId}.png" style="z-index: 1;" />
-            <img tal:condition="xaxis/map/getFieldGraphicID" class="lssColoShield"
-              src="assets/map/${xaxis/map/getFieldGraphicID}.png" style="z-index: 2;" />
+            <img src="assets/map/starmap/${lssCellData/getSystemBackgroundId}.png" style="z-index: 1;" />
+            <img tal:condition="lssCellData/getFieldGraphicID" class="lssColoShield"
+              src="assets/map/${lssCellData/getFieldGraphicID}.png" style="z-index: 2;" />
             <div class="lssobj imgOverlayText" style=" position: relative !important; top: 0px;"
               tal:condition="xaxis/showPm" href="javascript:void(0);"
-              onclick="openPmWindow(${THIS/getUser/getId},${xaxis/map/getColony/getId},1,5)"
-              title="Nachricht an ${bbcode2txt:xaxis/map/getColony/getUser/getName} verfassen">
+              onclick="openPmWindow(${THIS/getUser/getId},${xaxis/colony/getId},1,5)"
+              title="Nachricht an ${bbcode2txt:xaxis/colony/getUser/getName} verfassen">
               <img class="lssColoShield" src="assets/map/pm.png" style="z-index: 3;" />
             </div>
           </div>