Do axis by name once up front and cache

dvdoug · Aug 25, 2021 · c87b30d · c87b30d
1 parent 3ec0cfa
commit c87b30d
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 10 deletions.
diff --git a/src/CoordinateSystem/CoordinateSystem.php b/src/CoordinateSystem/CoordinateSystem.php
@@ -27,12 +27,21 @@ abstract class CoordinateSystem
      */
     protected array $axes;
 
+    /**
+     * @var Axis[]
+     */
+    protected array $axesByName;
+
     public function __construct(
         string $srid,
         array $axes
     ) {
         $this->srid = $srid;
         $this->axes = $axes;
+
+        foreach ($this->axes as $axis) {
+            $this->axesByName[$axis->getName()] = $axis;
+        }
     }
 
     public function getSRID(): string
@@ -47,4 +56,9 @@ public function getAxes(): array
     {
         return $this->axes;
     }
+
+    public function getAxisByName(string $name): ?Axis
+    {
+        return $this->axesByName[$name] ?? null;
+    }
 }
diff --git a/src/GeocentricPoint.php b/src/GeocentricPoint.php
@@ -68,9 +68,9 @@ class GeocentricPoint extends Point implements ConvertiblePoint
     protected function __construct(Length $x, Length $y, Length $z, Geocentric $crs, ?DateTimeInterface $epoch = null)
     {
         $this->crs = $crs;
-        $this->x = Length::convert($x, $this->getAxisByName(Axis::GEOCENTRIC_X)->getUnitOfMeasureId());
-        $this->y = Length::convert($y, $this->getAxisByName(Axis::GEOCENTRIC_Y)->getUnitOfMeasureId());
-        $this->z = Length::convert($z, $this->getAxisByName(Axis::GEOCENTRIC_Z)->getUnitOfMeasureId());
+        $this->x = Length::convert($x, $this->crs->getCoordinateSystem()->getAxisByName(Axis::GEOCENTRIC_X)->getUnitOfMeasureId());
+        $this->y = Length::convert($y, $this->crs->getCoordinateSystem()->getAxisByName(Axis::GEOCENTRIC_Y)->getUnitOfMeasureId());
+        $this->z = Length::convert($z, $this->crs->getCoordinateSystem()->getAxisByName(Axis::GEOCENTRIC_Z)->getUnitOfMeasureId());
 
         if ($epoch instanceof DateTime) {
             $epoch = DateTimeImmutable::createFromMutable($epoch);

diff --git a/src/GeographicPoint.php b/src/GeographicPoint.php
@@ -117,11 +117,11 @@ protected function __construct(Angle $latitude, Angle $longitude, ?Length $heigh
         $latitude = $this->normaliseLatitude($latitude);
         $longitude = $this->normaliseLongitude($longitude);
 
-        $this->latitude = Angle::convert($latitude, $this->getAxisByName(Axis::GEODETIC_LATITUDE)->getUnitOfMeasureId());
-        $this->longitude = Angle::convert($longitude, $this->getAxisByName(Axis::GEODETIC_LONGITUDE)->getUnitOfMeasureId());
+        $this->latitude = Angle::convert($latitude, $this->crs->getCoordinateSystem()->getAxisByName(Axis::GEODETIC_LATITUDE)->getUnitOfMeasureId());
+        $this->longitude = Angle::convert($longitude, $this->crs->getCoordinateSystem()->getAxisByName(Axis::GEODETIC_LONGITUDE)->getUnitOfMeasureId());
 
         if ($height) {
-            $this->height = Length::convert($height, $this->getAxisByName(Axis::ELLIPSOIDAL_HEIGHT)->getUnitOfMeasureId());
+            $this->height = Length::convert($height, $this->crs->getCoordinateSystem()->getAxisByName(Axis::ELLIPSOIDAL_HEIGHT)->getUnitOfMeasureId());
         } else {
             $this->height = null;
         }

diff --git a/src/Point.php b/src/Point.php
@@ -174,6 +174,9 @@ protected static function resolveParamsByOperation(string $operationSrid, string
         return $params;
     }
 
+    /**
+     * @deprecated
+     */
     protected function getAxisByName(string $name): ?Axis
     {
         foreach ($this->getCRS()->getCoordinateSystem()->getAxes() as $axis) {

diff --git a/src/ProjectedPoint.php b/src/ProjectedPoint.php
@@ -95,10 +95,10 @@ protected function __construct(?Length $easting, ?Length $northing, ?Length $wes
     {
         $this->crs = $crs;
 
-        $eastingAxis = $this->getAxisByName(Axis::EASTING);
-        $westingAxis = $this->getAxisByName(Axis::WESTING);
-        $northingAxis = $this->getAxisByName(Axis::NORTHING);
-        $southingAxis = $this->getAxisByName(Axis::SOUTHING);
+        $eastingAxis = $this->crs->getCoordinateSystem()->getAxisByName(Axis::EASTING);
+        $westingAxis = $this->crs->getCoordinateSystem()->getAxisByName(Axis::WESTING);
+        $northingAxis = $this->crs->getCoordinateSystem()->getAxisByName(Axis::NORTHING);
+        $southingAxis = $this->crs->getCoordinateSystem()->getAxisByName(Axis::SOUTHING);
 
         if ($easting && $eastingAxis) {
             $this->easting = Length::convert($easting, $eastingAxis->getUnitOfMeasureId());