gordonbanderson / Mappable

code/MapAPI.php

Indentation +644 added lines, -644 removed lines

@@ -17,699 +17,699 @@
 class MapAPI extends ViewableData
 {
 
-	 /** GoogleMap key **/
-	protected $googleMapKey = '';
+        /** GoogleMap key **/
+    protected $googleMapKey = '';
 
-	/** GoogleMap ID for the HTML DIV  **/
-	protected $googleMapId = 'googlemapapi';
+    /** GoogleMap ID for the HTML DIV  **/
+    protected $googleMapId = 'googlemapapi';
 
-	/* Additional CSS classes to use when rendering the map */
-	protected $set_additional_css_classes = '';
+    /* Additional CSS classes to use when rendering the map */
+    protected $set_additional_css_classes = '';
 
-	/** Width of the gmap **/
-	protected $width = 800;
+    /** Width of the gmap **/
+    protected $width = 800;
 
-	/** Height of the gmap **/
-	protected $height = 600;
+    /** Height of the gmap **/
+    protected $height = 600;
 
-	/* array of lines to be drawn on the map */
-	protected $lines = array();
+    /* array of lines to be drawn on the map */
+    protected $lines = array();
 
-	/* kml file to be rendered */
-	protected $kmlFiles = array();
+    /* kml file to be rendered */
+    protected $kmlFiles = array();
 
-	/** Default zoom of the gmap **/
-	protected $zoom = 9;
+    /** Default zoom of the gmap **/
+    protected $zoom = 9;
 
-	/** Enable the zoom of the Infowindow **/
-	protected $enableWindowZoom = false;
+    /** Enable the zoom of the Infowindow **/
+    protected $enableWindowZoom = false;
 
-	/** Default zoom of the Infowindow **/
-	protected $infoWindowZoom = 13;
+    /** Default zoom of the Infowindow **/
+    protected $infoWindowZoom = 13;
 
-	/** Lang of the gmap **/
-	protected $lang = 'en';
+    /** Lang of the gmap **/
+    protected $lang = 'en';
 
-	/**Center of the gmap **/
-	protected $center = 'Paris, France';
+    /**Center of the gmap **/
+    protected $center = 'Paris, France';
 
-	/*
+    /*
 	 Additional CSS classes to render as a class attribute for the div of the
 	 map.  Use this if you want more  fine grained control over your map using
 	 CSS.  If blank it will be ignored
 	 */
-	protected $additional_css_classes = '';
+    protected $additional_css_classes = '';
 
 
-	/* Decided whether or not to show the inline map css style on div creation */
-	protected $show_inline_map_div_style = true;
+    /* Decided whether or not to show the inline map css style on div creation */
+    protected $show_inline_map_div_style = true;
 
-	protected $latLongCenter = null;
+    protected $latLongCenter = null;
 
-	protected $jsonMapStyles = '[]';
+    protected $jsonMapStyles = '[]';
 
-	/**
-	 * Type of the gmap, can be:
-	 *  'road' (roadmap),
-	 *  'satellite' (sattelite/aerial photographs)
-	 *  'hybrid' (hybrid of road and satellite)
-	 *  'terrain' (terrain)
-	 *  The JavaScript for the mapping service will convert this into a suitable mapping type
-	 */
+    /**
+     * Type of the gmap, can be:
+     *  'road' (roadmap),
+     *  'satellite' (sattelite/aerial photographs)
+     *  'hybrid' (hybrid of road and satellite)
+     *  'terrain' (terrain)
+     *  The JavaScript for the mapping service will convert this into a suitable mapping type
+     */
 
-	protected $mapType = 'road';
+    protected $mapType = 'road';
 
 
-	/** Content of the HTML generated **/
-	protected $content = '';
+    /** Content of the HTML generated **/
+    protected $content = '';
 
-	protected $mapService = 'google';
+    protected $mapService = 'google';
 
-	/** Hide the marker by default **/
-	protected $defaultHideMarker = false;
+    /** Hide the marker by default **/
+    protected $defaultHideMarker = false;
 
-	/** Extra content (marker, etc...) **/
-	protected $contentMarker = '';
+    /** Extra content (marker, etc...) **/
+    protected $contentMarker = '';
 
-	// a list of markers, markers being associative arrays
-	protected $markers = array();
+    // a list of markers, markers being associative arrays
+    protected $markers = array();
 
-	/** Use clusterer to display a lot of markers on the gmap **/
-	protected $useClusterer = false;
-	protected $gridSize = 50;
-	protected $maxZoom = 17;
-	protected $clustererLibraryPath = "/mappable/javascript/google/markerclusterer.js";
+    /** Use clusterer to display a lot of markers on the gmap **/
+    protected $useClusterer = false;
+    protected $gridSize = 50;
+    protected $maxZoom = 17;
+    protected $clustererLibraryPath = "/mappable/javascript/google/markerclusterer.js";
 
-	/** Enable automatic center/zoom **/
-	protected $enableAutomaticCenterZoom = false;
+    /** Enable automatic center/zoom **/
+    protected $enableAutomaticCenterZoom = false;
 
-	/** maximum longitude of all markers **/
-	protected $maxLng = -1000000;
+    /** maximum longitude of all markers **/
+    protected $maxLng = -1000000;
 
-	/** minimum longitude of all markers **/
-	protected $minLng = 1000000;
+    /** minimum longitude of all markers **/
+    protected $minLng = 1000000;
 
-	/** max latitude of all markers **/
-	protected $maxLat = -1000000;
+    /** max latitude of all markers **/
+    protected $maxLat = -1000000;
 
-	/** min latitude of all markers **/
-	protected $minLat = 1000000;
+    /** min latitude of all markers **/
+    protected $minLat = 1000000;
 
-	/** map center latitude (horizontal), calculated automatically as markers
+    /** map center latitude (horizontal), calculated automatically as markers
 	are added to the map **/
-	protected $centerLat = null;
+    protected $centerLat = null;
 
-	/** map center longitude (vertical),  calculated automatically as markers
+    /** map center longitude (vertical),  calculated automatically as markers
 	are added to the map **/
-	protected $centerLng = null;
+    protected $centerLng = null;
 
-	/** factor by which to fudge the boundaries so that when we zoom encompass,
+    /** factor by which to fudge the boundaries so that when we zoom encompass,
 	the markers aren't too close to the edge **/
-	protected $coordCoef = 0.01;
-
-	/* set this to true to render button to maximize / minimize a map */
-	protected $allowFullScreen = null;
-
-	/**
-	 * Class constructor
-	 *
-	 * @param string  $googleMapKey the googleMapKey
-	 */
-
-	public function __construct($googleMapKey = '') {
-		$this->googleMapKey = $googleMapKey;
-	}
-
-	public function setShowInlineMapDivStyle($new_show_inline_map_div_style) {
-		$this->show_inline_map_div_style = $new_show_inline_map_div_style;
-		return $this;
-	}
-
-	public function setAdditionalCSSClasses($new_additional_css_classes) {
-		$this->additional_css_classes = $new_additional_css_classes;
-		return $this;
-	}
-
-
-	public function setMapStyle($newStyles) {
-		$this->jsonMapStyles = $newStyles;
-		return $this;
-	}
-
-	/**
-	 * Set the useClusterer parameter (optimization to display a lot of marker)
-	 *
-	 * @param boolean $useClusterer     use cluster or not
-	 * @param int     $gridSize         grid size
-	 * @param int     $maxZoom 			max zoom to cluster at
-	 *
-	 * * @return MapAPI This same object, in order to enable chaining of methods
-	 */
-
-	public function setClusterer($useClusterer, $gridSize = 50, $maxZoom = 17,
-		$clustererLibraryPath = '/mappable/javascript/google/markerclusterer.js') {
-		$this->useClusterer = $useClusterer;
-		$this->gridSize = $gridSize;
-		$this->maxZoom = $maxZoom;
-		$this->clustererLibraryPath = $clustererLibraryPath;
-		return $this;
-	}
-
-	/**
-	 * Set the ID of the default gmap DIV
-	 *
-	 * @param string  $googleMapId the google div ID
-	 *
-	 * @return MapAPI This same object, in order to enable chaining of methods
-	 */
-
-	public function setDivId($googleMapId) {
-		$this->googleMapId = $googleMapId;
-		return $this;
-	}
-
-	/**
-	 * Set the size of the gmap.  If these values are not provided
-	 * then CSS is used instead
-	 *
-	 * @param int     $width  GoogleMap  width
-	 * @param int     $height GoogleMap  height
-	 *
-	 * @return MapAPI This same object, in order to enable chaining of methods
-	 */
-
-	public function setSize($width, $height) {
-		$this->width = $width;
-		$this->height = $height;
-		return $this;
-	}
-
-	/**
-	 * Set the lang of the gmap
-	 *
-	 * @param string  $lang GoogleMap  lang : fr,en,..
-	 *
-	 * @return MapAPI This same object, in order to enable chaining of methods
-	 */
-
-	public function setLang($lang) {
-		$this->lang = $lang;
-		return $this;
-	}
-
-	/**
-	 * Set the zoom of the gmap
-	 *
-	 * @param int $zoom GoogleMap zoom.
-	 *
-	 * @return MapAPI This same object, in order to enable chaining of methods
-	 */
-
-	public function setZoom($zoom) {
-		$this->zoom = $zoom;
-		return $this;
-	}
-
-	/**
-	 * Set the zoom of the infowindow
-	 *
-	 * @param int 	$infoWindowZoom GoogleMap information window zoom.
-	 *
-	 * @return MapAPI This same object, in order to enable chaining of methods
-	 */
-
-	public function setInfoWindowZoom($infoWindowZoom) {
-		$this->infoWindowZoom = $infoWindowZoom;
-		return $this;
-	}
-
-	/**
-	 * Enable the zoom on the marker when you click on it
-	 *
-	 * @param boolean $enableWindowZoom info window enabled zoom.
-	 *
-	 * @return MapAPI This same object, in order to enable chaining of methods
-	 */
-
-	public function setEnableWindowZoom($enableWindowZoom) {
-		$this->enableWindowZoom = $enableWindowZoom;
-		return $this;
-	}
-
-	/**
-	 * Enable theautomatic center/zoom at the gmap load
-	 *
-	 * @param boolean $enableAutomaticCenterZoom enable automatic centre zoom
-	 *
-	 * @return MapAPI This same object, in order to enable chaining of methods
-	 */
-
-	public function setEnableAutomaticCenterZoom($enableAutomaticCenterZoom) {
-		$this->enableAutomaticCenterZoom = $enableAutomaticCenterZoom;
-		return $this;
-	}
-
-	/**
-	 * Set the center of the gmap (an address)
-	 *
-	 * @param string  $center GoogleMap  center (an address)
-	 *
-	 * @return MapAPI This same object, in order to enable chaining of methods
-	 */
-
-	public function setCenter($center) {
-		$this->center = $center;
-		return $this;
-	}
-
-	/**
-	 * Set the type of the gmap.  Also takes into account legacy settings
-	 *
-	 * FIXME - allow other valid settings in config for map type
-	 *
-	 * @param string  $mapType  Can be one of road,satellite,hybrid or terrain. Defaults to road
-	 *
-	 * @return MapAPI This same object, in order to enable chaining of methods
-	 */
-
-	public function setMapType($mapType) {
-		$this->mapType = $mapType;
-
-		// deal with legacy values for backwards compatbility
-		switch ($mapType) {
-			case 'google.maps.MapTypeId.SATELLITE':
-				$this->mapType = "satellite";
-				break;
-			case 'google.maps.MapTypeId.G_HYBRID_MAP':
-				$this->mapType = "hybrid";
-				break;
-			case 'google.maps.MapTypeId.G_PHYSICAL_MAP':
-				$this->mapType = "terrain";
-				break;
-			case 'google.maps.MapTypeId.ROADMAP':
-				$this->mapType = "road";
-				break;
-		}
-		return $this;
-	}
-
-	/*
+    protected $coordCoef = 0.01;
+
+    /* set this to true to render button to maximize / minimize a map */
+    protected $allowFullScreen = null;
+
+    /**
+     * Class constructor
+     *
+     * @param string  $googleMapKey the googleMapKey
+     */
+
+    public function __construct($googleMapKey = '') {
+        $this->googleMapKey = $googleMapKey;
+    }
+
+    public function setShowInlineMapDivStyle($new_show_inline_map_div_style) {
+        $this->show_inline_map_div_style = $new_show_inline_map_div_style;
+        return $this;
+    }
+
+    public function setAdditionalCSSClasses($new_additional_css_classes) {
+        $this->additional_css_classes = $new_additional_css_classes;
+        return $this;
+    }
+
+
+    public function setMapStyle($newStyles) {
+        $this->jsonMapStyles = $newStyles;
+        return $this;
+    }
+
+    /**
+     * Set the useClusterer parameter (optimization to display a lot of marker)
+     *
+     * @param boolean $useClusterer     use cluster or not
+     * @param int     $gridSize         grid size
+     * @param int     $maxZoom 			max zoom to cluster at
+     *
+     * * @return MapAPI This same object, in order to enable chaining of methods
+     */
+
+    public function setClusterer($useClusterer, $gridSize = 50, $maxZoom = 17,
+        $clustererLibraryPath = '/mappable/javascript/google/markerclusterer.js') {
+        $this->useClusterer = $useClusterer;
+        $this->gridSize = $gridSize;
+        $this->maxZoom = $maxZoom;
+        $this->clustererLibraryPath = $clustererLibraryPath;
+        return $this;
+    }
+
+    /**
+     * Set the ID of the default gmap DIV
+     *
+     * @param string  $googleMapId the google div ID
+     *
+     * @return MapAPI This same object, in order to enable chaining of methods
+     */
+
+    public function setDivId($googleMapId) {
+        $this->googleMapId = $googleMapId;
+        return $this;
+    }
+
+    /**
+     * Set the size of the gmap.  If these values are not provided
+     * then CSS is used instead
+     *
+     * @param int     $width  GoogleMap  width
+     * @param int     $height GoogleMap  height
+     *
+     * @return MapAPI This same object, in order to enable chaining of methods
+     */
+
+    public function setSize($width, $height) {
+        $this->width = $width;
+        $this->height = $height;
+        return $this;
+    }
+
+    /**
+     * Set the lang of the gmap
+     *
+     * @param string  $lang GoogleMap  lang : fr,en,..
+     *
+     * @return MapAPI This same object, in order to enable chaining of methods
+     */
+
+    public function setLang($lang) {
+        $this->lang = $lang;
+        return $this;
+    }
+
+    /**
+     * Set the zoom of the gmap
+     *
+     * @param int $zoom GoogleMap zoom.
+     *
+     * @return MapAPI This same object, in order to enable chaining of methods
+     */
+
+    public function setZoom($zoom) {
+        $this->zoom = $zoom;
+        return $this;
+    }
+
+    /**
+     * Set the zoom of the infowindow
+     *
+     * @param int 	$infoWindowZoom GoogleMap information window zoom.
+     *
+     * @return MapAPI This same object, in order to enable chaining of methods
+     */
+
+    public function setInfoWindowZoom($infoWindowZoom) {
+        $this->infoWindowZoom = $infoWindowZoom;
+        return $this;
+    }
+
+    /**
+     * Enable the zoom on the marker when you click on it
+     *
+     * @param boolean $enableWindowZoom info window enabled zoom.
+     *
+     * @return MapAPI This same object, in order to enable chaining of methods
+     */
+
+    public function setEnableWindowZoom($enableWindowZoom) {
+        $this->enableWindowZoom = $enableWindowZoom;
+        return $this;
+    }
+
+    /**
+     * Enable theautomatic center/zoom at the gmap load
+     *
+     * @param boolean $enableAutomaticCenterZoom enable automatic centre zoom
+     *
+     * @return MapAPI This same object, in order to enable chaining of methods
+     */
+
+    public function setEnableAutomaticCenterZoom($enableAutomaticCenterZoom) {
+        $this->enableAutomaticCenterZoom = $enableAutomaticCenterZoom;
+        return $this;
+    }
+
+    /**
+     * Set the center of the gmap (an address)
+     *
+     * @param string  $center GoogleMap  center (an address)
+     *
+     * @return MapAPI This same object, in order to enable chaining of methods
+     */
+
+    public function setCenter($center) {
+        $this->center = $center;
+        return $this;
+    }
+
+    /**
+     * Set the type of the gmap.  Also takes into account legacy settings
+     *
+     * FIXME - allow other valid settings in config for map type
+     *
+     * @param string  $mapType  Can be one of road,satellite,hybrid or terrain. Defaults to road
+     *
+     * @return MapAPI This same object, in order to enable chaining of methods
+     */
+
+    public function setMapType($mapType) {
+        $this->mapType = $mapType;
+
+        // deal with legacy values for backwards compatbility
+        switch ($mapType) {
+            case 'google.maps.MapTypeId.SATELLITE':
+                $this->mapType = "satellite";
+                break;
+            case 'google.maps.MapTypeId.G_HYBRID_MAP':
+                $this->mapType = "hybrid";
+                break;
+            case 'google.maps.MapTypeId.G_PHYSICAL_MAP':
+                $this->mapType = "terrain";
+                break;
+            case 'google.maps.MapTypeId.ROADMAP':
+                $this->mapType = "road";
+                break;
+        }
+        return $this;
+    }
+
+    /*
 	Set whether or not to allow the full screen tools
 	@return MapAPI This same object, in order to enable chaining of methods
 	*/
-	public function setAllowFullScreen($allowed) {
-		$this->allowFullScreen = $allowed;
-		return $this;
-	}
-
-	/**
-	* Set the center of the gmap
-	*
-	* @return MapAPI This same object, in order to enable chaining of methods
-	**/
-	public function setLatLongCenter($center) {
-		// error check, we want an associative array with lat,lng keys numeric
-
-		if (!is_array($center)) {
-			throw new InvalidArgumentException('Center must be an associative array containing lat,lng');
-		}
-
-		$keys = array_keys($center);
-		sort($keys);
-		if (implode(',', $keys) != 'lat,lng') {
-			throw new InvalidArgumentException('Keys provided must be lat, lng');
-		}
-
-		$this->latLongCenter = $center;
-		return $this;
-	}
-
-	/**
-	 * Set the defaultHideMarker
-	 *
-	 * @param boolean $defaultHideMarker hide all the markers on the map by default
-	 *
-	 * @return MapAPI
-	 */
-
-	public function setDefaultHideMarker($defaultHideMarker) {
-		$this->defaultHideMarker = $defaultHideMarker;
-		return $this;
-	}
-
-	/**
-	 * Get the google map content
-	 *
-	 * @return string the google map html code
-	 */
-
-	public function getGoogleMap() {
-		return $this->content;
-	}
-
-
-	/**
-	 * Get URL content using cURL.
-	 *
-	 * @param string  $url the url
-	 *
-	 * @return string the html code
-	 *
-	 * @todo add proxy settings
-	 */
-
-	public function getContent($url) {
-		$curl = curl_init();
-		curl_setopt($curl, CURLOPT_TIMEOUT, 10);
-		curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 5);
-		curl_setopt($curl, CURLOPT_RETURNTRANSFER, TRUE);
-		curl_setopt($curl, CURLOPT_URL, $url);
-		$data = curl_exec($curl);
-		curl_close($curl);
-		return $data;
-	}
-
-	/**
-	 * Geocoding an address (address -> lat,lng)
-	 *
-	 * @param string  $address an address
-	 *
-	 * @return string array with precision, lat & lng
-	 */
-
-	public function geocoding($address) {
-		$geocoder = new MappableGoogleGeocoder();
-		$locations = $geocoder->getLocations($address);
-		$result = null;
-		if (!empty($locations)) {
-			$place = $locations[0];
-			$location = $place['geometry']['location'];
-			$result = array(
-				'lat' => $location['lat'],
-				'lon' => $location['lng'],
-				'geocoded' => true
-			);
-
-		} else {
-			$result = array(); // no results
-		}
-		return $result;
-	}
-
-	/**
-	 * Add marker by his coord
-	 *
-	 * @param string  $lat      lat
-	 * @param string  $lng      lngs
-	 * @param string  $html     html code display in the info window
-	 * @param string  $category marker category
-	 * @param string  $icon     an icon url
-	 *
-	 * @return MapAPI
-	 */
-
-	public function addMarkerByCoords($lat, $lng, $html = '', $category = '', $icon = '') {
-		$m = array(
-			'latitude' => $lat,
-			'longitude' => $lng,
-			'html' => $html,
-			'category' => $category,
-			'icon' => $icon
-		);
-		array_push($this->markers, $m);
-		return $this;
-	}
-
-
-	/**
-	 * Add marker by his address
-	 *
-	 * @param string  $address  an ddress
-	 * @param string  $content  html code display in the info window
-	 * @param string  $category marker category
-	 * @param string  $icon     an icon url
-	 *
-	 * @return MapAPI
-	 */
-
-	public function addMarkerByAddress($address, $content = '', $category = '', $icon = '') {
-		$point = $this->geocoding($address);
-		if ($point !== null) {
-			$this->addMarkerByCoords($point['lat'], $point['lon'], $content, $category, $icon);
-		}
-		return $this;
-	}
-
-	/**
-	 * Add marker by an array of coord
-	 *
-	 * @param array  $coordtab an array of lat,lng,content
-	 * @param string  $category marker category
-	 * @param string  $icon     an icon url
-	 *
-	 * @return MapAPI
-	 */
-
-	public function addArrayMarkerByCoords($coordtab, $category = '', $icon = '') {
-		foreach ($coordtab as $coord) {
-			$this->addMarkerByCoords($coord[0], $coord[1], $coord[2], $category, $icon);
-		}
-		return $this;
-	}
-
-
-	/**
-	 * Adds a {@link ViewableData} object that implements {@link Mappable}
-	 * to the map.
-	 * @param   $infowindowtemplateparams Optional array of extra parameters to pass to the map info window
-	 *
-	 * @param ViewableData $obj
-	 */
-	public function addMarkerAsObject(ViewableData $obj, $infowindowtemplateparams = null) {
-		$extensionsImplementMappable = false;
-		$extensions = Object::get_extensions(get_class($obj));
-		if (is_array($extensions)) {
-
-			foreach ($extensions as $extension) {
-				$class = new ReflectionClass($extension);
-				if ($class->implementsInterface('Mappable')) {
-					$extensionsImplementMappable = true;
-				}
-
-			}
-		}
-
-		if ($extensionsImplementMappable ||
-			($obj instanceof Mappable) ||
-			(Object::has_extension($obj->ClassName, 'MapExtension'))
-		) {
-			$cat = $obj->hasMethod('getMappableMapCategory') ? $obj->getMappableMapCategory() : "default";
-			if ($infowindowtemplateparams !== null) {
-				foreach ($infowindowtemplateparams as $key => $value) {
-					$obj->{$key} = $value;
-				}
-			}
-			$this->addMarkerByCoords(
-				$obj->getMappableLatitude(),
-				$obj->getMappableLongitude(),
-				$obj->getMappableMapContent(),
-				$cat,
-				$obj->getMappableMapPin()
-			);
-		}
-
-		return $this;
-	}
-
-
-	/**
-	 * Draws a line between two {@link ViewableData} objects
-	 *
-	 * @param ViewableData $one   The first point
-	 * @param ViewableData $two   The second point
-	 * @param string  $color The hexidecimal color of the line
-	 */
-	public function connectPoints(ViewableData $one, ViewableData $two, $color = "#FF3300") {
-		$this->addLine(
-			array($one->getMappableLatitude(), $one->getMappableLongitude()),
-			array($two->getMappableLatitude(), $two->getMappableLongitude()),
-			$color
-		);
-	}
-
-	public function forTemplate() {
-		$this->generate();
-		MapUtil::set_map_already_rendered(true);
-		return $this->getGoogleMap();
-	}
-
-	/**
-	 * Add a KML file which will be rendered on this map.  Normally used for likes
-	 * of GPS traces from activities
-	 *
-	 * @param string  $url      url of the kml file compatible with gmap and gearth
-	 *
-	 * @return MapAPI
-	 */
-
-	public function addKML($url) {
-		array_push($this->kmlFiles, $url);
-		return $this;
-	}
-
-
-	/*
+    public function setAllowFullScreen($allowed) {
+        $this->allowFullScreen = $allowed;
+        return $this;
+    }
+
+    /**
+     * Set the center of the gmap
+     *
+     * @return MapAPI This same object, in order to enable chaining of methods
+     **/
+    public function setLatLongCenter($center) {
+        // error check, we want an associative array with lat,lng keys numeric
+
+        if (!is_array($center)) {
+            throw new InvalidArgumentException('Center must be an associative array containing lat,lng');
+        }
+
+        $keys = array_keys($center);
+        sort($keys);
+        if (implode(',', $keys) != 'lat,lng') {
+            throw new InvalidArgumentException('Keys provided must be lat, lng');
+        }
+
+        $this->latLongCenter = $center;
+        return $this;
+    }
+
+    /**
+     * Set the defaultHideMarker
+     *
+     * @param boolean $defaultHideMarker hide all the markers on the map by default
+     *
+     * @return MapAPI
+     */
+
+    public function setDefaultHideMarker($defaultHideMarker) {
+        $this->defaultHideMarker = $defaultHideMarker;
+        return $this;
+    }
+
+    /**
+     * Get the google map content
+     *
+     * @return string the google map html code
+     */
+
+    public function getGoogleMap() {
+        return $this->content;
+    }
+
+
+    /**
+     * Get URL content using cURL.
+     *
+     * @param string  $url the url
+     *
+     * @return string the html code
+     *
+     * @todo add proxy settings
+     */
+
+    public function getContent($url) {
+        $curl = curl_init();
+        curl_setopt($curl, CURLOPT_TIMEOUT, 10);
+        curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 5);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, TRUE);
+        curl_setopt($curl, CURLOPT_URL, $url);
+        $data = curl_exec($curl);
+        curl_close($curl);
+        return $data;
+    }
+
+    /**
+     * Geocoding an address (address -> lat,lng)
+     *
+     * @param string  $address an address
+     *
+     * @return string array with precision, lat & lng
+     */
+
+    public function geocoding($address) {
+        $geocoder = new MappableGoogleGeocoder();
+        $locations = $geocoder->getLocations($address);
+        $result = null;
+        if (!empty($locations)) {
+            $place = $locations[0];
+            $location = $place['geometry']['location'];
+            $result = array(
+                'lat' => $location['lat'],
+                'lon' => $location['lng'],
+                'geocoded' => true
+            );
+
+        } else {
+            $result = array(); // no results
+        }
+        return $result;
+    }
+
+    /**
+     * Add marker by his coord
+     *
+     * @param string  $lat      lat
+     * @param string  $lng      lngs
+     * @param string  $html     html code display in the info window
+     * @param string  $category marker category
+     * @param string  $icon     an icon url
+     *
+     * @return MapAPI
+     */
+
+    public function addMarkerByCoords($lat, $lng, $html = '', $category = '', $icon = '') {
+        $m = array(
+            'latitude' => $lat,
+            'longitude' => $lng,
+            'html' => $html,
+            'category' => $category,
+            'icon' => $icon
+        );
+        array_push($this->markers, $m);
+        return $this;
+    }
+
+
+    /**
+     * Add marker by his address
+     *
+     * @param string  $address  an ddress
+     * @param string  $content  html code display in the info window
+     * @param string  $category marker category
+     * @param string  $icon     an icon url
+     *
+     * @return MapAPI
+     */
+
+    public function addMarkerByAddress($address, $content = '', $category = '', $icon = '') {
+        $point = $this->geocoding($address);
+        if ($point !== null) {
+            $this->addMarkerByCoords($point['lat'], $point['lon'], $content, $category, $icon);
+        }
+        return $this;
+    }
+
+    /**
+     * Add marker by an array of coord
+     *
+     * @param array  $coordtab an array of lat,lng,content
+     * @param string  $category marker category
+     * @param string  $icon     an icon url
+     *
+     * @return MapAPI
+     */
+
+    public function addArrayMarkerByCoords($coordtab, $category = '', $icon = '') {
+        foreach ($coordtab as $coord) {
+            $this->addMarkerByCoords($coord[0], $coord[1], $coord[2], $category, $icon);
+        }
+        return $this;
+    }
+
+
+    /**
+     * Adds a {@link ViewableData} object that implements {@link Mappable}
+     * to the map.
+     * @param   $infowindowtemplateparams Optional array of extra parameters to pass to the map info window
+     *
+     * @param ViewableData $obj
+     */
+    public function addMarkerAsObject(ViewableData $obj, $infowindowtemplateparams = null) {
+        $extensionsImplementMappable = false;
+        $extensions = Object::get_extensions(get_class($obj));
+        if (is_array($extensions)) {
+
+            foreach ($extensions as $extension) {
+                $class = new ReflectionClass($extension);
+                if ($class->implementsInterface('Mappable')) {
+                    $extensionsImplementMappable = true;
+                }
+
+            }
+        }
+
+        if ($extensionsImplementMappable ||
+            ($obj instanceof Mappable) ||
+            (Object::has_extension($obj->ClassName, 'MapExtension'))
+        ) {
+            $cat = $obj->hasMethod('getMappableMapCategory') ? $obj->getMappableMapCategory() : "default";
+            if ($infowindowtemplateparams !== null) {
+                foreach ($infowindowtemplateparams as $key => $value) {
+                    $obj->{$key} = $value;
+                }
+            }
+            $this->addMarkerByCoords(
+                $obj->getMappableLatitude(),
+                $obj->getMappableLongitude(),
+                $obj->getMappableMapContent(),
+                $cat,
+                $obj->getMappableMapPin()
+            );
+        }
+
+        return $this;
+    }
+
+
+    /**
+     * Draws a line between two {@link ViewableData} objects
+     *
+     * @param ViewableData $one   The first point
+     * @param ViewableData $two   The second point
+     * @param string  $color The hexidecimal color of the line
+     */
+    public function connectPoints(ViewableData $one, ViewableData $two, $color = "#FF3300") {
+        $this->addLine(
+            array($one->getMappableLatitude(), $one->getMappableLongitude()),
+            array($two->getMappableLatitude(), $two->getMappableLongitude()),
+            $color
+        );
+    }
+
+    public function forTemplate() {
+        $this->generate();
+        MapUtil::set_map_already_rendered(true);
+        return $this->getGoogleMap();
+    }
+
+    /**
+     * Add a KML file which will be rendered on this map.  Normally used for likes
+     * of GPS traces from activities
+     *
+     * @param string  $url      url of the kml file compatible with gmap and gearth
+     *
+     * @return MapAPI
+     */
+
+    public function addKML($url) {
+        array_push($this->kmlFiles, $url);
+        return $this;
+    }
+
+
+    /*
 	Add a line to the map
 
 	*/
