Merge branch 'duskohu-master'

client-side/googleMapAPI.js

@@ -46,6 +46,7 @@ GoogleMap.prototype = {
 		this.options.key = properties.key;
 		this.options.bound = properties.bound;
 		this.options.cluster = properties.cluster;
+		this.options.clusterOptions = properties.clusterOptions;
 		this.options.waypoints = properties.waypoint;
 		this.basePath = this.element.dataset.basepath;
 		this.URL = this.element.dataset.markersfallback;
@@ -198,7 +199,7 @@ GoogleMap.prototype = {
 		if (base.options.cluster)
 		{
 			if (typeof MarkerClusterer != 'undefined') {
-				new MarkerClusterer(base.map, base.markersCluster);
+				new MarkerClusterer(base.map, base.markersCluster, base.options.clusterOptions);
 			} else 
 			{
 				throw 'MarkerClusterer is not loaded! Please use markerclusterer.js from client-side folder';

src/MapAPI.php

@@ -56,6 +56,9 @@ class MapAPI extends Control
 	/** @var boolean */
 	private $markerClusterer;
 
+	/** @var array */
+	private $clusterOptions;
+
 	/** @var boolean */
 	private $scrollable = FALSE;
 
@@ -70,8 +73,13 @@ class MapAPI extends Control
 	 * @var array
 	 */
 	private $direction = ['travelmode' => 'DRIVING'];
-
-
+
+
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
 	/**
 	 * @internal
 	 * @param array $config
@@ -316,6 +324,7 @@ public function addMarkers(Markers $markers)
 		$this->markers = $markers->getMarkers();
 		$this->bound = $markers->getBound();
 		$this->markerClusterer = $markers->getMarkerClusterer();
+		$this->clusterOptions = $markers->getClusterOptions();
 		return $this;
 	}
 
@@ -355,6 +364,7 @@ public function render()
 			    'key' => $this->key,
 			    'bound' => $this->bound,
 			    'cluster' => $this->markerClusterer,
+			    'clusterOptions' => $this->clusterOptions,
 			    'waypoint' => !is_null($this->waypoints) ? array_merge($this->waypoints, $this->direction) : NULL
 			);
 			$this->template->map = \Nette\Utils\Json::encode($map);

src/Markers.php

@@ -30,6 +30,8 @@ class Markers extends \Nette\Object
 	/** @var Boolean */
 	private $markerClusterer = FALSE;
 
+	private $clusterOptions = array();
+
 
 	/**
 	 * @internal
@@ -140,8 +142,26 @@ public function getMarkerClusterer()
 	{
 		return $this->markerClusterer;
 	}
-
 
+
+	/**
+	 * @param array $options
+	 * @return \Oli\GoogleAPI\Markers
+	 */
+	public function setClusterOptions($options = array())
+	{
+		$this->clusterOptions = $options;
+		return $this;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function getClusterOptions()
+	{
+		return $this->clusterOptions;
+	}
 
 	/**
 	 * @param Boolean $bound Show all of markers