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/MapAPI.php

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

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 +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
 		$this->assertContains('data-useclusterer=1', $html);
 
 		$map = $this->getMap();
-		$map->setClusterer(true, 60,14);
+		$map->setClusterer(true, 60, 14);
 		$html = $map->forTemplate();
 		$this->assertContains('data-clusterergridsize=60', $html);
 		$this->assertContains('data-clusterermaxzoom=14', $html);
@@ -332,7 +332,7 @@ 
 
 	public function testGetContent() {
 		$map = $this->getMap();
-		$filepath = 'file://' . Director::baseFolder()
+		$filepath = 'file://'.Director::baseFolder()
 				  . '/mappable/tests/kml/example.kml';
 		$content = $map->getContent($filepath);
 		$textHash = hash('ripemd160', $content);
@@ -467,14 +467,14 @@ 
 	public function testAddLine() {
 		$map = $this->getMap();
 		$map->addLine(
-			array(13,101),
+			array(13, 101),
 			array(13.2, 101.4),
 			'#F32'
 		);
 
 		$map->addLine(
 			array(13.2, 101.4),
-			array(14.2,99.8)
+			array(14.2, 99.8)
 		);
 
 		$html = $map->forTemplate();