-	public function addLine($from = array(), $to = array(), $color = "#FF3300") {
-		$line = array(
-			'lat1' => $from[0],
-			'lon1' => $from[1],
-			'lat2' => $to[0],
-			'lon2' => $to[1],
-			'color' => $color
-		);
+    public function addLine($from = array(), $to = array(), $color = "#FF3300") {
+        $line = array(
+            'lat1' => $from[0],
+            'lon1' => $from[1],
+            'lat2' => $to[0],
+            'lon2' => $to[1],
+            'color' => $color
+        );
 
-		array_push($this->lines, $line);
-		return $this;
-	}
+        array_push($this->lines, $line);
+        return $this;
+    }
 
 
-	/*
+    /*
 	For php 5.3
 	*/
-	public static function jsonRemoveUnicodeSequences($struct) {
-		 return preg_replace("/\\\\u([a-f0-9]{4})/e",
-		 					"iconv('UCS-4LE','UTF-8',pack('V', hexdec('U$1')))",
-		 					json_encode($struct));
-	}
-
-
-	/**
-	 * Generate the gmap
-	 *
-	 * @return void
-	 */
-
-	public function generate() {
-		// from http://stackoverflow.com/questions/3586401/cant-decode-json-string-in-php
-		$jsonMarkers = null;
-		$linesJson = null;
-		$kmlJson = null;
-
-		// prior to PHP version 5.4, one needs to use regex
-		if (PHP_VERSION_ID < 50400) {
-			$jsonMarkers = stripslashes(MapAPI::jsonRemoveUnicodeSequences($this->markers));
-			$linesJson = stripslashes(MapAPI::jsonRemoveUnicodeSequences($this->lines));
-			$kmlJson = stripslashes(MapAPI::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));
-		}
-
-		 // Center of the GMap - text centre takes precedence
-		$geocodeCentre = ($this->latLongCenter) ?
-							$this->latLongCenter : $this->geocoding($this->center);
-
-		$latlngCentre = null;
-		// coordinates for centre depending on which method used
-		if (isset($geocodeCentre['geocoded'])) {
-			$latlngCentre = array(
-				'lat' => $geocodeCentre['lat'],
-				'lng' => $geocodeCentre['lon']
-			);
-		} else if (is_array($this->latLongCenter)) {
-			$latlngCentre = $this->latLongCenter;
-		}
-
-		$this->LatLngCentreJSON = stripslashes(json_encode($latlngCentre));
-
-		$lenLng = $this->maxLng - $this->minLng;
-		$lenLat = $this->maxLat - $this->minLat;
-		$this->minLng -= $lenLng * $this->coordCoef;
-		$this->maxLng += $lenLng * $this->coordCoef;
-		$this->minLat -= $lenLat * $this->coordCoef;
-		$this->maxLat += $lenLat * $this->coordCoef;
-
-		// add the css class mappable as a handle onto the map styling
-		$this->additional_css_classes .= ' mappable';
-
-		if (!$this->enableAutomaticCenterZoom) {
-			$this->enableAutomaticCenterZoom = 'false';
-		}
-
-		if (!$this->useClusterer) {
-			$this->useClusterer = 'false';
-		}
-
-		if (!$this->defaultHideMarker) {
-			$this->defaultHideMarker = 'false';
-		}
-
-		// initialise full screen as the config value if not already set
-		if ($this->allowFullScreen === null) {
-			$this->allowFullScreen = Config::inst()->get('Mappable', 'allow_full_screen');
-		}
-
-		if (!$this->allowFullScreen) {
-			$this->allowFullScreen = 'false';
-		}
-
-		if (!$this->enableWindowZoom) {
-			$this->enableWindowZoom = 'false';
-		}
-
-		$vars = new ArrayData(array(
-
-				'JsonMapStyles' => $this->jsonMapStyles,
-				'AdditionalCssClasses' => $this->additional_css_classes,
-				'Width' => $this->width,
-				'Height' => $this->height,
-				'ShowInlineMapDivStyle' => $this->show_inline_map_div_style,
-				'InfoWindowZoom' => $this->infoWindowZoom,
-				'EnableWindowZoom' => $this->enableWindowZoom,
-				'MapMarkers' => $jsonMarkers,
-				'DefaultHideMarker' => $this->defaultHideMarker,
-				'LatLngCentre' => $this->LatLngCentreJSON,
-				'EnableAutomaticCenterZoom' => $this->enableAutomaticCenterZoom,
-				'Zoom' => $this->zoom,
-				'MaxZoom' => $this->maxZoom,
-				'GridSize' => $this->gridSize,
-				'MapType' => $this->mapType,
-				'GoogleMapID' => $this->googleMapId,
-				'Lang'=>$this->lang,
-				'UseClusterer'=>$this->useClusterer,
-				'ClustererLibraryPath' => $this->clustererLibraryPath,
-				'ClustererMaxZoom' => $this->maxZoom,
-				'ClustererGridSize' => $this->gridSize,
-				'Lines' => $linesJson,
-				'KmlFiles' => $kmlJson,
-				'AllowFullScreen' => $this->allowFullScreen,
-				'UseCompressedAssets' => Config::inst()->get('Mappable', 'use_compressed_assets')
-			)
-		);
-
-		if (!MapUtil::get_map_already_rendered()) {
-			$vars->setField('GoogleMapKey', $this->googleMapKey);
-			$vars->setField('GoogleMapLang', $this->lang);
-		}
-
-		// HTML component of the map
-		$this->content = $this->processTemplateHTML('Map', $vars);
-	}
-
-	/**
-	 * @param string $templateName
-	 * @param ArrayData $templateVariables
-	 */
-	public function processTemplateHTML($templateName, $templateVariables = null) {
-		if (!$templateVariables) {
-			$templateVariables = new ArrayList();
-		}
-		$mappingService = Config::inst()->get('Mappable', 'mapping_service');
-		$result = $templateVariables->renderWith($templateName.$mappingService.'HTML');
-		return $result;
-	}
+    public static function jsonRemoveUnicodeSequences($struct) {
+            return preg_replace("/\\\\u([a-f0-9]{4})/e",
+                                "iconv('UCS-4LE','UTF-8',pack('V', hexdec('U$1')))",
+                                json_encode($struct));
+    }
+
+
+    /**
+     * Generate the gmap
+     *
+     * @return void
+     */
+
+    public function generate() {
+        // from http://stackoverflow.com/questions/3586401/cant-decode-json-string-in-php
+        $jsonMarkers = null;
+        $linesJson = null;
+        $kmlJson = null;
+
+        // prior to PHP version 5.4, one needs to use regex
+        if (PHP_VERSION_ID < 50400) {
+            $jsonMarkers = stripslashes(MapAPI::jsonRemoveUnicodeSequences($this->markers));
+            $linesJson = stripslashes(MapAPI::jsonRemoveUnicodeSequences($this->lines));
+            $kmlJson = stripslashes(MapAPI::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));
+        }
+
+            // Center of the GMap - text centre takes precedence
+        $geocodeCentre = ($this->latLongCenter) ?
+                            $this->latLongCenter : $this->geocoding($this->center);
+
+        $latlngCentre = null;
+        // coordinates for centre depending on which method used
+        if (isset($geocodeCentre['geocoded'])) {
+            $latlngCentre = array(
+                'lat' => $geocodeCentre['lat'],
+                'lng' => $geocodeCentre['lon']
+            );
+        } else if (is_array($this->latLongCenter)) {
+            $latlngCentre = $this->latLongCenter;
+        }
+
+        $this->LatLngCentreJSON = stripslashes(json_encode($latlngCentre));
+
+        $lenLng = $this->maxLng - $this->minLng;
+        $lenLat = $this->maxLat - $this->minLat;
+        $this->minLng -= $lenLng * $this->coordCoef;
+        $this->maxLng += $lenLng * $this->coordCoef;
+        $this->minLat -= $lenLat * $this->coordCoef;
+        $this->maxLat += $lenLat * $this->coordCoef;
+
+        // add the css class mappable as a handle onto the map styling
+        $this->additional_css_classes .= ' mappable';
+
+        if (!$this->enableAutomaticCenterZoom) {
+            $this->enableAutomaticCenterZoom = 'false';
+        }
+
+        if (!$this->useClusterer) {
+            $this->useClusterer = 'false';
+        }
+
+        if (!$this->defaultHideMarker) {
+            $this->defaultHideMarker = 'false';
+        }
+
+        // initialise full screen as the config value if not already set
+        if ($this->allowFullScreen === null) {
+            $this->allowFullScreen = Config::inst()->get('Mappable', 'allow_full_screen');
+        }
+
+        if (!$this->allowFullScreen) {
+            $this->allowFullScreen = 'false';
+        }
+
+        if (!$this->enableWindowZoom) {
+            $this->enableWindowZoom = 'false';
+        }
+
+        $vars = new ArrayData(array(
+
+                'JsonMapStyles' => $this->jsonMapStyles,
+                'AdditionalCssClasses' => $this->additional_css_classes,
+                'Width' => $this->width,
+                'Height' => $this->height,
+                'ShowInlineMapDivStyle' => $this->show_inline_map_div_style,
+                'InfoWindowZoom' => $this->infoWindowZoom,
+                'EnableWindowZoom' => $this->enableWindowZoom,
+                'MapMarkers' => $jsonMarkers,
+                'DefaultHideMarker' => $this->defaultHideMarker,
+                'LatLngCentre' => $this->LatLngCentreJSON,
+                'EnableAutomaticCenterZoom' => $this->enableAutomaticCenterZoom,
+                'Zoom' => $this->zoom,
+                'MaxZoom' => $this->maxZoom,
+                'GridSize' => $this->gridSize,
+                'MapType' => $this->mapType,
+                'GoogleMapID' => $this->googleMapId,
+                'Lang'=>$this->lang,
+                'UseClusterer'=>$this->useClusterer,
+                'ClustererLibraryPath' => $this->clustererLibraryPath,
+                'ClustererMaxZoom' => $this->maxZoom,
+                'ClustererGridSize' => $this->gridSize,
+                'Lines' => $linesJson,
+                'KmlFiles' => $kmlJson,
+                'AllowFullScreen' => $this->allowFullScreen,
+                'UseCompressedAssets' => Config::inst()->get('Mappable', 'use_compressed_assets')
+            )
+        );
+
+        if (!MapUtil::get_map_already_rendered()) {
+            $vars->setField('GoogleMapKey', $this->googleMapKey);
+            $vars->setField('GoogleMapLang', $this->lang);
+        }
+
+        // HTML component of the map
+        $this->content = $this->processTemplateHTML('Map', $vars);
+    }
+
+    /**
+     * @param string $templateName
+     * @param ArrayData $templateVariables
+     */
+    public function processTemplateHTML($templateName, $templateVariables = null) {
+        if (!$templateVariables) {
+            $templateVariables = new ArrayList();
+        }
+        $mappingService = Config::inst()->get('Mappable', 'mapping_service');
+        $result = $templateVariables->renderWith($templateName.$mappingService.'HTML');
+        return $result;
+    }
 }

