Clean up the constants

Author: Vectorial1024

src/CodeCalculator/AbstractCodeCalculator.php

@@ -10,6 +10,14 @@
  */
 abstract class AbstractCodeCalculator
 {
+    // Value to multiple latitude degrees to convert it to an integer with the maximum encoding
+    // precision. I.e. ENCODING_BASE**3 * GRID_ROWS**GRID_CODE_LENGTH
+    protected const int LAT_INTEGER_MULTIPLIER = 8000 * 3125;
+
+    // Value to multiple longitude degrees to convert it to an integer with the maximum encoding
+    // precision. I.e. ENCODING_BASE**3 * GRID_COLUMNS**GRID_CODE_LENGTH
+    protected const int LNG_INTEGER_MULTIPLIER = 8000 * 1024;
+
     /**
      * Assuming the given latitude and longitude are valid, encode these coordinates into an Open Location Code.
      * @param float $latitude The latitude in decimal degrees.

src/CodeCalculator/CodeCalculatorFloat.php

@@ -37,8 +37,8 @@ protected function generateRevOlcCode(float $latitude, float $longitude, int $co
         // Multiply values by their precision and convert to positive.
         // Rounding avoids/minimizes errors due to floating-point precision.
         // Since the numbers are positive, floor() is equivalent to intval().
-        $latVal = floor(round(($latitude + OpenLocationCode::LATITUDE_MAX) * OpenLocationCode::LAT_INTEGER_MULTIPLIER * 1e6) / 1e6);
-        $lngVal = floor(round(($longitude + OpenLocationCode::LONGITUDE_MAX) * OpenLocationCode::LNG_INTEGER_MULTIPLIER * 1e6) / 1e6);
+        $latVal = floor(round(($latitude + OpenLocationCode::LATITUDE_MAX) * self::LAT_INTEGER_MULTIPLIER * 1e6) / 1e6);
+        $lngVal = floor(round(($longitude + OpenLocationCode::LONGITUDE_MAX) * self::LNG_INTEGER_MULTIPLIER * 1e6) / 1e6);
 
         // Compute the grid part of the code if necessary.
         if ($codeLength > OpenLocationCode::PAIR_CODE_LENGTH) {
@@ -76,8 +76,8 @@ public function decode(string $strippedCode): CodeArea
         // Initialize the values. 
         // We will assume these values are floats to ensure 32bit PHP compatibility.
         // See relevant comments in encode() above.
-        $latVal = -OpenLocationCode::LATITUDE_MAX * OpenLocationCode::LAT_INTEGER_MULTIPLIER;
-        $lngVal = -OpenLocationCode::LONGITUDE_MAX * OpenLocationCode::LNG_INTEGER_MULTIPLIER;
+        $latVal = -OpenLocationCode::LATITUDE_MAX * self::LAT_INTEGER_MULTIPLIER;
+        $lngVal = -OpenLocationCode::LONGITUDE_MAX * self::LNG_INTEGER_MULTIPLIER;
         // Define the place value for the digits. We'll divide this down as we work through the code.
         $latPlaceVal = self::LAT_MSP_VALUE;
         $lngPlaceVal = self::LNG_MSP_VALUE;
@@ -99,10 +99,10 @@ public function decode(string $strippedCode): CodeArea
             unset($digit);
         }
         unset($i);
-        $latitudeLo = $latVal / OpenLocationCode::LAT_INTEGER_MULTIPLIER;
-        $longitudeLo = $lngVal / OpenLocationCode::LNG_INTEGER_MULTIPLIER;
-        $latitudeHi = ($latVal + $latPlaceVal) / OpenLocationCode::LAT_INTEGER_MULTIPLIER;
-        $longitudeHi = ($lngVal + $lngPlaceVal) / OpenLocationCode::LNG_INTEGER_MULTIPLIER;
+        $latitudeLo = $latVal / self::LAT_INTEGER_MULTIPLIER;
+        $longitudeLo = $lngVal / self::LNG_INTEGER_MULTIPLIER;
+        $latitudeHi = ($latVal + $latPlaceVal) / self::LAT_INTEGER_MULTIPLIER;
+        $longitudeHi = ($lngVal + $lngPlaceVal) / self::LNG_INTEGER_MULTIPLIER;
         return new CodeArea(
             $latitudeLo,
             $longitudeLo,

src/OpenLocationCode.php

@@ -54,21 +54,7 @@ final class OpenLocationCode implements Stringable
     // Number of rows in the grid refinement method.
     public const int GRID_ROWS = 5;
 
-    // Value to multiple latitude degrees to convert it to an integer with the maximum encoding
-    // precision. I.e. ENCODING_BASE**3 * GRID_ROWS**GRID_CODE_LENGTH
-    public const int LAT_INTEGER_MULTIPLIER = 8000 * 3125;
-
-    // Value to multiple longitude degrees to convert it to an integer with the maximum encoding
-    // precision. I.e. ENCODING_BASE**3 * GRID_COLUMNS**GRID_CODE_LENGTH
-    public const int LNG_INTEGER_MULTIPLIER = 8000 * 1024;
-
-    // Value of the most significant latitude digit after it has been converted to an integer.
-    // Note: to ensure 32bit PHP compatibility, this is now a precisely-represented float.
-    private const float LAT_MSP_VALUE = self::LAT_INTEGER_MULTIPLIER * self::ENCODING_BASE * self::ENCODING_BASE;
-
-    // Value of the most significant longitude digit after it has been converted to an integer.
-    // Note: to ensure 32bit PHP compatibility, this is now a precisely-represented float.
-    private const float LNG_MSP_VALUE = self::LNG_INTEGER_MULTIPLIER * self::ENCODING_BASE * self::ENCODING_BASE;
+    // Note: constants that are only for encoding/decoding are moved to AbstractCodeCalculator.
 
     // The 360 degree circle information to normalize longitudes.
     private const int CIRCLE_DEG = 2 * self::LONGITUDE_MAX;