gordonbanderson / Mappable

code/shortcodes/GoogleStreetViewShortCodeHandler.php

Spacing +3 added lines, -3 removed lines

@@ -8,15 +8,15 @@
 
 	public static function parse_googlestreetview($arguments, $caption = null, $parser = null) {
 		// each of latitude, longitude and heading are required at a bare minimum
-		if(!isset($arguments['latitude'])){
+		if (!isset($arguments['latitude'])) {
 			return '';
 		}
 
-		if(!isset($arguments['longitude'])){
+		if (!isset($arguments['longitude'])) {
 			return '';
 		}
 
-		if(!isset($arguments['heading'])){
+		if (!isset($arguments['heading'])) {
 			return '';
 		}
 

code/shortcodes/GoogleMapShortCodeHandler.php

Spacing +2 added lines, -2 removed lines

@@ -7,11 +7,11 @@
 
 	public static function parse_googlemap($arguments, $caption = null, $parser = null) {
 		// each of latitude and longitude are required at a bare minimum
-		if(!isset($arguments['latitude'])){
+		if (!isset($arguments['latitude'])) {
 			return '';
 		}
 
-		if(!isset($arguments['longitude'])){
+		if (!isset($arguments['longitude'])) {
 			return '';
 		}
 

code/MappableDataObjectSet.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 		$gmap = MapUtil::get_map($this->owner, $this->MarkerTemplateValues);
 		$w = $width ? $width : MapUtil::$map_width;
 		$h = $height ? $height : MapUtil::$map_height;
-		$gmap->setSize($w,$h);
+		$gmap->setSize($w, $h);
 		return $gmap;
 	}
 

code/MapField.php

Spacing +5 added lines, -5 removed lines

@@ -15,19 +15,19 @@ 
 				// legacy handling for old parameters: $title, $heading, ...
 				// instead of new handling: $name, $title, $heading, ...
 				$args = func_get_args();
-				if(!isset($args[1]) || is_numeric($args[1])) {
+				if (!isset($args[1]) || is_numeric($args[1])) {
 						$title = (isset($args[0])) ? $args[0] : null;
 						// Use "HeaderField(title)" as the default field name for a HeaderField;
 						// if it's just set to title then we risk causing accidental duplicate-field creation.
 
 						// this means i18nized fields won't be easily accessible through fieldByName()
-						$name = 'MapField' . $title;
+						$name = 'MapField'.$title;
 						$headingLevel = (isset($args[1])) ? $args[1] : null;
 						$allowHTML = (isset($args[2])) ? $args[2] : null;
 						$form = (isset($args[3])) ? $args[3] : null;
 				}
 
-				if($headingLevel) $this->headingLevel = $headingLevel;
+				if ($headingLevel) $this->headingLevel = $headingLevel;
 				$this->allowHTML = $allowHTML;
 				parent::__construct($name, $title, null, $allowHTML, $form);
 		}
@@ -52,9 +52,9 @@ 
 
 				Requirements::css('mappable/css/mapField.css');
 
-				return '<div class="editableMap">' . $this->createTag(
+				return '<div class="editableMap">'.$this->createTag(
 						"div",
 						$attributes
-				) . '</div>';
+				).'</div>';
 		}
 }

code/MappableData.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
 		$gmap = MapUtil::get_map(new ArrayList(array($this->owner)), $this->MarkerTemplateValues);
 		$w = $width ? $width : MapUtil::$map_width;
 		$h = $height ? $height : MapUtil::$map_height;
-		$gmap->setSize($w,$h);
+		$gmap->setSize($w, $h);
 		$gmap->setZoom($zoom);
 		$gmap->setEnableAutomaticCenterZoom(false);
 		if ($this->owner->MapPinEdited) {
@@ -89,7 +89,7 @@ 
 			$urlparts['markers'] = "icon:$pin|$lat,$lng";
 		}
 
-		$src = htmlentities($apiurl . '?' . http_build_query($urlparts));
+		$src = htmlentities($apiurl.'?'.http_build_query($urlparts));
 		return '<img src="'.$src.'" width="'.$w.'" height="'.$h.'" alt="'.$this->owner->Title.'" />';
 	}
 

code/MapExtension.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
 		'MapPinIcon' => 'Image'
 	);
 
-	static $defaults = array (
+	static $defaults = array(
 		'Lat' =>0,
 		'Lon' => 0,
 		'Zoom' => 4,
@@ -145,7 +145,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;
@@ -155,7 +155,7 @@ 
 
 		// add points of interest taking into account the default icon of the layer as an override
 		if (Object::has_extension($this->owner->ClassName, 'PointsOfInterestLayerExtension')) {
-			foreach($this->owner->PointsOfInterestLayers() as $layer) {
+			foreach ($this->owner->PointsOfInterestLayers() as $layer) {
 				$layericon = $layer->DefaultIcon();
 				if ($layericon->ID === 0) {
 					$layericon = null;

tests/MapAPITest.php

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,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);
 	}
@@ -110,7 +110,7 @@ 
 	public function testSetCenter() {
 		$map = $this->getMap();
 		$map->setIncludeDownloadJavascript(true);
-		$map->setCenter(-23.714,47.149);
+		$map->setCenter(-23.714, 47.149);
 		$html = $map->forTemplate();
 		echo $html;
 		$expected = "data-centre='{\"lat\":023.714,\"lng\":47.149}'";
@@ -121,7 +121,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/MapUtilTest.php

Spacing +1 added lines, -1 removed lines

@@ -124,7 +124,7 @@
 	}
 
 	 public function test_set_icon_size() {
-	 	MapUtil::set_icon_size(14,37);
+	 	MapUtil::set_icon_size(14, 37);
 	 	$html = $this->htmlForMap();
 	 	$html = $this->htmlForMap();
 	 	echo $html;

tests/MappableDataTest.php

Spacing +10 added lines, -10 removed lines

@@ -20,8 +20,8 @@ 
 		$instance = $this->getInstance();
 		$vals = array('TestKey' => 'TestVal');
 		$instance->setMarkerTemplateValues($vals);
-		$html = $instance->getRenderableMap(300,800,2)->forTemplate();
-		$expected =  '';
+		$html = $instance->getRenderableMap(300, 800, 2)->forTemplate();
+		$expected = '';
 		$this->assertEquals($expected, $html);
 	}
 
@@ -31,7 +31,7 @@ 
 		$instance = $this->getInstance();
 		$instance->Lat = 13.84;
 		$instance->Lon = 100.52;
-		$html = $instance->StaticMap(300,800);
+		$html = $instance->StaticMap(300, 800);
 		$expected = '<img src="//maps.googleapis.com/maps/api/staticmap?center='
 				  . '13.84%2C100.52&amp;markers=13.84%2C100.52'
 				  . '&amp;zoom=13&amp;size=300x800&amp;sensor=false&amp;mapt'
@@ -43,14 +43,14 @@ 
 		$instance = $this->getInstance();
 		$instance->Lat = 13.8188931;
 		$instance->Lon = 100.5005558;
-		$html = $instance->StaticMap(300,800);
+		$html = $instance->StaticMap(300, 800);
 		$expected = '<img src="//maps.googleapis.com/maps/api/staticmap?center='
 				  . '13.8188931%2C100.5005558&amp;markers=13.8188931%2C100.5005'
 				  . '558&amp;zoom=13&amp;size=300x800&amp;sensor=false&amp;mapt'
 				  . 'ype=roadmap" width="300" height="800" alt="" />';
 		$this->assertEquals($expected, $html);
 
-		$html = $instance->StaticMap(310,810);
+		$html = $instance->StaticMap(310, 810);
 		$expected = '<img src="//maps.googleapis.com/maps/api/staticmap?center='
 				  . '13.8188931%2C100.5005558&amp;markers=13.8188931%2C100.5005'
 				  . '558&amp;zoom=13&amp;size=310x810&amp;sensor=false&amp;mapt'
@@ -63,20 +63,20 @@ 
 		$instance = $this->getInstance();
 		$instance->Lat = 13.8188931;
 		$instance->Lon = 100.5005558;
-		$html = $instance->StaticMap(300,800,  null, 'satellite');
+		$html = $instance->StaticMap(300, 800, null, 'satellite');
 		$expected = '<img src="//maps.googleapis.com/maps/api/staticmap?center='
 				  . '13.8188931%2C100.5005558&amp;markers=13.8188931%2C100.5005'
 				  . '558&amp;zoom=13&amp;size=300x800&amp;sensor=false&amp;mapt'
 				  . 'ype=satellite" width="300" height="800" alt="" />';
 		$this->assertEquals($expected, $html);
 
-		$html = $instance->StaticMap(300,800,null, 'terrain');
+		$html = $instance->StaticMap(300, 800, null, 'terrain');
 		$expected = '<img src="//maps.googleapis.com/maps/api/staticmap?center='
 				  . '13.8188931%2C100.5005558&amp;markers=13.8188931%2C100.5005'
 				  . '558&amp;zoom=13&amp;size=300x800&amp;sensor=false&amp;mapt'
 				  . 'ype=terrain" width="300" height="800" alt="" />';
 
-		$html = $instance->StaticMap(300,800,null, 'hybrid');
+		$html = $instance->StaticMap(300, 800, null, 'hybrid');
 		$expected = '<img src="//maps.googleapis.com/maps/api/staticmap?center='
 				  . '13.8188931%2C100.5005558&amp;markers=13.8188931%2C100.5005'
 				  . '558&amp;zoom=13&amp;size=300x800&amp;sensor=false&amp;mapt'
@@ -88,14 +88,14 @@ 
 	public function testStaticMapVaryZoom() {
 		$instance = $this->getInstance();
 
-		$html = $instance->StaticMap(300,800,2);
+		$html = $instance->StaticMap(300, 800, 2);
 		$expected = '<img src="//maps.googleapis.com/maps/api/staticmap?center='
 				  . '13.8188931%2C100.5005558&amp;markers=13.8188931%2C100.5005'
 				  . '558&amp;zoom=2&amp;size=300x800&amp;sensor=false&amp;mapt'
 				  . 'ype=roadmap" width="300" height="800" alt="" />';
 		$this->assertEquals($expected, $html);
 
-		$html = $instance->StaticMap(300,800,12);
+		$html = $instance->StaticMap(300, 800, 12);
 		$expected = '<img src="//maps.googleapis.com/maps/api/staticmap?center='
 				  . '13.8188931%2C100.5005558&amp;markers=13.8188931%2C100.5005'
 				  . '558&amp;zoom=12&amp;size=300x800&amp;sensor=false&amp;mapt'