Commit 6e681f5

authored

Merge pull request #241 from denisaug/master

GoogleMaps: view and viewstreet mode support

2 parents b211d2d + ea25440 commit 6e681f5Copy full SHA for 6e681f5

File tree

2 files changed

+74

-2

lines changed

src
- Http
  - Url.php
- Providers/Api
  - GoogleMaps.php

2 files changed

+74

-2

lines changed

`‎src/Http/Url.php‎`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ public function getSlicePath($offset, $length = null)`
`313`	`313`	`*/`
`314`	`314`	`public function getPath()`
`315`	`315`	`{`
`316`		`- $path = !empty($this->info['path']) ? '/'.implode('/', array_map('urlencode', $this->info['path'])).'/' : '/';`
	`316`	`+ $path = !empty($this->info['path']) ? '/'.implode('/', array_map('self::urlEncode', $this->info['path'])).'/' : '/';`
`317`	`317`
`318`	`318`	`if (isset($this->info['file'])) {`
`319`	`319`	`$path .= self::urlEncode($this->info['file']);`
`@@ -663,7 +663,9 @@ function ($matches) {`
`663`	`663`
`664`	`664`	`private static function urlEncode($path)`
`665`	`665`	`{`
`666`		`- return str_replace(['%3A'], [':'], urlencode($path));`
	`666`	`+ // : - used for files`
	`667`	`+ // @ and , - used for GoogleMaps adapter url (in view and streetview modes)`
	`668`	`+ return str_replace(['%3A','%40','%2C'], [':','@',','], urlencode($path));`
`667`	`669`	`}`
`668`	`670`
`669`	`671`	`private static function validUrlOrEmpty($url)`

`‎src/Providers/Api/GoogleMaps.php‎`

Lines changed: 70 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,22 @@ public function __construct(Adapter $adapter)`
`25`	`25`
`26`	`26`	`$mode = $adapter->getResponse()->getUrl()->getDirectoryPosition(1);`
`27`	`27`
	`28`	`+ // Default is view (if mode is not mentioned in the url)`
	`29`	`+ $this->mode = 'view';`
	`30`	`+`
`28`	`31`	`switch ($mode) {`
`29`	`32`	`case 'place':`
`30`	`33`	`case 'dir':`
`31`	`34`	`case 'search':`
`32`	`35`	`$this->mode = $mode;`
`33`	`36`	`break;`
`34`	`37`	`}`
	`38`	`+`
	`39`	`+ // check streetview mode`
	`40`	`+ // simple check,- starts with @, ends with t`
	`41`	`+ if ((substr($mode, 0, 1) === '@') && (substr($mode, -1) === 't')) {`
	`42`	`+ $this->mode = 'streetview';`
	`43`	`+ }`
`35`	`44`	`}`
`36`	`45`
`37`	`46`	`/**`
`@@ -50,6 +59,45 @@ public function getTitle()`
`50`	`59`	`}`
`51`	`60`	`}`
`52`	`61`
	`62`	`+ /**`
	`63`	`+ * Returns parsed position data from url.`
	`64`	`+ *`
	`65`	`+ * @return array`
	`66`	`+ */`
	`67`	`+ private function getPosition()`
	`68`	`+ {`
	`69`	`+ $url = $this->adapter->getResponse()->getUrl();`
	`70`	`+`
	`71`	`+ // Set defaults`
	`72`	`+ $position = [`
	`73`	`+ 'coordinates' => '',`
	`74`	`+ 'zoom' => '4',`
	`75`	`+ 'heading' => '0',`
	`76`	`+ 'pitch' => '0',`
	`77`	`+ 'fov' => '90'`
	`78`	`+ ];`
	`79`	`+`
	`80`	`+ if ($this->mode === 'view') {`
	`81`	`+ $pos = explode(",", $url->getDirectoryPosition(1));`
	`82`	`+ $position['coordinates'] = str_replace('@','',$pos[0]).','.$pos[1];`
	`83`	`+ $position['zoom'] = str_replace('z',"",$pos[2]);`
	`84`	`+ }`
	`85`	`+`
	`86`	`+ if ($this->mode === 'streetview') {`
	`87`	`+ $pos = explode(",", $url->getDirectoryPosition(1));`
	`88`	`+ $position['coordinates'] = str_replace('@','',$pos[0]).','.$pos[1];`
	`89`	`+ $position['zoom'] = str_replace('a','',$pos[2]); // seems not used by google (emulated by other params)`
	`90`	`+ $position['heading'] = str_replace('h','',$pos[4]);`
	`91`	`+ $position['fov'] = str_replace('y','',$pos[3]);`
	`92`	`+ $pitch = str_replace('t','',$pos[5]); // t is pitch but in 180% format`
	`93`	`+ if (is_numeric($pitch)) {`
	`94`	`+ $position['pitch'] = floatval($pitch) - 90;`
	`95`	`+ }`
	`96`	`+ }`
	`97`	`+`
	`98`	`+ return $position;`
	`99`	`+ }`
	`100`	`+`
`53`	`101`	`/**`
`54`	`102`	`* {@inheritdoc}`
`55`	`103`	`*/`
`@@ -71,6 +119,28 @@ public function getCode()`
`71`	`119`	`}`
`72`	`120`
`73`	`121`	`switch ($this->mode) {`
	`122`	`+ case 'view':`
	`123`	`+ $pos = $this->getPosition();`
	`124`	`+ return Utils::iframe($url`
	`125`	`+ ->withPath('maps/embed/v1/'.$this->mode)`
	`126`	`+ ->withQueryParameters([`
	`127`	`+ 'center' => $pos['coordinates'],`
	`128`	`+ 'zoom' => $pos['zoom'],`
	`129`	`+ 'key' => $key,`
	`130`	`+ ]));`
	`131`	`+`
	`132`	`+ case 'streetview':`
	`133`	`+ $pos = $this->getPosition();`
	`134`	`+ return Utils::iframe($url`
	`135`	`+ ->withPath('maps/embed/v1/'.$this->mode)`
	`136`	`+ ->withQueryParameters([`
	`137`	`+ 'location' => $pos['coordinates'],`
	`138`	`+ 'heading' => $pos['heading'],`
	`139`	`+ 'pitch' => $pos['pitch'],`
	`140`	`+ 'fov' => $pos['fov'],`
	`141`	`+ 'key' => $key,`
	`142`	`+ ]));`
	`143`	`+`
`74`	`144`	`case 'place':`
`75`	`145`	`case 'search':`
`76`	`146`	`return Utils::iframe($url`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 6e681f5

File tree

2 files changed

2 files changed

`‎src/Http/Url.php‎`

`‎src/Providers/Api/GoogleMaps.php‎`

0 commit comments