gordonbanderson / Mappable

code/MapExtension.php

Doc Comments +1 added lines, -1 removed lines

@@ -184,7 +184,7 @@
 
 	/**
 	 * Access the map editing field for the purpose of adding guide points
-	 * @return [LatLongField] instance of location editing field
+	 * @return FormField instance of location editing field
 	 */
 	public function getMapField() {
 		if (!isset($this->mapField)) {

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;

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>';
 		}
 }

Braces +3 added lines, -1 removed lines

@@ -27,7 +27,9 @@
 						$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);
 		}

Indentation +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 /**
- * Map field to point for pois langitude and longitude positioning
- */
+	 * Map field to point for pois langitude and longitude positioning
+	 */
 class MapField extends DatalessField {
 
 		/**

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.'" />';
 	}
 

Indentation +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 		}
 
 		//https://maps.googleapis.com/maps/api/staticmap?center=Berkeley,CA&zoom=14&size=400x400&key=YOUR_API_KEY
-			    //maps.googleapis.com/maps/api/staticmap';
+				//maps.googleapis.com/maps/api/staticmap';
 
 		$apiurl = Config::inst()->get('MappableData', 'staticmap_api_url');
 

code/Mappable.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Defines the interface for a mappable DataObject. Implementors of this interface
- * must define the following functions in order to work with the {@link GoogleMapUtil}
- * helper class.
- *
- * @author Uncle Cheese
- * @package mappable
- */
+	 * Defines the interface for a mappable DataObject. Implementors of this interface
+	 * must define the following functions in order to work with the {@link GoogleMapUtil}
+	 * helper class.
+	 *
+	 * @author Uncle Cheese
+	 * @package mappable
+	 */
 interface Mappable {
 
 	/**

code/MapAPI.php

Indentation +4 added lines, -4 removed lines

@@ -397,10 +397,10 @@
 	}
 
 	/**
-	* Set the center of the gmap
-	*
-	* @return MapAPI This same object, in order to enable chaining of methods
-	**/
+	 * Set the center of the gmap
+	 *
+	 * @return MapAPI This same object, in order to enable chaining of methods
+	 **/
 	public function setLatLongCenter($center) {
 		$this->latLongCenter = $center;
 		return $this;

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']

Doc Comments +12 added lines, -8 removed lines

@@ -153,7 +153,7 @@ 
 	 *
 	 * @param string  $googleMapKey the googleMapKey
 	 *
-	 * @return void
+	 * @return MapAPI
 	 */
 
 	public function setKey($googleMapKey) {
@@ -394,7 +394,7 @@ 
 	 *
 	 * @param boolean $defaultHideMarker hide all the markers on the map by default
 	 *
-	 * @return void
+	 * @return MapAPI
 	 */
 
 	public function setDefaultHideMarker($defaultHideMarker) {
@@ -439,7 +439,7 @@ 
 	 *
 	 * @param string  $address an address
 	 *
-	 * @return array array with precision, lat & lng
+	 * @return string array with precision, lat & lng
 	 */
 
 	public function geocoding($address) {
@@ -468,7 +468,7 @@ 
 	 * @param string  $category marker category
 	 * @param string  $icon     an icon url
 	 *
-	 * @return void
+	 * @return MapAPI
 	 */
 
 	public function addMarkerByCoords($lat, $lng, $html = '', $category = '', $icon = '') {
@@ -492,7 +492,7 @@ 
 	 * @param string  $category marker category
 	 * @param string  $icon     an icon url
 	 *
-	 * @return void
+	 * @return MapAPI
 	 */
 
 	public function addMarkerByAddress($address, $content = '', $category = '', $icon = '') {
@@ -510,7 +510,7 @@ 
 	 * @param string  $category marker category
 	 * @param string  $icon     an icon url
 	 *
-	 * @return void
+	 * @return MapAPI
 	 */
 
 	public function addArrayMarkerByCoords($coordtab, $category = '', $icon = '') {
@@ -593,7 +593,7 @@ 
 	 * @param string  $category marker category
 	 * @param string  $icon     an icon url
 	 *
-	 * @return void
+	 * @return MapAPI
 	 */
 
 	public function addArrayMarkerByAddress($coordtab, $category = '', $icon = '') {
@@ -608,7 +608,7 @@ 
 	 *
 	 * @param string  $url      url of the kml file compatible with gmap and gearth
 	 *
-	 * @return void
+	 * @return MapAPI
 	 */
 
 	public function addKML($url) {
@@ -755,6 +755,10 @@ 
 		$this->content = $this->processTemplateHTML('Map', $vars);
 	}
 
+	/**
+	 * @param string $templateName
+	 * @param ArrayData $templateVariables
+	 */
 	function processTemplateHTML($templateName, $templateVariables = null) {
 		if (!$templateVariables) {
 			$templateVariables = new ArrayList();

code/MapUtil.php

Braces +3 added lines, -2 removed lines

@@ -226,8 +226,9 @@
 		$gmap = self::instance();
 		if ($list) {
 			foreach ($list as $mappable) {
-				if (self::ChooseToAddDataobject($mappable))
-					$gmap->addMarkerAsObject($mappable, $infowindowtemplateparams);
+				if (self::ChooseToAddDataobject($mappable)) {
+									$gmap->addMarkerAsObject($mappable, $infowindowtemplateparams);
+				}
 			}
 		}
 		return $gmap;