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

Spacing +15 added lines, -15 removed lines

@@ -203,7 +203,7 @@ 
 	 * @return void
 	 */
 
-	public function __construct($googleMapKey='') {
+	public function __construct($googleMapKey = '') {
 		$this->googleMapKey = $googleMapKey;
 	}
 
@@ -262,8 +262,8 @@ 
 	 * @return void
 	 */
 
-	public function setClusterer($useClusterer, $gridSize=50, $maxZoom=17,
-			$clustererLibraryPath='/mappable/javascript/google/markerclusterer.js') {
+	public function setClusterer($useClusterer, $gridSize = 50, $maxZoom = 17,
+			$clustererLibraryPath = '/mappable/javascript/google/markerclusterer.js') {
 		$this->useClusterer = $useClusterer;
 		$this->gridSize = $gridSize;
 		$this->maxZoom = $maxZoom;
@@ -558,7 +558,7 @@ 
 	 * @return void
 	 */
 
-	public function addMarkerByCoords($lat, $lng, $html='', $category='', $icon='') {
+	public function addMarkerByCoords($lat, $lng, $html = '', $category = '', $icon = '') {
 		$m = array(
 			'latitude' => $lat,
 			'longitude' => $lng,
@@ -582,9 +582,9 @@ 
 	 * @return void
 	 */
 
-	public function addMarkerByAddress($address, $content='', $category='', $icon='') {
+	public function addMarkerByAddress($address, $content = '', $category = '', $icon = '') {
 		$point = $this->geocoding($address);
-		if ($point!==null) {
+		if ($point !== null) {
 			$this->addMarkerByCoords($point[2], $point[3], $content, $category, $icon);
 		} else {
 			// throw new Exception('Adress not found : '.$address);
@@ -602,7 +602,7 @@ 
 	 * @return void
 	 */
 
-	public function addArrayMarkerByCoords($coordtab, $category='', $icon='') {
+	public function addArrayMarkerByCoords($coordtab, $category = '', $icon = '') {
 		foreach ($coordtab as $coord) {
 			$this->addMarkerByCoords($coord[0], $coord[1], $coord[2], $category, $icon);
 		}
@@ -684,7 +684,7 @@ 
 	 * @return void
 	 */
 
-	public function addArrayMarkerByAddress($coordtab, $category='', $icon='') {
+	public function addArrayMarkerByAddress($coordtab, $category = '', $icon = '') {
 		foreach ($coordtab as $coord) {
 			$this->addMarkerByAddress($coord[0], $coord[1], $category, $icon);
 		}
@@ -701,7 +701,7 @@ 
 	 * @return void
 	 */
 
-	public function addDirection($from, $to, $idpanel='') {
+	public function addDirection($from, $to, $idpanel = '') {
 		$this->contentMarker .= 'addDirection("'.$from.'","'.$to.'","'.$idpanel.'");';
 	}
 
@@ -765,9 +765,9 @@ 
 			$linesJson = stripslashes($this->jsonRemoveUnicodeSequences($this->lines));
 			$kmlJson = stripslashes($this->jsonRemoveUnicodeSequences($this->kmlFiles));
 		} else {
-			$jsonMarkers = stripslashes(json_encode($this->markers,JSON_UNESCAPED_UNICODE));
-			$linesJson = stripslashes(json_encode($this->lines,JSON_UNESCAPED_UNICODE));
-			$kmlJson = stripslashes(json_encode($this->kmlFiles,JSON_UNESCAPED_UNICODE));
+			$jsonMarkers = stripslashes(json_encode($this->markers, JSON_UNESCAPED_UNICODE));
+			$linesJson = stripslashes(json_encode($this->lines, JSON_UNESCAPED_UNICODE));
+			$kmlJson = stripslashes(json_encode($this->kmlFiles, JSON_UNESCAPED_UNICODE));
 		}
 
 
@@ -777,8 +777,8 @@ 
 							$this->latLongCenter : $this->geocoding($this->center);
 
 		// coordinates for centre depending on which method used
-		if ($geocodeCentre[0]=="200") { // success
-			$latlngCentre = array('lat'=>$geocodeCentre[2],'lng' => $geocodeCentre[3]);
+		if ($geocodeCentre[0] == "200") { // success
+			$latlngCentre = array('lat'=>$geocodeCentre[2], 'lng' => $geocodeCentre[3]);
 		} else { // Paris
 			$latlngCentre = array('lat'=>48.8792, 'lng' => 2.34778);
 		}
@@ -870,7 +870,7 @@ 
 		return $result;
 	}
 
-	function processTemplateHTML($templateName, $templateVariables = null ) {
+	function processTemplateHTML($templateName, $templateVariables = null) {
 		if (!$templateVariables) {
 			$templateVariables = new ArrayList();
 		}

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;

code/LatLongField.php

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 
 class LatLongField extends FieldGroup {
 
-	private static $allowed_actions = array (
+	private static $allowed_actions = array(
 		'geocode'
 	);
 
@@ -85,10 +85,10 @@ 
         	// the item currently has no location
         	$attributes['data-useMapBounds'] = true;
         }
-        $content = '<div class="editableMapWrapper">' . $this->createTag(
+        $content = '<div class="editableMapWrapper">'.$this->createTag(
             "div",
             $attributes
-       ) . '</div>';
+       ).'</div>';
 
         $this->FieldList()->push(new LiteralField('locationEditor', $content));
 

code/MapUtil.php

Spacing +5 added lines, -5 removed lines

@@ -146,7 +146,7 @@ 
 	 * @return void
 	 */
 
-	public function set_icon_size($iconWidth,$iconHeight)
+	public function set_icon_size($iconWidth, $iconHeight)
 	{
 		self::$iconWidth = $iconWidth;
 		self::$iconHeight = $iconHeight;
@@ -208,7 +208,7 @@ 
 	 * @return string
 	 */
 	public static function sanitize($content) {
-		return addslashes(str_replace(array("\n","\r", "\t"), '' ,$content));
+		return addslashes(str_replace(array("\n", "\r", "\t"), '', $content));
 	}
 
 
@@ -223,7 +223,7 @@ 
 	 */
 	public static function get_map(SS_List $list, $infowindowtemplateparams) {
 		$gmap = self::instance();
-		if($list) {
+		if ($list) {
 			foreach ($list as $mappable) {
 				if (self::ChooseToAddDataobject($mappable)) {
 					$gmap->addMarkerAsObject($mappable, $infowindowtemplateparams);
@@ -244,7 +244,7 @@ 
 	private static function ChooseToAddDataobject(DataObject $do) {
 		$isMappable = $do->is_a('Mappable');
 
-		foreach($do->getExtensionInstances() as $extension) {
+		foreach ($do->getExtensionInstances() as $extension) {
 			$isMappable = $isMappable || $extension instanceof Mappable;
 		}
 
@@ -252,6 +252,6 @@ 
 			? $do->MapPinEdited
 			: true;
 
-		return $isMappable && $filterMapPinEdited  ;
+		return $isMappable && $filterMapPinEdited;
 	}
 }