code/MapMarkerSetsExtension.php

Indentation +26 added lines, -26 removed lines

@@ -2,31 +2,31 @@
 
 class MapMarkerSetsExtension extends DataExtension {
 
-	static $many_many = array(
-		'MapMarkerSets' => 'MapMarkerSet'
-	);
-
-
-	static $belongs_many_many_extraFields = array(
-		'MapMarkerSets' => array(
-			'SortOrder' => "Int"
-		)
-	);
-
-
-	public function updateCMSFields(FieldList $fields) {
-		$gridConfig2 = GridFieldConfig_RelationEditor::create();
-		$gridConfig2->getComponentByType(
-			'GridFieldAddExistingAutocompleter')->setSearchFields(array('Title')
-		);
-		$gridConfig2->getComponentByType('GridFieldPaginator')->setItemsPerPage(100);
-
-		$gridField2 = new GridField("MapMarkerSets",
-			"MapMarker Sets",
-			$this->owner->MapMarkerSets(),
-			$gridConfig2
-		);
-		$fields->addFieldToTab("Root.MapMarkerSets", $gridField2);
-	}
+    static $many_many = array(
+        'MapMarkerSets' => 'MapMarkerSet'
+    );
+
+
+    static $belongs_many_many_extraFields = array(
+        'MapMarkerSets' => array(
+            'SortOrder' => "Int"
+        )
+    );
+
+
+    public function updateCMSFields(FieldList $fields) {
+        $gridConfig2 = GridFieldConfig_RelationEditor::create();
+        $gridConfig2->getComponentByType(
+            'GridFieldAddExistingAutocompleter')->setSearchFields(array('Title')
+        );
+        $gridConfig2->getComponentByType('GridFieldPaginator')->setItemsPerPage(100);
+
+        $gridField2 = new GridField("MapMarkerSets",
+            "MapMarker Sets",
+            $this->owner->MapMarkerSets(),
+            $gridConfig2
+        );
+        $fields->addFieldToTab("Root.MapMarkerSets", $gridField2);
+    }
 
 }

