fix ticket-1014

Author: g5bot

src/Module/Tick/History/Component/IonStormMapGeneration.php

@@ -70,7 +70,7 @@ private function generateIonStormMapForLayer(Layer $layer, string $historyFolder
         }
         imagefill($img, 0, 0, $fillColor);
 
-        foreach ($this->anomalyRepository->getLocationsWithIonstormAnomalies() as $location) {
+        foreach ($this->anomalyRepository->getLocationsWithIonstormAnomalies($layer) as $location) {
             $curx = ($location->getCx() - 1) * 2;
             $cury = ($location->getCy() - 1) * 2;
 

src/Orm/Repository/AnomalyRepository.php

@@ -9,6 +9,7 @@
 use Stu\Component\Anomaly\Type\AnomalyTypeEnum;
 use Stu\Module\Spacecraft\Lib\SpacecraftWrapperInterface;
 use Stu\Orm\Entity\Anomaly;
+use Stu\Orm\Entity\Layer;
 use Stu\Orm\Entity\Location;
 use Stu\Orm\Entity\Map;
 
@@ -141,20 +142,24 @@ public function getClosestAnomalyDistance(SpacecraftWrapperInterface $wrapper):
     }
 
     #[\Override]
-    public function getLocationsWithIonstormAnomalies(): array
+    public function getLocationsWithIonstormAnomalies(Layer $layer): array
     {
         return $this->getEntityManager()
             ->createQuery(
                 sprintf(
-                    'SELECT l FROM %s a
+                'SELECT l FROM %s a
                     JOIN %s l
                     WITH a.location = l
-                    WHERE a.anomaly_type_id = :type',
+                    WHERE a.anomaly_type_id = :type
+                    AND l.layer = :layer',
                     Anomaly::class,
                     Location::class
                 )
             )
-            ->setParameter('type', AnomalyTypeEnum::ION_STORM->value)
+            ->setParameters([
+                'type' => AnomalyTypeEnum::ION_STORM->value,
+                'layer' => $layer->getId()
+            ])
             ->getResult();
     }
 }

src/Orm/Repository/AnomalyRepositoryInterface.php

@@ -6,6 +6,7 @@
 use Stu\Component\Anomaly\Type\AnomalyTypeEnum;
 use Stu\Module\Spacecraft\Lib\SpacecraftWrapperInterface;
 use Stu\Orm\Entity\Anomaly;
+use Stu\Orm\Entity\Layer;
 use Stu\Orm\Entity\Location;
 
 /**
@@ -36,5 +37,5 @@ public function getClosestAnomalyDistance(SpacecraftWrapperInterface $wrapper):
      *
      * @return array<Location>
      */
-    public function getLocationsWithIonstormAnomalies(): array;
+    public function getLocationsWithIonstormAnomalies(Layer $layer): array;
 }