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/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/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;

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;

code/LatLongField.php

Braces +3 added lines, -1 removed lines

@@ -23,8 +23,10 @@
 		if ((sizeof($children) < 2) || (sizeof($children) > 3) ||
 			 (!$children[0] instanceof FormField) ||
 			 (!$children[1] instanceof FormField)
-		) user_error('LatLongField argument 1 must be an array containing at least two FormField '.
+		) {
+			user_error('LatLongField argument 1 must be an array containing at least two FormField '.
 				'objects for Lat/Long values, respectively.', E_USER_ERROR);
+		}
 
 		parent::__construct($children);
 

tests/MapExtensionTest.php

Doc Comments +7 added lines

@@ -256,6 +256,10 @@ 
 	/*
 	Add a map layer to an existing instance
 	 */
+
+	/**
+	 * @param Member $instance
+	 */
 	private function addLayerToInstance(&$instance) {
 		// Create a layer
 		$kmlFile = new File(array('Name' => 'example.kml', 'Filename' => 'mappable/tests/kml/example.kml'));
@@ -269,6 +273,9 @@ 
 		$layers->add($layer);
 	}
 
+	/**
+	 * @param Member $instance
+	 */
 	private function addMapPinToInstance(&$instance) {
 		// Create a pin
 		$imageFile = new Image(array('Name' => 'mapicontest.png', 'Filename' => 'mappable/tests/images/mapicontest.png'));