code/MapLayer.php

Indentation +6 added lines, -6 removed lines

@@ -2,13 +2,13 @@
 
 class MapLayer extends DataObject {
 
-	static $db = array(
-		'Title' => 'Varchar(255)'
-	);
+    static $db = array(
+        'Title' => 'Varchar(255)'
+    );
 
 
-	static $has_one = array(
-		'KmlFile' => 'File'
-	);
+    static $has_one = array(
+        'KmlFile' => 'File'
+    );
 
 }

code/MapLayerExtension.php

Indentation +22 added lines, -22 removed lines

@@ -2,28 +2,28 @@
 
 class MapLayerExtension extends DataExtension {
 
-	static $many_many = array(
-			'MapLayers' => 'MapLayer'
-	);
+    static $many_many = array(
+            'MapLayers' => 'MapLayer'
+    );
 
-	static $belongs_many_many_extraFields = array(
-		'MapLayers' => array(
-			'SortOrder' => "Int"
-		)
-	);
+    static $belongs_many_many_extraFields = array(
+        'MapLayers' => array(
+            'SortOrder' => "Int"
+        )
+    );
 
-	public function updateCMSFields(FieldList $fields) {
-		$gridConfig2 = GridFieldConfig_RelationEditor::create();
-		$gridConfig2->getComponentByType(
-			'GridFieldAddExistingAutocompleter')->
-			setSearchFields(array('Title')
-		);
-		$gridConfig2->getComponentByType('GridFieldPaginator')->setItemsPerPage(100);
-		$gridField2 = new GridField("Map Layers",
-			"Map Layers:",
-			$this->owner->MapLayers(),
-			$gridConfig2
-		);
-		$fields->addFieldToTab("Root.MapLayers", $gridField2);
-	}
+    public function updateCMSFields(FieldList $fields) {
+        $gridConfig2 = GridFieldConfig_RelationEditor::create();
+        $gridConfig2->getComponentByType(
+            'GridFieldAddExistingAutocompleter')->
+            setSearchFields(array('Title')
+        );
+        $gridConfig2->getComponentByType('GridFieldPaginator')->setItemsPerPage(100);
+        $gridField2 = new GridField("Map Layers",
+            "Map Layers:",
+            $this->owner->MapLayers(),
+            $gridConfig2
+        );
+        $fields->addFieldToTab("Root.MapLayers", $gridField2);
+    }
 }

tests/MapFieldTest.php

Indentation +16 added lines, -16 removed lines

@@ -2,22 +2,22 @@
 
 class MapFieldTest extends SapphireTest {
 
-	public function testFieldWithTitle() {
-		//$headingLevel = 2, $allowHTML = false, $form = nul
-		$field = new MapField('NameOfField', 'TitleOfField');
-		$expected = '<div class="editableMap"><div class="middleColumn" id="Nam'
-				  . 'eOfField" style="width:100%;height:300px;margin:5px 0px 5p'
-				  . 'x 5px;position:relative;"></div></div>';
-		$this->assertEquals($expected, $field->Field());
-	}
+    public function testFieldWithTitle() {
+        //$headingLevel = 2, $allowHTML = false, $form = nul
+        $field = new MapField('NameOfField', 'TitleOfField');
+        $expected = '<div class="editableMap"><div class="middleColumn" id="Nam'
+                    . 'eOfField" style="width:100%;height:300px;margin:5px 0px 5p'
+                    . 'x 5px;position:relative;"></div></div>';
+        $this->assertEquals($expected, $field->Field());
+    }
 
-	public function testFieldWithoutTitle() {
-		//$headingLevel = 2, $allowHTML = false, $form = nul
-		$field = new MapField('NameOfField');
-		$expected = '<div class="editableMap"><div class="middleColumn" id="Nam'
-				  . 'eOfField" style="width:100%;height:300px;margin:5px 0px 5p'
-				  . 'x 5px;position:relative;"></div></div>';
-		$this->assertEquals($expected, $field->Field());
-	}
+    public function testFieldWithoutTitle() {
+        //$headingLevel = 2, $allowHTML = false, $form = nul
+        $field = new MapField('NameOfField');
+        $expected = '<div class="editableMap"><div class="middleColumn" id="Nam'
+                    . 'eOfField" style="width:100%;height:300px;margin:5px 0px 5p'
+                    . 'x 5px;position:relative;"></div></div>';
+        $this->assertEquals($expected, $field->Field());
+    }
 
 }

