@@ -18,21 +18,21 @@ |
||
| 18 | 18 | { |
| 19 | 19 | |
| 20 | 20 | public $defaults = array( |
| 21 | - 'key' => null, |
|
| 22 | - 'width' => '100%', |
|
| 23 | - 'height' => '100%', |
|
| 24 | - 'zoom' => 7, |
|
| 25 | - 'coordinates' => array(), |
|
| 26 | - 'type' => 'ROADMAP', |
|
| 27 | - 'scrollable' => true, |
|
| 28 | - 'static' => false, |
|
| 29 | - 'markers' => array( |
|
| 21 | + 'key' => null, |
|
| 22 | + 'width' => '100%', |
|
| 23 | + 'height' => '100%', |
|
| 24 | + 'zoom' => 7, |
|
| 25 | + 'coordinates' => array(), |
|
| 26 | + 'type' => 'ROADMAP', |
|
| 27 | + 'scrollable' => true, |
|
| 28 | + 'static' => false, |
|
| 29 | + 'markers' => array( |
|
| 30 | 30 | 'bound' => false, |
| 31 | 31 | 'markerClusterer' => false, |
| 32 | 32 | 'iconDefaultPath' => null, |
| 33 | 33 | 'icon' => null, |
| 34 | 34 | 'addMarkers' => array() |
| 35 | - ) |
|
| 35 | + ) |
|
| 36 | 36 | ); |
| 37 | 37 | |
| 38 | 38 | |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | */ |
| 298 | 298 | public function getDirection() |
| 299 | 299 | { |
| 300 | - return $this->direction; |
|
| 300 | + return $this->direction; |
|
| 301 | 301 | } |
| 302 | 302 | |
| 303 | 303 | |
@@ -433,17 +433,17 @@ discard block |
||
| 433 | 433 | } else |
| 434 | 434 | { |
| 435 | 435 | $map = array( |
| 436 | - 'position' => $this->coordinates, |
|
| 437 | - 'height' => $this->height, |
|
| 438 | - 'width' => $this->width, |
|
| 439 | - 'zoom' => $this->zoom, |
|
| 440 | - 'type' => $this->type, |
|
| 441 | - 'scrollable' => $this->scrollable, |
|
| 442 | - 'key' => $this->key, |
|
| 443 | - 'bound' => $this->bound, |
|
| 444 | - 'cluster' => $this->markerClusterer, |
|
| 445 | - 'clusterOptions' => $this->clusterOptions, |
|
| 446 | - 'waypoint' => !is_null($this->waypoints) ? array_merge($this->waypoints, $this->direction) : NULL |
|
| 436 | + 'position' => $this->coordinates, |
|
| 437 | + 'height' => $this->height, |
|
| 438 | + 'width' => $this->width, |
|
| 439 | + 'zoom' => $this->zoom, |
|
| 440 | + 'type' => $this->type, |
|
| 441 | + 'scrollable' => $this->scrollable, |
|
| 442 | + 'key' => $this->key, |
|
| 443 | + 'bound' => $this->bound, |
|
| 444 | + 'cluster' => $this->markerClusterer, |
|
| 445 | + 'clusterOptions' => $this->clusterOptions, |
|
| 446 | + 'waypoint' => !is_null($this->waypoints) ? array_merge($this->waypoints, $this->direction) : NULL |
|
| 447 | 447 | ); |
| 448 | 448 | $this->template->map = Json::encode($map); |
| 449 | 449 | $this->template->setFile(dirname(__FILE__) . '/template.latte'); |