gordonbanderson / Mappable

code/MapAPI.php

Doc Comments +15 added lines, -8 removed lines

@@ -163,7 +163,7 @@ 
 	 *
 	 * @param string  $googleMapKey the googleMapKey
 	 *
-	 * @return void
+	 * @return MapAPI
 	 */
 
 	public function setKey($googleMapKey) {
@@ -171,6 +171,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param boolean $inclusion
+	 */
 	public function setIncludeDownloadJavascript($inclusion) {
 		self::$include_download_javascript = $inclusion;
 		return $this;
@@ -424,7 +427,7 @@ 
 	 *
 	 * @param boolean $defaultHideMarker hide all the markers on the map by default
 	 *
-	 * @return void
+	 * @return MapAPI
 	 */
 
 	public function setDefaultHideMarker($defaultHideMarker) {
@@ -469,7 +472,7 @@ 
 	 *
 	 * @param string  $address an address
 	 *
-	 * @return array array with precision, lat & lng
+	 * @return string array with precision, lat & lng
 	 */
 
 	public function geocoding($address) {
@@ -498,7 +501,7 @@ 
 	 * @param string  $category marker category
 	 * @param string  $icon     an icon url
 	 *
-	 * @return void
+	 * @return MapAPI
 	 */
 
 	public function addMarkerByCoords($lat, $lng, $html = '', $category = '', $icon = '') {
@@ -522,7 +525,7 @@ 
 	 * @param string  $category marker category
 	 * @param string  $icon     an icon url
 	 *
-	 * @return void
+	 * @return MapAPI
 	 */
 
 	public function addMarkerByAddress($address, $content = '', $category = '', $icon = '') {
@@ -540,7 +543,7 @@ 
 	 * @param string  $category marker category
 	 * @param string  $icon     an icon url
 	 *
-	 * @return void
+	 * @return MapAPI
 	 */
 
 	public function addArrayMarkerByCoords($coordtab, $category = '', $icon = '') {
@@ -623,7 +626,7 @@ 
 	 * @param string  $category marker category
 	 * @param string  $icon     an icon url
 	 *
-	 * @return void
+	 * @return MapAPI
 	 */
 
 	public function addArrayMarkerByAddress($coordtab, $category = '', $icon = '') {
@@ -652,7 +655,7 @@ 
 	 *
 	 * @param string  $url      url of the kml file compatible with gmap and gearth
 	 *
-	 * @return void
+	 * @return MapAPI
 	 */
 
 	public function addKML($url) {
@@ -809,6 +812,10 @@ 
 		return $result;
 	}
 
+	/**
+	 * @param string $templateName
+	 * @param ArrayData $templateVariables
+	 */
 	function processTemplateHTML($templateName, $templateVariables = null) {
 		if (!$templateVariables) {
 			$templateVariables = new ArrayList();

Spacing +1 added lines, -1 removed lines

@@ -717,7 +717,7 @@
 							$this->latLongCenter : $this->geocoding($this->center);
 
 		// coordinates for centre depending on which method used
-		if (isset($geocodeCentre['geocoded'] )) {
+		if (isset($geocodeCentre['geocoded'])) {
 			$latlngCentre = array(
 				'lat' => $geocodeCentre['lat'],
 				'lng' => $geocodeCentre['lon']

code/MapExtension.php

Indentation +1 added lines, -2 removed lines

@@ -186,8 +186,7 @@
 			}
 			$map->setClusterer(true);
 		}
-
-		**/
+		 **/
 
 		$map->setEnableAutomaticCenterZoom($autozoom);
 		$map->setShowInlineMapDivStyle(true);

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 		'MapPinIcon' => 'Image'
 	);
 
-	static $defaults = array (
+	static $defaults = array(
 		'Lat' =>0,
 		'Lon' => 0,
 		'Zoom' => 4,
@@ -154,7 +154,7 @@ 
 
 		// add any KML map layers
 		if (Object::has_extension($this->owner->ClassName, 'MapLayerExtension')) {
-		  foreach($this->owner->MapLayers() as $layer) {
+		  foreach ($this->owner->MapLayers() as $layer) {
 			$map->addKML($layer->KmlFile()->getAbsoluteURL());
 			// we have a layer, so turn on autozoom
 			$autozoom = true;

tests/MapAPITest.php

Spacing +2 added lines, -2 removed lines

@@ -124,7 +124,7 @@ 
 
 	public function testSetSize() {
 		$map = $this->getMap();
-		$map->setSize('432px','1234px');
+		$map->setSize('432px', '1234px');
 		$html = $map->forTemplate();
 		$this->assertContains('style="width:432px; height: 1234px;"', $html);
 	}
@@ -193,7 +193,7 @@ 
 	public function testSetLatLongCenter() {
 		$map = $this->getMap();
 		$map->setIncludeDownloadJavascript(true);
-		$map->setLatLongCenter(-23.714,47.149);
+		$map->setLatLongCenter(-23.714, 47.149);
 		$html = $map->forTemplate();
 		echo $html;
 		$expected = "data-centre='{\"lat\":023.714,\"lng\":47.149}'";

tests/MappableDataTest.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 	public function testGetRenderableMapSetNoMarkerValues() {
 		$instance = $this->getInstance();
 		$instance->MapPinEdited = true;
-		$html = $instance->getRenderableMap(300,800,2)->forTemplate()->getValue();
+		$html = $instance->getRenderableMap(300, 800, 2)->forTemplate()->getValue();
 		echo $html;
 		$expected = <<<HTML
 
@@ -49,7 +49,7 @@ 
 		$instance->MapPinEdited = true;
 		$vals = array('TestKey' => ' TestKeyVal');
 		$instance->setMarkerTemplateValues($vals);
-		$html = $instance->getRenderableMap(300,800,2)->forTemplate()->getValue();
+		$html = $instance->getRenderableMap(300, 800, 2)->forTemplate()->getValue();
 		echo $html;
 		$expected = <<<HTML