tests/LatLongFieldTest.php

Indentation +122 added lines, -122 removed lines

@@ -1,127 +1,127 @@
 <?php
 
 class LatLongFieldTest extends SapphireTest {
-	public function testConstructValid() {
-		$mapField = new LatLongField(array(
-			new TextField('Lat', 'Latitude'),
-			new TextField('Lon', 'Longitude'),
-			new TextField('ZoomLevel', 'Zoom')
-			),
-			array('Address')
-		);
-
-
-	}
-
-	public function testConstructOneFieldInvalid() {
-		try {
-			$mapField = new LatLongField(
-				array(
-					new TextField('Lat', 'Latitude')
-				)
-			);
-			$this->fail('Creation of lat long field should have failed');
-		} catch (Exception $e) {
-			$expected = 'LatLongField argument 1 must be an array containing at'
-					  . ' least two FormField objects for Lat/Long values, resp'
-					  . 'ectively.';
-			$this->assertEquals($expected, $e->getMessage());
-		}
-	}
-
-
-	public function testConstructTwoFieldsValid() {
-		$mapField = new LatLongField(
-			array(
-				new TextField('Lat', 'Latitude'),
-				new TextField('Lon', 'Longitude')
-			)
-		);
-
-		$html = $mapField->FieldHolder();
-		$this->assertContains(
-			'<label class="fieldholder-small-label" for="Lat">Latitude</label>',
-			$html
-		);
-		$this->assertContains(
-			'<input type="text" name="Lat" class="text hide" id="Lat" />',
-			$html
-		);
-		$this->assertContains(
-			'<label class="fieldholder-small-label" for="Lon">Longitude</label>',
-			$html
-		);
-		$this->assertContains(
-			'<input type="text" name="Lon" class="text hide" id="Lon" />',
-			$html
-		);
-
-	}
-
-
-	public function testConstructThreeFieldsValid() {
-		$mapField = new LatLongField(
-			array(
-				new TextField('Lat', 'Latitude'),
-				new TextField('Lon', 'Longitude'),
-				new TextField('ZoomLevel', 'Zoom')
-			)
-		);
-
-		$html = $mapField->FieldHolder();
-		$this->assertContains(
-			'<label class="fieldholder-small-label" for="Lat">Latitude</label>',
-			$html
-		);
-		$this->assertContains(
-			'<input type="text" name="Lat" class="text hide" id="Lat" />',
-			$html
-		);
-		$this->assertContains(
-			'<label class="fieldholder-small-label" for="Lon">Longitude</label>',
-			$html
-		);
-		$this->assertContains(
-			'<input type="text" name="Lon" class="text hide" id="Lon" />',
-			$html
-		);
-		$this->assertContains(
-			'<label class="fieldholder-small-label" for="ZoomLevel">Zoom</label>',
-			$html
-		);
-		$this->assertContains(
-			'<input type="text" name="ZoomLevel" class="text hide" id="ZoomLevel" />',
-			$html
-		);
-	}
-
-
-	public function testGeocode() {
-		$this->markTestSkipped('TODO');
-	}
-
-
-	public function testSetGuidePoints() {
-		$mapField = new LatLongField(
-			array(
-				new TextField('Lat', 'Latitude'),
-				new TextField('Lon', 'Longitude'),
-				new TextField('ZoomLevel', 'Zoom')
-			)
-		);
-		$guidePoints = array(
-			array('latitude' => 42, 'longitude' => '113.1'),
-			array('latitude' => 14.9, 'longitude' => '113.2'),
-			array('latitude' => 42.3, 'longitude' => '113.4'),
-		);
-		$mapField->setGuidePoints($guidePoints);
-
-		$html = $mapField->FieldHolder();
-		$expected = 'data-GuidePoints="[{&quot;latitude&quot;:42,&quot;longitude&quot;:&quot;113.1&'
-				  . 'quot;},{&quot;latitude&quot;:14.9,&quot;longitude&quot;:&quot;113.2&quot;},{&q'
-				  . 'uot;latitude&quot;:42.3,&quot;longitude&quot;:&quot;113.4&quot;}]"';
-
-		$this->assertContains($expected, $html);
-	}
+    public function testConstructValid() {
+        $mapField = new LatLongField(array(
+            new TextField('Lat', 'Latitude'),
+            new TextField('Lon', 'Longitude'),
+            new TextField('ZoomLevel', 'Zoom')
+            ),
+            array('Address')
+        );
+
+
+    }
+
+    public function testConstructOneFieldInvalid() {
+        try {
+            $mapField = new LatLongField(
+                array(
+                    new TextField('Lat', 'Latitude')
+                )
+            );
+            $this->fail('Creation of lat long field should have failed');
+        } catch (Exception $e) {
+            $expected = 'LatLongField argument 1 must be an array containing at'
+                        . ' least two FormField objects for Lat/Long values, resp'
+                        . 'ectively.';
+            $this->assertEquals($expected, $e->getMessage());
+        }
+    }
+
+
+    public function testConstructTwoFieldsValid() {
+        $mapField = new LatLongField(
+            array(
+                new TextField('Lat', 'Latitude'),
+                new TextField('Lon', 'Longitude')
+            )
+        );
+
+        $html = $mapField->FieldHolder();
+        $this->assertContains(
+            '<label class="fieldholder-small-label" for="Lat">Latitude</label>',
+            $html
+        );
+        $this->assertContains(
+            '<input type="text" name="Lat" class="text hide" id="Lat" />',
+            $html
+        );
+        $this->assertContains(
+            '<label class="fieldholder-small-label" for="Lon">Longitude</label>',
+            $html
+        );
+        $this->assertContains(
+            '<input type="text" name="Lon" class="text hide" id="Lon" />',
+            $html
+        );
+
+    }
+
+
+    public function testConstructThreeFieldsValid() {
+        $mapField = new LatLongField(
+            array(
+                new TextField('Lat', 'Latitude'),
+                new TextField('Lon', 'Longitude'),
+                new TextField('ZoomLevel', 'Zoom')
+            )
+        );
+
+        $html = $mapField->FieldHolder();
+        $this->assertContains(
+            '<label class="fieldholder-small-label" for="Lat">Latitude</label>',
+            $html
+        );
+        $this->assertContains(
+            '<input type="text" name="Lat" class="text hide" id="Lat" />',
+            $html
+        );
+        $this->assertContains(
+            '<label class="fieldholder-small-label" for="Lon">Longitude</label>',
+            $html
+        );
+        $this->assertContains(
+            '<input type="text" name="Lon" class="text hide" id="Lon" />',
+            $html
+        );
+        $this->assertContains(
+            '<label class="fieldholder-small-label" for="ZoomLevel">Zoom</label>',
+            $html
+        );
+        $this->assertContains(
+            '<input type="text" name="ZoomLevel" class="text hide" id="ZoomLevel" />',
+            $html
+        );
+    }
+
+
+    public function testGeocode() {
+        $this->markTestSkipped('TODO');
+    }
+
+
+    public function testSetGuidePoints() {
+        $mapField = new LatLongField(
+            array(
+                new TextField('Lat', 'Latitude'),
+                new TextField('Lon', 'Longitude'),
+                new TextField('ZoomLevel', 'Zoom')
+            )
+        );
+        $guidePoints = array(
+            array('latitude' => 42, 'longitude' => '113.1'),
+            array('latitude' => 14.9, 'longitude' => '113.2'),
+            array('latitude' => 42.3, 'longitude' => '113.4'),
+        );
+        $mapField->setGuidePoints($guidePoints);
+
+        $html = $mapField->FieldHolder();
+        $expected = 'data-GuidePoints="[{&quot;latitude&quot;:42,&quot;longitude&quot;:&quot;113.1&'
+                    . 'quot;},{&quot;latitude&quot;:14.9,&quot;longitude&quot;:&quot;113.2&quot;},{&q'
+                    . 'uot;latitude&quot;:42.3,&quot;longitude&quot;:&quot;113.4&quot;}]"';
+
+        $this->assertContains($expected, $html);
+    }
 
 }

tests/MapLayerExtensionTest.php

Indentation +19 added lines, -19 removed lines

@@ -2,25 +2,25 @@
 
 class MapLayerExtensionTest extends SapphireTest {
 
-	public function setUp() {
-		// add MapExtension and MapLayerExtension extension to Member
-		Member::add_extension('MapExtension');
-		Member::add_extension('MapLayerExtension');
-		parent::setUp();
-	}
+    public function setUp() {
+        // add MapExtension and MapLayerExtension extension to Member
+        Member::add_extension('MapExtension');
+        Member::add_extension('MapLayerExtension');
+        parent::setUp();
+    }
 
-	// check for addition of extra CMS fields
-	public function testCMSFields() {
-		$instance = new Member();
-		$fields = $instance->getCMSFields();
-		$tab = $fields->findOrMakeTab('Root.MapLayers');
-		$fields = $tab->FieldList();
-		$names = array();
-		foreach ($fields as $field) {
-			$names[] = $field->getName();
-		}
-		$expected = array('Map Layers');
-		$this->assertEquals($expected, $names);
-	}
+    // check for addition of extra CMS fields
+    public function testCMSFields() {
+        $instance = new Member();
+        $fields = $instance->getCMSFields();
+        $tab = $fields->findOrMakeTab('Root.MapLayers');
+        $fields = $tab->FieldList();
+        $names = array();
+        foreach ($fields as $field) {
+            $names[] = $field->getName();
+        }
+        $expected = array('Map Layers');
+        $this->assertEquals($expected, $names);
+    }
 
 }

tests/GoogleMapShortCodeTest.php

Indentation +39 added lines, -39 removed lines

