gordonbanderson / Mappable

code/LatLongField.php

Indentation +20 added lines, -20 removed lines

@@ -78,38 +78,38 @@
 
 		Requirements::javascript(MAPPABLE_MODULE_PATH.'/javascript/mapField.js');
 		$attributes = array(
-            'class' => 'editableMap',
-            'id' => 'GoogleMap',
-            'data-LatFieldName' => $this->latField,
+			'class' => 'editableMap',
+			'id' => 'GoogleMap',
+			'data-LatFieldName' => $this->latField,
 			'data-LonFieldName' => $this->longField,
 			'data-ZoomFieldName' => $this->zoomField,
 			'data-UseMapBounds' => false
-       );
+	   );
 
-        Requirements::css('mappable/css/mapField.css');
-        $guidePointsJSON = '';
-        if (isset($this->guidePoints)) {
-        	$latlongps = array();
+		Requirements::css('mappable/css/mapField.css');
+		$guidePointsJSON = '';
+		if (isset($this->guidePoints)) {
+			$latlongps = array();
 
 			foreach ($this->guidePoints as $guidepoint) {
 				array_push($latlongps, $guidepoint);
 			}
 
-        	$guidePointsJSON = json_encode($latlongps);
-        	// convert the mappable guidepoints to lat lon
+			$guidePointsJSON = json_encode($latlongps);
+			// convert the mappable guidepoints to lat lon
 
-        	$attributes['data-GuidePoints'] = $guidePointsJSON;
+			$attributes['data-GuidePoints'] = $guidePointsJSON;
 
-        	// we only wish to change the bounds to those of all the points iff
-        	// the item currently has no location
-        	$attributes['data-useMapBounds'] = true;
-        }
-        $content = '<div class="editableMapWrapper">' . $this->createTag(
-            "div",
-            $attributes
-       ) . '</div>';
+			// we only wish to change the bounds to those of all the points iff
+			// the item currently has no location
+			$attributes['data-useMapBounds'] = true;
+		}
+		$content = '<div class="editableMapWrapper">' . $this->createTag(
+			"div",
+			$attributes
+	   ) . '</div>';
 
-        $this->FieldList()->push(new LiteralField('locationEditor', $content));
+		$this->FieldList()->push(new LiteralField('locationEditor', $content));
 
 		$content2 = '<div id="mapSearch">
 		 <input name="location_search" id="location_search" size=80/>

code/MapAPI.php

Indentation +2 added lines, -2 removed lines

