changed getPosition

Author: oscarotero

src/Providers/Api/GoogleMaps.php

@@ -4,6 +4,7 @@
 
 use Embed\Adapters\Adapter;
 use Embed\Providers\Provider;
+use Embed\Http\Url;
 use Embed\Utils;
 
 /**
@@ -59,45 +60,6 @@ public function getTitle()
         }
     }
 
-    /**
-     * Returns parsed position data from url.
-     *
-     * @return array
-     */
-    private function getPosition()
-    {
-        $url = $this->adapter->getResponse()->getUrl();
-
-        // Set defaults
-        $position = [
-            'coordinates' => '',
-            'zoom' => '4',
-            'heading' => '0',
-            'pitch' => '0',
-            'fov' => '90'
-        ];
-
-        if ($this->mode === 'view') {
-            $pos = explode(",", $url->getDirectoryPosition(1));
-            $position['coordinates'] = str_replace('@','',$pos[0]).','.$pos[1];
-            $position['zoom'] = str_replace('z',"",$pos[2]);
-        }
-
-        if ($this->mode === 'streetview') {
-            $pos = explode(",", $url->getDirectoryPosition(1));
-            $position['coordinates'] = str_replace('@','',$pos[0]).','.$pos[1];
-            $position['zoom'] = str_replace('a','',$pos[2]); // seems not used by google (emulated by other params)
-            $position['heading'] = str_replace('h','',$pos[4]);
-            $position['fov'] = str_replace('y','',$pos[3]);
-            $pitch = str_replace('t','',$pos[5]); // t is pitch but in 180% format
-            if (is_numeric($pitch)) {
-                $position['pitch'] = floatval($pitch) - 90;
-            }
-        }
-
-        return $position;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -120,7 +82,8 @@ public function getCode()
 
         switch ($this->mode) {
             case 'view':
-                $pos = $this->getPosition();
+                $pos = self::getPosition($this->mode, $url);
+
                 return Utils::iframe($url
                     ->withPath('maps/embed/v1/'.$this->mode)
                     ->withQueryParameters([
@@ -130,7 +93,8 @@ public function getCode()
                     ]));
 
             case 'streetview':
-                $pos = $this->getPosition();
+                $pos = self::getPosition($this->mode, $url);
+
                 return Utils::iframe($url
                     ->withPath('maps/embed/v1/'.$this->mode)
                     ->withQueryParameters([
@@ -160,4 +124,45 @@ public function getCode()
                     ]));
         }
     }
+
+    /**
+     * Returns parsed position data from url.
+     *
+     * @param  string $mode The url mode
+     * @param  Url    $url
+     *
+     * @return array
+     */
+    private static function getPosition($mode, Url $url)
+    {
+        // Set defaults
+        $position = [
+            'coordinates' => '',
+            'zoom' => '4',
+            'heading' => '0',
+            'pitch' => '0',
+            'fov' => '90'
+        ];
+
+        if ($mode === 'view') {
+            $pos = explode(",", $url->getDirectoryPosition(1));
+            $position['coordinates'] = str_replace('@','',$pos[0]).','.$pos[1];
+            $position['zoom'] = str_replace('z',"",$pos[2]);
+        }
+
+        if ($mode === 'streetview') {
+            $pos = explode(",", $url->getDirectoryPosition(1));
+            $position['coordinates'] = str_replace('@','',$pos[0]).','.$pos[1];
+            $position['zoom'] = str_replace('a','',$pos[2]); // seems not used by google (emulated by other params)
+            $position['heading'] = str_replace('h','',$pos[4]);
+            $position['fov'] = str_replace('y','',$pos[3]);
+            $pitch = str_replace('t','',$pos[5]); // t is pitch but in 180% format
+            if (is_numeric($pitch)) {
+                $position['pitch'] = floatval($pitch) - 90;
+            }
+        }
+
+        return $position;
+    }
+
 }