@@ -5,13 +5,13 @@ 
 */
 class GoogleMapShortCodeTest extends SapphireTest
 {
-	protected static $fixture_file = 'mappable/tests/shortcodes.yml';
+    protected static $fixture_file = 'mappable/tests/shortcodes.yml';
 
-	public function testRoadMap() {
-		GoogleMapShortCodeHandler::resetCounter();
-		$page = $this->objFromFixture('Page', 'RoadMap');
-		$html = ShortcodeParser::get_active()->parse($page->Content);
-		$expected = <<<TEXT
+    public function testRoadMap() {
+        GoogleMapShortCodeHandler::resetCounter();
+        $page = $this->objFromFixture('Page', 'RoadMap');
+        $html = ShortcodeParser::get_active()->parse($page->Content);
+        $expected = <<<TEXT
 Some text
 
 <div class="googlemapcontainer">
@@ -20,15 +20,15 @@ 
 </div>
 
 TEXT;
-		$this->assertEquals($expected, $html);
-	}
+        $this->assertEquals($expected, $html);
+    }
 
 
-	public function testAerialMap() {
-		GoogleMapShortCodeHandler::resetCounter();
-		$page = $this->objFromFixture('Page', 'AerialMap');
-		$html = ShortcodeParser::get_active()->parse($page->Content);
-		$expected = <<<TEXT
+    public function testAerialMap() {
+        GoogleMapShortCodeHandler::resetCounter();
+        $page = $this->objFromFixture('Page', 'AerialMap');
+        $html = ShortcodeParser::get_active()->parse($page->Content);
+        $expected = <<<TEXT
 Some text
 
 <div class="googlemapcontainer">
@@ -37,15 +37,15 @@ 
 </div>
 
 TEXT;
-		$this->assertEquals($expected, $html);
-	}
+        $this->assertEquals($expected, $html);
+    }
 
 
-	public function testHybridMap() {
-		GoogleMapShortCodeHandler::resetCounter();
-		$page = $this->objFromFixture('Page', 'HybridMap');
-		$html = ShortcodeParser::get_active()->parse($page->Content);
-		$expected = <<<TEXT
+    public function testHybridMap() {
+        GoogleMapShortCodeHandler::resetCounter();
+        $page = $this->objFromFixture('Page', 'HybridMap');
+        $html = ShortcodeParser::get_active()->parse($page->Content);
+        $expected = <<<TEXT
 Some text
 
 <div class="googlemapcontainer">
@@ -54,15 +54,15 @@ 
 </div>
 
 TEXT;
-		$this->assertEquals($expected, $html);
-	}
+        $this->assertEquals($expected, $html);
+    }
 
 
-	public function testTerrainmap() {
-		GoogleMapShortCodeHandler::resetCounter();
-		$page = $this->objFromFixture('Page', 'TerrainMap');
-		$html = ShortcodeParser::get_active()->parse($page->Content);
-		$expected = <<<TEXT
+    public function testTerrainmap() {
+        GoogleMapShortCodeHandler::resetCounter();
+        $page = $this->objFromFixture('Page', 'TerrainMap');
+        $html = ShortcodeParser::get_active()->parse($page->Content);
+        $expected = <<<TEXT
 Some text
 
 <div class="googlemapcontainer">
@@ -71,22 +71,22 @@ 
 </div>
 
 TEXT;
-		$this->assertEquals($expected, $html);
-	}
+        $this->assertEquals($expected, $html);
+    }
 
 
-	public function testNoLongitude() {
-		$page = $this->objFromFixture('Page', 'MapWithNoLongitude');
-		$html = ShortcodeParser::get_active()->parse($page->Content);
-		$this->assertEquals('Some text', $html);
-	}
+    public function testNoLongitude() {
+        $page = $this->objFromFixture('Page', 'MapWithNoLongitude');
+        $html = ShortcodeParser::get_active()->parse($page->Content);
+        $this->assertEquals('Some text', $html);
+    }
 
 
-	public function testNoLatitude() {
-		$page = $this->objFromFixture('Page', 'MapWithNoLatitude');
-		$html = ShortcodeParser::get_active()->parse($page->Content);
-		$this->assertEquals('Some text', $html);
-	}
+    public function testNoLatitude() {
+        $page = $this->objFromFixture('Page', 'MapWithNoLatitude');
+        $html = ShortcodeParser::get_active()->parse($page->Content);
+        $this->assertEquals('Some text', $html);
+    }
 
 
 }

tests/MapAPITest.php

Indentation +478 added lines, -478 removed lines