@@ -446,8 +446,8 @@
 	}
 
 	/**
-	* Set the center of the gmap
-	**/
+	 * Set the center of the gmap
+	 **/
 	public function setLatLongCenter($center) {
 		$this->latLongCenter = $center;
 		return $this;

code/MapField.php

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

Indentation +62 added lines, -62 removed lines

@@ -23,11 +23,11 @@ 
 	 */
 	public static $map_height = '400px';
 
-    /** @var int Icon width of the gmarker **/
-    public static $iconWidth = 24;
+	/** @var int Icon width of the gmarker **/
+	public static $iconWidth = 24;
 
-    /** @var int Icon height of the gmarker **/
-    public static $iconHeight = 24;
+	/** @var int Icon height of the gmarker **/
+	public static $iconHeight = 24;
 
 	/**
 	 * @var int Prefix for the div ID of the map
@@ -99,59 +99,59 @@ 
 		self::$map_height = $height;
 	}
 
-    /**
-     * FIXME - NOT USED?
-      * Set the type of the gmap
-      *
-      * @param string $mapType (can be 'google.maps.MapTypeId.ROADMAP', 'G_SATELLITE_MAP',
-      * 'G_HYBRID_MAP', 'G_PHYSICAL_MAP')
-      *
-      * @return void
-      */
-    public static function set_map_type($mapType) {
-        self::$map_type = $mapType;
-    }
-
-    /**
-     * FIXME - NOT USED?
-      * Set the with of the gmap infowindow (on marker clik)
-      *
-      * @param int $info_window_width GoogleMap info window width
-      *
-      * @return void
-      */
-    public static function set_info_window_width($info_window_width)
-    {
-        self::$info_window_width = $info_window_width;
-    }
-
-    /**
-     * FIXME - NOT USED?
-      * Set the center of the gmap (an address)
-      *
-      * @param string $center GoogleMap  center (an address)
-      *
-      * @return void
-      */
-    public static function set_center($center)
-    {
-        self::$center = $center;
-    }
-
-    /**
-      * Set the size of the icon markers
-      *
-      * @param int $iconWidth GoogleMap  marker icon width
-      * @param int $iconHeight GoogleMap  marker icon height
-      *
-      * @return void
-      */
-
-    public function set_icon_size($iconWidth,$iconHeight)
-    {
-        self::$iconWidth = $iconWidth;
-        self::$iconHeight = $iconHeight;
-    }
+	/**
+	 * FIXME - NOT USED?
+	 * Set the type of the gmap
+	 *
+	 * @param string $mapType (can be 'google.maps.MapTypeId.ROADMAP', 'G_SATELLITE_MAP',
+	 * 'G_HYBRID_MAP', 'G_PHYSICAL_MAP')
+	 *
+	 * @return void
+	 */
+	public static function set_map_type($mapType) {
+		self::$map_type = $mapType;
+	}
+
+	/**
+	 * FIXME - NOT USED?
+	 * Set the with of the gmap infowindow (on marker clik)
+	 *
+	 * @param int $info_window_width GoogleMap info window width
+	 *
+	 * @return void
+	 */
+	public static function set_info_window_width($info_window_width)
+	{
+		self::$info_window_width = $info_window_width;
+	}
+
+	/**
+	 * FIXME - NOT USED?
+	 * Set the center of the gmap (an address)
+	 *
+	 * @param string $center GoogleMap  center (an address)
+	 *
+	 * @return void
+	 */
+	public static function set_center($center)
+	{
+		self::$center = $center;
+	}
+
+	/**
+	 * Set the size of the icon markers
+	 *
+	 * @param int $iconWidth GoogleMap  marker icon width
+	 * @param int $iconHeight GoogleMap  marker icon height
+	 *
+	 * @return void
+	 */
+
+	public function set_icon_size($iconWidth,$iconHeight)
+	{
+		self::$iconWidth = $iconWidth;
+		self::$iconHeight = $iconHeight;
+	}
 
 	/**
 	 * Get a new GoogleMapAPI object and load it with the default settings
@@ -193,11 +193,11 @@ 
 		$gmap->setDisplayDirectionFields(self::$direction_fields);
 		$gmap->setSize(self::$map_width, self::$map_height);
 		$gmap->setDefaultHideMarker(self::$hide_marker);
-        $gmap->setMapType(self::$map_type);
-        $gmap->setCenter(self::$center);
-        $gmap->setIconSize(self::$iconWidth, self::$iconHeight);
-        $gmap->setIncludeDownloadJavascript(self::$map_already_rendered);
-        $gmap->setAllowFullScreen(self::$allow_full_screen);
+		$gmap->setMapType(self::$map_type);
+		$gmap->setCenter(self::$center);
+		$gmap->setIconSize(self::$iconWidth, self::$iconHeight);
+		$gmap->setIncludeDownloadJavascript(self::$map_already_rendered);
+		$gmap->setAllowFullScreen(self::$allow_full_screen);
 		return $gmap;
 	}
 

tests/MapUtilTest.php

Indentation +11 added lines, -11 removed lines

@@ -24,7 +24,7 @@ 
 	}
 
 	public function test_set_map_size() {
-    	MapUtil::set_map_size('890px','24em');
+		MapUtil::set_map_size('890px','24em');
 		$html = $this->htmlForMap();
 		$this->assertContains(' style="width:890px; height: 24em;"', $html);
 	}
@@ -79,25 +79,25 @@ 
 
 	// These appear to test code that's not used
 	public function test_set_center() {
-    	MapUtil::set_center('Bangkok, Thailand');
+		MapUtil::set_center('Bangkok, Thailand');
 		$html = $this->htmlForMap();
 		echo $html;
 		$this->fail('No evidence of map type changing');
-    }
+	}
 
-     public function test_set_map_type() {
-    	MapUtil::set_map_type('google.maps.MapTypeId.G_PHYSICAL_MAP');
+	 public function test_set_map_type() {
+		MapUtil::set_map_type('google.maps.MapTypeId.G_PHYSICAL_MAP');
 		$html = $this->htmlForMap();
 		echo $html;
 		$this->fail('No evidence of map type changing');
-    }
+	}
 
-     public function test_set_info_window_width()  {
-     	$this->fail('No evidence of set info width being used');
-    }
+	 public function test_set_info_window_width()  {
+	 	$this->fail('No evidence of set info width being used');
+	}
 
-     public function test_set_icon_size() {
+	 public function test_set_icon_size() {
 
-    }
+	}
 
 }