Restructure the calculator's decode()

Author: Vectorial1024

src/CodeCalculator/AbstractCodeCalculator.php

@@ -53,11 +53,24 @@ public function encode(float $latitude, float $longitude, int $codeLength): stri
     abstract protected function generateRevOlcCode(float $latitude, float $longitude, int $codeLength): string;
 
     /**
-     * Assuming the given (string) Open Location Code is valid and stripped, decodes it into a CodeArea object encapsulating latitude/longitude bounding box.
+     * Assuming the given Open Location Code is valid, decodes it into a CodeArea object encapsulating latitude/longitude bounding box.
+     * @param string $code The stripped Open Location Code.
+     * @return CodeArea A CodeArea object.
+     */
+    public function decode(string $code): CodeArea
+    {
+        // Strip padding and separator characters out of the code.
+        $clean = str_replace([OpenLocationCode::SEPARATOR, OpenLocationCode::PADDING_CHARACTER], "", $code);
+
+        return $this->generateCodeArea($clean);
+    }
+
+    /**
+     * Performs the necessary calculation to generate a CodeArea object from the given (stripped) Open Location Code.
      * @param string $strippedCode The stripped Open Location Code.
      * @return CodeArea A CodeArea object.
      */
-    abstract public function decode(string $strippedCode): CodeArea;
+    abstract protected function generateCodeArea(string $strippedCode): CodeArea;
 
     /**
      * Returns a static instance of the appropriate code calculator depending on whether the current PHP is 32-bit/64-bit.

src/CodeCalculator/CodeCalculatorFloat.php

@@ -71,7 +71,7 @@ protected function generateRevOlcCode(float $latitude, float $longitude, int $co
         return $revCode;
     }
 
-    public function decode(string $strippedCode): CodeArea
+    protected function generateCodeArea(string $strippedCode): CodeArea
     {
         // Initialize the values. 
         // We will assume these values are floats to ensure 32bit PHP compatibility.

src/CodeCalculator/CodeCalculatorInt.php

@@ -75,7 +75,7 @@ protected function generateRevOlcCode(float $latitude, float $longitude, int $co
         return $revCode;
     }
 
-    public function decode(string $strippedCode): CodeArea
+    protected function generateCodeArea(string $strippedCode): CodeArea
     {
         // Initialize the values. 
         $latVal = -OpenLocationCode::LATITUDE_MAX * self::LAT_INTEGER_MULTIPLIER;

src/OpenLocationCode.php

@@ -143,12 +143,10 @@ public function decode(): CodeArea
         if (!$this->isFull()) {
             throw new LogicException("Method decode() may only be called on valid full codes, but code was {$this->code}.");
         }
-        // Strip padding and separator characters out of the code.
-        $clean = str_replace([self::SEPARATOR, self::PADDING_CHARACTER], "", $this->code);
 
         // Delegate to the correct Code Calculator to decode the OLC code for 32-bit/64-bit platforms
         $calculator = AbstractCodeCalculator::getDefaultCalculator();
-        return $calculator->decode($clean);
+        return $calculator->decode($this->code);
     }
 
     public function __toString(): string