@@ -2,68 +2,68 @@ 
 
 class MapAPITest extends SapphireTest {
 
-	public function setUpOnce() {
-		$this->requiredExtensions = array(
-			'Member' => array('MapExtension')
-		);
-		parent::setupOnce();
-	}
-
-	public function setUp() {
-		MapUtil::reset();
-		parent::setUp();
-	}
-
-	public function testSetClusterer() {
-		$map = $this->getMap();
-		$map->setClusterer(true);
-		$html = $map->forTemplate();
-		$this->assertContains('data-clusterergridsize=50', $html);
-		$this->assertContains('data-clusterermaxzoom=17', $html);
-		$this->assertContains('data-useclusterer=1', $html);
-
-		$map = $this->getMap();
-		$map->setClusterer(true, 60, 14);
-		$html = $map->forTemplate();
-		$this->assertContains('data-clusterergridsize=60', $html);
-		$this->assertContains('data-clusterermaxzoom=14', $html);
-		$this->assertContains('data-useclusterer=1', $html);
-
-		$map = $this->getMap();
-		$map->setClusterer(false);
-		$html = $map->forTemplate();
-		$this->assertContains('data-useclusterer=false', $html);
-		$this->assertContains('data-clusterergridsize=50', $html);
-		$this->assertContains('data-clusterermaxzoom=17', $html);
-	}
-
-	/*
+    public function setUpOnce() {
+        $this->requiredExtensions = array(
+            'Member' => array('MapExtension')
+        );
+        parent::setupOnce();
+    }
+
+    public function setUp() {
+        MapUtil::reset();
+        parent::setUp();
+    }
+
+    public function testSetClusterer() {
+        $map = $this->getMap();
+        $map->setClusterer(true);
+        $html = $map->forTemplate();
+        $this->assertContains('data-clusterergridsize=50', $html);
+        $this->assertContains('data-clusterermaxzoom=17', $html);
+        $this->assertContains('data-useclusterer=1', $html);
+
+        $map = $this->getMap();
+        $map->setClusterer(true, 60, 14);
+        $html = $map->forTemplate();
+        $this->assertContains('data-clusterergridsize=60', $html);
+        $this->assertContains('data-clusterermaxzoom=14', $html);
+        $this->assertContains('data-useclusterer=1', $html);
+
+        $map = $this->getMap();
+        $map->setClusterer(false);
+        $html = $map->forTemplate();
+        $this->assertContains('data-useclusterer=false', $html);
+        $this->assertContains('data-clusterergridsize=50', $html);
+        $this->assertContains('data-clusterermaxzoom=17', $html);
+    }
+
+    /*
 	Toggle as to whether or not to include a style= attribute with width/height
 	 */
-	public function testSetShowInlineMapDivStyle() {
-		$map = $this->getMap();
-		$map->setShowInlineMapDivStyle(true);
-		$html = $map->forTemplate();
-		$expected = 'style="width:100%; height: 400px;"';
-		$this->assertContains($expected, $html);
-
-		$map->setShowInlineMapDivStyle(false);
-		$html = $map->forTemplate();
-		$this->assertNotContains($expected, $html);
-	}
-
-	public function testSetAdditionalCSSClasses() {
-		$map = $this->getMap();
-		$map->setAdditionalCSSClasses('bigMap shadowMap');
-		$html = $map->forTemplate();
-		$expected = 'class="bigMap shadowMap mappable"';
-		$this->assertContains($expected, $html);
-		$map->setAdditionalCSSClasses('bigMap shadowMap');
-	}
-
-
-	public function testSetMapStyle() {
-		$style = <<<STYLE
+    public function testSetShowInlineMapDivStyle() {
+        $map = $this->getMap();
+        $map->setShowInlineMapDivStyle(true);
+        $html = $map->forTemplate();
+        $expected = 'style="width:100%; height: 400px;"';
+        $this->assertContains($expected, $html);
+
+        $map->setShowInlineMapDivStyle(false);
+        $html = $map->forTemplate();
+        $this->assertNotContains($expected, $html);
+    }
+
+    public function testSetAdditionalCSSClasses() {
+        $map = $this->getMap();
+        $map->setAdditionalCSSClasses('bigMap shadowMap');
+        $html = $map->forTemplate();
+        $expected = 'class="bigMap shadowMap mappable"';
+        $this->assertContains($expected, $html);
+        $map->setAdditionalCSSClasses('bigMap shadowMap');
+    }
+
+
+    public function testSetMapStyle() {
+        $style = <<<STYLE
 [{
 	"featureType": "landscape",
 	"stylers": [{
@@ -77,10 +77,10 @@ 
 	}]
 }]
 STYLE;
-		$map = $this->getMap();
-		$map->setMapStyle($style);
-		$html = $map->forTemplate()->getValue();
-		$expected = <<<HTML
+        $map = $this->getMap();
+        $map->setMapStyle($style);
+        $html = $map->forTemplate()->getValue();
+        $expected = <<<HTML
 
 
 <div id="google_map_1" data-google-map-lang="en"  style="width:100%; height: 400px;"
@@ -116,372 +116,372 @@ 
 </div>
 
 HTML;
-		$this->assertEquals($expected, $html);
-		$map->setMapStyle(null);
-	}
-
-	public function testSetDivId() {
-		$map = $this->getMap();
-		$map->setDivId('mymapid');
-		$html = $map->forTemplate();
-		$expected = '<div id="mymapid" data-google-map-lang="en"  style=';
-		$this->assertContains($expected, $html);
-	}
-
-	public function testSetSize() {
-		$map = $this->getMap();
-		$map->setSize('432px', '1234px');
-		$html = $map->forTemplate();
-		$this->assertContains('style="width:432px; height: 1234px;"', $html);
-	}
-
-	public function testSetLang() {
-		Config::inst()->update('Mappable', 'language', 'fr');
-		$map = $this->getMap();
-		$html = $map->forTemplate();
-		$this->assertContains(
-			'<div id="google_map_1" data-google-map-lang="fr" ',
-			$html
-		);
-	}
-
-
-	public function testSetZoom() {
-		$map = $this->getMap();
-		$map->setZoom(4);
-		$html = $map->forTemplate();
-		$this->assertContains('data-zoom=4', $html);
-		$map->setZoom(12);
-		$html = $map->forTemplate();
-		$this->assertContains('data-zoom=12', $html);
-	}
-
-	public function testSetInfoWindowZoom() {
-		$map = $this->getMap();
-		$map->setInfoWindowZoom(4);
-		$html = $map->forTemplate();
-		$this->assertContains('data-infowindowzoom=4', $html);
-		$map->setInfoWindowZoom(12);
-		$html = $map->forTemplate();
-		$this->assertContains('data-infowindowzoom=12', $html);
-
-	}
-
-	public function testSetEnableWindowZoom() {
-		$map = $this->getMap();
-		$map->setEnableWindowZoom(false);
-		$html = $map->forTemplate();
-		$this->assertContains('data-enablewindowzoom=false', $html);
-		$map->setEnableWindowZoom(true);
-		$html = $map->forTemplate();
-		$this->assertContains('data-enablewindowzoom=1', $html);
-	}
-
-	public function testSetEnableAutomaticCenterZoom() {
-		$map = $this->getMap();
-		$map->setEnableAutomaticCenterZoom(true);
-		$html = $map->forTemplate();
-		$this->assertContains('data-enableautocentrezoom=1', $html);
-	}
-
-	public function testSetNoLocation() {
-		$map = $this->getMap();
-		$html = $map->forTemplate();
-		$this->assertContains(
-			'data-centre=\'{"lat":48.856614,"lng":2.3522219}\'',
-			$html
-		);
-	}
-
-	/**
-	 * setCentre is mis-named, as the method expects text for a geocoder
-	 */
-	public function testSetCenter() {
-		$map = $this->getMap();
-		$map->setCenter('Klong Tan, Bangkok, Thailand');
-		$html = $map->forTemplate();
-
-		//coordinates of Klong Tan in Bangkok
-		$expected = 'data-centre=\'{"lat":13.7243075,"lng":100.5718086}';
-		$this->assertContains($expected, $html);
-		$map->setCenter('Paris, France');
-	}
-
-
-	public function testSetLatLongCenter() {
-		$map = $this->getMap();
-		$llc = array('lat' => -23.714, 'lng' => 47.419);
-		$map->setLatLongCenter($llc);
-		$html = $map->forTemplate();
-		$expected = "data-centre='{\"lat\":-23.714,\"lng\":47.419}'";
-		$this->assertContains($expected, $html);
-
-		// now test error conditions
-		try {
-			$map->setLatLongCenter('This is not a coordinate');
-			$this->fail('Should not be able to set coordinate as text');
-		} catch (InvalidArgumentException $e) {
-			$message = $e->getMessage();
-			$this->assertEquals(
-				'Center must be an associative array containing lat,lng',
-				$message
-			);
-		}
-
-		try {
-			$badKeys = array('lat' => 47.2, 'wibble' => 76.10);
-			$map->setLatLongCenter($badKeys);
-			$this->fail('Should not be able to set coordinate as text');
-		} catch (InvalidArgumentException $e) {
-			$message = $e->getMessage();
-
-			$this->assertEquals(
-				'Keys provided must be lat, lng',
-				$message
-			);
-		}
-
-
-	}
-
-
-	public function testSetMapType() {
-		$map = $this->getMap();
-
-		$mapTypes = array(
-			'road' => 'road',
-			'satellite' => 'satellite',
-			'hybrid' => 'hybrid',
-			'terrain' => 'terrain',
-			'google.maps.MapTypeId.ROADMAP' => 'road',
-			'google.maps.MapTypeId.SATELLITE' => 'satellite',
-			'google.maps.MapTypeId.G_HYBRID_MAP' => 'hybrid',
-			'google.maps.MapTypeId.G_PHYSICAL_MAP' => 'terrain',
-			'custom_layer' => 'custom_layer'
-		);
-
-		foreach (array_keys($mapTypes) as $mapType) {
-			$map->setMapType($mapType);
-			$expected = "data-maptype='".$mapTypes[$mapType]."'";
-			$html = $map->forTemplate();
-			$this->assertContains($expected, $html);
-		}
-	}
-
-
-	public function testSetAllowFullScreen() {
-		$map = $this->getMap();
-		$map->setAllowFullScreen(false);
-		$html = $map->forTemplate();
-
-		$this->assertContains("data-allowfullscreen='false'", $html);
-
-		$map->setAllowFullScreen(true);
-		$html = $map->forTemplate();
-		$this->assertContains("data-allowfullscreen='1'", $html);
-
-		// deal with the null calse
-		$map->setAllowFullScreen(null);
-		$html = $map->forTemplate();
-		$expected = Config::inst()->get('Mappable', 'allow_full_screen');
-		$this->assertContains("data-allowfullscreen='{$expected}'", $html);
-	}
-
-	public function testMapWithMarkers() {
-		$config = Config::inst();
-
-		$map = $this->getMapMultipleItems();
-		$html = $map->forTemplate();
-		$expected = 'data-mapmarkers=\'[{"latitude":23,"longitude":78,"html":"'
-				  . 'MEMBER: Fred Bloggs","category":"default","icon":false},{"latitude'
-				  . '":-12,"longitude":42.1,"html":"MEMBER: Kane Williamson","category"'
-				  . ':"default","icon":false}]\'';
-		$this->assertContains($expected, $html);
-	}
-
-
-	public function testMapWithMarkersDifferentCategory() {
-		$this->markTestSkipped('TODO');
-	}
-
-
-	public function testSetDefaultHideMarker() {
-		$map = $this->getMapMultipleItems();
-		$map->setDefaultHideMarker(false);
-		$html = $map->forTemplate();
-		$this->assertContains(
-			'data-defaulthidemarker=false',
-			$html
-		);
-
-		$map = $this->getMapMultipleItems();
-		$map->setDefaultHideMarker(true);
-		$html = $map->forTemplate();
-		$this->assertContains(
-			'data-defaulthidemarker=1',
-			$html
-		);
-	}
-
-	public function testGetContent() {
-		$map = $this->getMap();
-		$filepath = 'file://'.Director::baseFolder()
-				  . '/mappable/tests/kml/example.kml';
-		$content = $map->getContent($filepath);
-		$textHash = hash('ripemd160', $content);
-		$fileHash = hash_file('ripemd160', $filepath);
-		$this->assertEquals($fileHash, $textHash);
-	}
-
-	public function testGeocoding() {
-		$map = $this->getMap();
-		$location = $map->geocoding("Nonthaburi, Thailand");
-		$expected = array(
-			'lat' => 13.8621125,
-			'lon' => 100.5143528,
-    		'geocoded' => true
-		);
-		$this->assertEquals($expected, $location);
-	}
-
-	public function testGeocodingNoResultsFound() {
-		$map = $this->getMap();
-		$location = $map->geocoding("aasdfsafsfdsfasdf");
-		$expected = array();
-		$this->assertEquals($expected, $location);
-	}
-
-	public function testAddMarkerByAddress() {
-		//$address, $content = '', $category = '', $icon = ''
-		$map = $this->getMap();
-		$map->addMarkerByAddress(
-			'Koh Kred, Nonthaburi, Thailand',
-			'Small island in the Chao Phraya river',
-			'testing',
-			'http://www.test.com/icon.png'
-		);
-		$html = $map->forTemplate();
-		$expected = 'data-mapmarkers=\'[{"latitude":13.9114455,"longitude":100.4761897,"html":"Small island in the Chao Phraya river","category":"testing","icon":"http://www.test.com/icon.png"}]\'';
-		$this->assertContains($expected, $html);
-	}
-
-
-	public function testAddArrayMarkerByCoords() {
-		$map = $this->getMap();
-
-		$markerArray = array();
-		$marker1 = array(48.2, 27, 'Description marker 1', 'Marker Test', '');
-		$marker2 = array(-12.2, 47, 'Description marker 2', 'Marker Test', '');
-
-		array_push($markerArray, $marker1);
-		array_push($markerArray, $marker2);
-
-		$map->addArrayMarkerByCoords($markerArray);
-		$html = $map->forTemplate();
-		$expected = 'data-mapmarkers=\'[{"latitude":48.2,"longitude":27,"html":"Description marker 1","category":"","icon":""},{"latitude":-12.2,"longitude":47,"html":"Description marker 2","category":"","icon":""}]\'';
-		$this->assertContains($expected, $html);
-	}
-
-	public function testAddMarkerByCoords() {
-		$map = $this->getMap();
-		$map->addMarkerByCoords(
-			13.91,
-			100.47,
-			'Description of marker',
-			'testing',
-			'http://www.test.com/icon.png'
-		);
-		$html = $map->forTemplate();
-		$expected =
-		'data-mapmarkers=\'[{"latitude":13.91,"longitude":100.47,"html":"Description of marker","category":"testing","icon":"http://www.test.com/icon.png"}]';
-
-		$this->assertContains($expected, $html);
-	}
-
-
-	public function testAddMarkerAsObject() {
-		$map = $this->getMap();
-		$member = new Member();
-		$member->FirstName = 'Test';
-		$member->Surname = 'User';
-		$member->Lat = 24.2;
-		$member->Lon = -40;
-		$member->write();
-		$params = array();
-		$map->addMarkerAsObject(
-			$member,
-			$params
-		);
-
-		$html = $map->forTemplate();
-		$expected = 'data-mapmarkers=\'[{"latitude":24.2,"longitude":-40,"html":"MEMBER: Test User","category":"default","icon":false}]\'';
-		$this->assertContains($expected, $html);
-	}
-
-
-	public function testAddMarkerThatIsMappableAsObject() {
-		$map = $this->getMap();
-		$member = new MappableExampleClass();
-		//$member->write();
-		$params = array();
-		$map->addMarkerAsObject(
-			$member,
-			$params
-		);
-
-		$html = $map->forTemplate();
-		$expected = 'data-mapmarkers=\'[{"latitude":13.4,"longitude":100.7,"html":"example content","category":"default","icon":null}]\'';
-		$this->assertContains($expected, $html);
-	}
-
-
-	public function testConnectPoints() {
-		$members = $this->getGeolocatedMembers();
-		$member1 = $members->pop();
-		$member2 = $members->pop();
-		$map = $this->getMap();
-		$map->connectPoints($member1, $member2);
-		$html = $map->forTemplate();
-		$expected = 'data-lines=\'[{"lat1":-12,"lon1":42.1,"lat2":23,"lon2":78,"color":"#FF3300"}]\'';
-		$this->assertContains($expected, $html);
-	}
-
-
-	public function testAddKML() {
-		$map = $this->getMap();
-		$map->addKml('http://www.test.com/route1.kml');
-		$map->addKml('http://www.test.com/route2.kml');
-		$html = $map->forTemplate();
-		$expected = 'data-kmlfiles=\'["http://www.test.com/route1.kml","http://www.test.com/route2.kml"]\'';
-		$this->assertContains($expected, $html);
-	}
-
-
-	public function testAddLine() {
-		$map = $this->getMap();
-		$map->addLine(
-			array(13, 101),
-			array(13.2, 101.4),
-			'#F32'
-		);
-
-		$map->addLine(
-			array(13.2, 101.4),
-			array(14.2, 99.8)
-		);
-
-		$html = $map->forTemplate();
-		$expected = 'data-lines=\'[{"lat1":13,"lon1":101,"lat2":13.2,"lon2":101.4,"color":"#F32"},{"lat1":13.2,"lon1":101.4,"lat2":14.2,"lon2":99.8,"color":"#FF3300"}]\'';
-		$this->assertContains($expected, $html);
-	}
-
-	/**
-	 * This tests out a specific case of passing null for template values
-	 */
-	public function testProcessTemplate() {
-		$map = $this->getMap();
-		$html = $map->processTemplateHTML('Map', null);
-		$expected = <<<HTML
+        $this->assertEquals($expected, $html);
+        $map->setMapStyle(null);
+    }
+
+    public function testSetDivId() {
+        $map = $this->getMap();
+        $map->setDivId('mymapid');
+        $html = $map->forTemplate();
+        $expected = '<div id="mymapid" data-google-map-lang="en"  style=';
+        $this->assertContains($expected, $html);
+    }
+
+    public function testSetSize() {
+        $map = $this->getMap();
+        $map->setSize('432px', '1234px');
+        $html = $map->forTemplate();
+        $this->assertContains('style="width:432px; height: 1234px;"', $html);
+    }
+
+    public function testSetLang() {
+        Config::inst()->update('Mappable', 'language', 'fr');
+        $map = $this->getMap();
+        $html = $map->forTemplate();
+        $this->assertContains(
+            '<div id="google_map_1" data-google-map-lang="fr" ',
+            $html
+        );
+    }
+
+
+    public function testSetZoom() {
+        $map = $this->getMap();
+        $map->setZoom(4);
+        $html = $map->forTemplate();
+        $this->assertContains('data-zoom=4', $html);
+        $map->setZoom(12);
+        $html = $map->forTemplate();
+        $this->assertContains('data-zoom=12', $html);
+    }
+
+    public function testSetInfoWindowZoom() {
+        $map = $this->getMap();
+        $map->setInfoWindowZoom(4);
+        $html = $map->forTemplate();
+        $this->assertContains('data-infowindowzoom=4', $html);
+        $map->setInfoWindowZoom(12);
+        $html = $map->forTemplate();
+        $this->assertContains('data-infowindowzoom=12', $html);
+
+    }
+
+    public function testSetEnableWindowZoom() {
+        $map = $this->getMap();
+        $map->setEnableWindowZoom(false);
+        $html = $map->forTemplate();
+        $this->assertContains('data-enablewindowzoom=false', $html);
+        $map->setEnableWindowZoom(true);
+        $html = $map->forTemplate();
+        $this->assertContains('data-enablewindowzoom=1', $html);
+    }
+
+    public function testSetEnableAutomaticCenterZoom() {
+        $map = $this->getMap();
+        $map->setEnableAutomaticCenterZoom(true);
+        $html = $map->forTemplate();
+        $this->assertContains('data-enableautocentrezoom=1', $html);
+    }
+
+    public function testSetNoLocation() {
+        $map = $this->getMap();
+        $html = $map->forTemplate();
+        $this->assertContains(
+            'data-centre=\'{"lat":48.856614,"lng":2.3522219}\'',
+            $html
+        );
+    }
+
+    /**
+     * setCentre is mis-named, as the method expects text for a geocoder
+     */
+    public function testSetCenter() {
+        $map = $this->getMap();
+        $map->setCenter('Klong Tan, Bangkok, Thailand');
+        $html = $map->forTemplate();
+
+        //coordinates of Klong Tan in Bangkok
+        $expected = 'data-centre=\'{"lat":13.7243075,"lng":100.5718086}';
+        $this->assertContains($expected, $html);
+        $map->setCenter('Paris, France');
+    }
+
+
+    public function testSetLatLongCenter() {
+        $map = $this->getMap();
+        $llc = array('lat' => -23.714, 'lng' => 47.419);
+        $map->setLatLongCenter($llc);
+        $html = $map->forTemplate();
+        $expected = "data-centre='{\"lat\":-23.714,\"lng\":47.419}'";
+        $this->assertContains($expected, $html);
+
+        // now test error conditions
+        try {
+            $map->setLatLongCenter('This is not a coordinate');
+            $this->fail('Should not be able to set coordinate as text');
+        } catch (InvalidArgumentException $e) {
+            $message = $e->getMessage();
+            $this->assertEquals(
+                'Center must be an associative array containing lat,lng',
+                $message
+            );
+        }
+
+        try {
+            $badKeys = array('lat' => 47.2, 'wibble' => 76.10);
+            $map->setLatLongCenter($badKeys);
+            $this->fail('Should not be able to set coordinate as text');
+        } catch (InvalidArgumentException $e) {
+            $message = $e->getMessage();
+
+            $this->assertEquals(
+                'Keys provided must be lat, lng',
+                $message
+            );
+        }
+
+
+    }
+
+
+    public function testSetMapType() {
+        $map = $this->getMap();
+
+        $mapTypes = array(
+            'road' => 'road',
+            'satellite' => 'satellite',
+            'hybrid' => 'hybrid',
+            'terrain' => 'terrain',
+            'google.maps.MapTypeId.ROADMAP' => 'road',
+            'google.maps.MapTypeId.SATELLITE' => 'satellite',
+            'google.maps.MapTypeId.G_HYBRID_MAP' => 'hybrid',
+            'google.maps.MapTypeId.G_PHYSICAL_MAP' => 'terrain',
+            'custom_layer' => 'custom_layer'
+        );
+
+        foreach (array_keys($mapTypes) as $mapType) {
+            $map->setMapType($mapType);
+            $expected = "data-maptype='".$mapTypes[$mapType]."'";
+            $html = $map->forTemplate();
+            $this->assertContains($expected, $html);
+        }
+    }
+
+
+    public function testSetAllowFullScreen() {
+        $map = $this->getMap();
+        $map->setAllowFullScreen(false);
+        $html = $map->forTemplate();
+
+        $this->assertContains("data-allowfullscreen='false'", $html);
+
+        $map->setAllowFullScreen(true);
+        $html = $map->forTemplate();
+        $this->assertContains("data-allowfullscreen='1'", $html);
+
+        // deal with the null calse
+        $map->setAllowFullScreen(null);
+        $html = $map->forTemplate();
+        $expected = Config::inst()->get('Mappable', 'allow_full_screen');
+        $this->assertContains("data-allowfullscreen='{$expected}'", $html);
+    }
+
+    public function testMapWithMarkers() {
+        $config = Config::inst();
+
+        $map = $this->getMapMultipleItems();
+        $html = $map->forTemplate();
+        $expected = 'data-mapmarkers=\'[{"latitude":23,"longitude":78,"html":"'
+                    . 'MEMBER: Fred Bloggs","category":"default","icon":false},{"latitude'
+                    . '":-12,"longitude":42.1,"html":"MEMBER: Kane Williamson","category"'
+                    . ':"default","icon":false}]\'';
+        $this->assertContains($expected, $html);
+    }
+
+
+    public function testMapWithMarkersDifferentCategory() {
+        $this->markTestSkipped('TODO');
+    }
+
+
+    public function testSetDefaultHideMarker() {
+        $map = $this->getMapMultipleItems();
+        $map->setDefaultHideMarker(false);
+        $html = $map->forTemplate();
+        $this->assertContains(
+            'data-defaulthidemarker=false',
+            $html
+        );
+
+        $map = $this->getMapMultipleItems();
+        $map->setDefaultHideMarker(true);
+        $html = $map->forTemplate();
+        $this->assertContains(
+            'data-defaulthidemarker=1',
+            $html
+        );
+    }
+
+    public function testGetContent() {
+        $map = $this->getMap();
+        $filepath = 'file://'.Director::baseFolder()
+                    . '/mappable/tests/kml/example.kml';
+        $content = $map->getContent($filepath);
+        $textHash = hash('ripemd160', $content);
+        $fileHash = hash_file('ripemd160', $filepath);
+        $this->assertEquals($fileHash, $textHash);
+    }
+
+    public function testGeocoding() {
+        $map = $this->getMap();
+        $location = $map->geocoding("Nonthaburi, Thailand");
+        $expected = array(
+            'lat' => 13.8621125,
+            'lon' => 100.5143528,
+            'geocoded' => true
+        );
+        $this->assertEquals($expected, $location);
+    }
+
+    public function testGeocodingNoResultsFound() {
+        $map = $this->getMap();
+        $location = $map->geocoding("aasdfsafsfdsfasdf");
+        $expected = array();
+        $this->assertEquals($expected, $location);
+    }
+
+    public function testAddMarkerByAddress() {
+        //$address, $content = '', $category = '', $icon = ''
+        $map = $this->getMap();
+        $map->addMarkerByAddress(
+            'Koh Kred, Nonthaburi, Thailand',
+            'Small island in the Chao Phraya river',
+            'testing',
+            'http://www.test.com/icon.png'
+        );
+        $html = $map->forTemplate();
+        $expected = 'data-mapmarkers=\'[{"latitude":13.9114455,"longitude":100.4761897,"html":"Small island in the Chao Phraya river","category":"testing","icon":"http://www.test.com/icon.png"}]\'';
+        $this->assertContains($expected, $html);
+    }
+
+
+    public function testAddArrayMarkerByCoords() {
+        $map = $this->getMap();
+
+        $markerArray = array();
+        $marker1 = array(48.2, 27, 'Description marker 1', 'Marker Test', '');
+        $marker2 = array(-12.2, 47, 'Description marker 2', 'Marker Test', '');
+
+        array_push($markerArray, $marker1);
+        array_push($markerArray, $marker2);
+
+        $map->addArrayMarkerByCoords($markerArray);
+        $html = $map->forTemplate();
+        $expected = 'data-mapmarkers=\'[{"latitude":48.2,"longitude":27,"html":"Description marker 1","category":"","icon":""},{"latitude":-12.2,"longitude":47,"html":"Description marker 2","category":"","icon":""}]\'';
+        $this->assertContains($expected, $html);
+    }
+
+    public function testAddMarkerByCoords() {
+        $map = $this->getMap();
+        $map->addMarkerByCoords(
+            13.91,
+            100.47,
+            'Description of marker',
+            'testing',
+            'http://www.test.com/icon.png'
+        );
+        $html = $map->forTemplate();
+        $expected =
+        'data-mapmarkers=\'[{"latitude":13.91,"longitude":100.47,"html":"Description of marker","category":"testing","icon":"http://www.test.com/icon.png"}]';
+
+        $this->assertContains($expected, $html);
+    }
+
+
+    public function testAddMarkerAsObject() {
+        $map = $this->getMap();
+        $member = new Member();
+        $member->FirstName = 'Test';
+        $member->Surname = 'User';
+        $member->Lat = 24.2;
+        $member->Lon = -40;
+        $member->write();
+        $params = array();
+        $map->addMarkerAsObject(
+            $member,
+            $params
+        );
+
+        $html = $map->forTemplate();
+        $expected = 'data-mapmarkers=\'[{"latitude":24.2,"longitude":-40,"html":"MEMBER: Test User","category":"default","icon":false}]\'';
+        $this->assertContains($expected, $html);
+    }
+
+
+    public function testAddMarkerThatIsMappableAsObject() {
+        $map = $this->getMap();
+        $member = new MappableExampleClass();
+        //$member->write();
+        $params = array();
+        $map->addMarkerAsObject(
+            $member,
+            $params
+        );
+
+        $html = $map->forTemplate();
+        $expected = 'data-mapmarkers=\'[{"latitude":13.4,"longitude":100.7,"html":"example content","category":"default","icon":null}]\'';
+        $this->assertContains($expected, $html);
+    }
+
+
+    public function testConnectPoints() {
+        $members = $this->getGeolocatedMembers();
+        $member1 = $members->pop();
+        $member2 = $members->pop();
+        $map = $this->getMap();
+        $map->connectPoints($member1, $member2);
+        $html = $map->forTemplate();
+        $expected = 'data-lines=\'[{"lat1":-12,"lon1":42.1,"lat2":23,"lon2":78,"color":"#FF3300"}]\'';
+        $this->assertContains($expected, $html);
+    }
+
+
+    public function testAddKML() {
+        $map = $this->getMap();
+        $map->addKml('http://www.test.com/route1.kml');
+        $map->addKml('http://www.test.com/route2.kml');
+        $html = $map->forTemplate();
+        $expected = 'data-kmlfiles=\'["http://www.test.com/route1.kml","http://www.test.com/route2.kml"]\'';
+        $this->assertContains($expected, $html);
+    }
+
+
+    public function testAddLine() {
+        $map = $this->getMap();
+        $map->addLine(
+            array(13, 101),
+            array(13.2, 101.4),
+            '#F32'
+        );
+
+        $map->addLine(
+            array(13.2, 101.4),
+            array(14.2, 99.8)
+        );
+
+        $html = $map->forTemplate();
+        $expected = 'data-lines=\'[{"lat1":13,"lon1":101,"lat2":13.2,"lon2":101.4,"color":"#F32"},{"lat1":13.2,"lon1":101.4,"lat2":14.2,"lon2":99.8,"color":"#FF3300"}]\'';
+        $this->assertContains($expected, $html);
+    }
+
+    /**
+     * This tests out a specific case of passing null for template values
+     */
+    public function testProcessTemplate() {
+        $map = $this->getMap();
+        $html = $map->processTemplateHTML('Map', null);
+        $expected = <<<HTML
 
 
 <div id=""
@@ -505,42 +505,42 @@ 
 </div>
 
 HTML;
-		$this->assertEquals($expected, $html->getValue());
-	}
-
-	private function getMap() {
-		$instance = new Member();
-		return $instance->getRenderableMap();
-	}
-
-	private function getMapMultipleItems() {
-		$members = $this->getGeolocatedMembers();
-		return $members->getRenderableMap();
-	}
-
-	private function getGeolocatedMembers() {
-		$members = new ArrayList();
-
-		$member1 = new Member();
-		$member1->Lat = 23;
-		$member1->Lon = 78;
-		$member1->MapPinEdited = true;
-		$member1->FirstName = 'Fred';
-		$member1->Surname = 'Bloggs';
-		$member1->write();
-		$members->push($member1);
-
-		$member2 = new Member();
-		$member2->Lat = -12;
-		$member2->Lon = 42.1;
-		$member2->MapPinEdited = true;
-		$member2->FirstName = 'Kane';
-		$member2->Surname = 'Williamson';
-		$member2->write();
-		$members->push($member2);
-
-		return $members;
-	}
+        $this->assertEquals($expected, $html->getValue());
+    }
+
+    private function getMap() {
+        $instance = new Member();
+        return $instance->getRenderableMap();
+    }
+
+    private function getMapMultipleItems() {
+        $members = $this->getGeolocatedMembers();
+        return $members->getRenderableMap();
+    }
+
+    private function getGeolocatedMembers() {
+        $members = new ArrayList();
+
+        $member1 = new Member();
+        $member1->Lat = 23;
+        $member1->Lon = 78;
+        $member1->MapPinEdited = true;
+        $member1->FirstName = 'Fred';
+        $member1->Surname = 'Bloggs';
+        $member1->write();
+        $members->push($member1);
+
+        $member2 = new Member();
+        $member2->Lat = -12;
+        $member2->Lon = 42.1;
+        $member2->MapPinEdited = true;
+        $member2->FirstName = 'Kane';
+        $member2->Surname = 'Williamson';
+        $member2->write();
+        $members->push($member2);
+
+        return $members;
+    }
 
 }
 
@@ -549,19 +549,19 @@ 
 // basic implementation of Mappable interface for some of the tests
 class MappableExampleClass extends ViewableData implements TestOnly, Mappable {
 
-	public function getMappableLatitude() {
-		return 13.4;
-	}
+    public function getMappableLatitude() {
+        return 13.4;
+    }
 
-	public function getMappableLongitude() {
-		return 100.7;
-	}
+    public function getMappableLongitude() {
+        return 100.7;
+    }
 
-	public function getMappableMapPin() {
-		return null;
-	}
+    public function getMappableMapPin() {
+        return null;
+    }
 
-	public function getMappableMapContent() {
-		return 'example content';
-	}
+    public function getMappableMapContent() {
+        return 'example content';
+    }
 }