gordonbanderson / Mappable

code/Mappable.php

Indentation +47 added lines, -47 removed lines

@@ -9,58 +9,58 @@
  */
 interface Mappable {
 
-	/**
-	 * An accessor method for the latitude field.
-	 * @example
-	 * <code>
-	 * 	return $this->Lat;
-	 * </code>
-	 *
-	 * @return string
-	 */
-	public function getMappableLatitude();
+    /**
+     * An accessor method for the latitude field.
+     * @example
+     * <code>
+     * 	return $this->Lat;
+     * </code>
+     *
+     * @return string
+     */
+    public function getMappableLatitude();
 
 
-	/**
-	 * An accessor method for the longitude field.
-	 * @example
-	 * <code>
-	 * 	return $this->Long;
-	 * </code>
-	 *
-	 * @return string
-	 */
-	public function getMappableLongitude();
+    /**
+     * An accessor method for the longitude field.
+     * @example
+     * <code>
+     * 	return $this->Long;
+     * </code>
+     *
+     * @return string
+     */
+    public function getMappableLongitude();
 
 
-	/**
-	 * An accessor method for the path to the marker pin for this point on the map.
-	 * If null or false, use the default Google Maps icon.
-	 * @example
-	 * <code>
-	 * return "mysite/images/map_icon.png";
-	 * </code>
-	 *
-	 * @return string
-	 */
-	public function getMappableMapPin();
+    /**
+     * An accessor method for the path to the marker pin for this point on the map.
+     * If null or false, use the default Google Maps icon.
+     * @example
+     * <code>
+     * return "mysite/images/map_icon.png";
+     * </code>
+     *
+     * @return string
+     */
+    public function getMappableMapPin();
 
 
-	/**
-	 * An accessor method that returns the content for the map bubble popup.
-	 * It is best to use the {@see ViewableData::renderWith()} method to take advantaging
-	 * of templating syntax when rendering the object's content.
-	 *
-	 * Note: it is critical that the content be sanitized for safe inclusino in the rendered
-	 * JavaScript code for the map. {@see GoogleMapsUtil::sanitize()}
-	 *
-	 * @example
-	 * <code>
-	 * return GoogleMapsUtil::sanitize($this->renderWith('MapBubble'));
-	 * </code>
-	 *
-	 * @return string
-	 */
-	public function getMappableMapContent();
+    /**
+     * An accessor method that returns the content for the map bubble popup.
+     * It is best to use the {@see ViewableData::renderWith()} method to take advantaging
+     * of templating syntax when rendering the object's content.
+     *
+     * Note: it is critical that the content be sanitized for safe inclusino in the rendered
+     * JavaScript code for the map. {@see GoogleMapsUtil::sanitize()}
+     *
+     * @example
+     * <code>
+     * return GoogleMapsUtil::sanitize($this->renderWith('MapBubble'));
+     * </code>
+     *
+     * @return string
+     */
+    public function getMappableMapContent();
 
 }

code/shortcodes/GoogleStreetViewShortCodeHandler.php

Indentation +56 added lines, -56 removed lines

@@ -2,78 +2,78 @@
 
 class GoogleStreetViewShortCodeHandler {
 
-	/* Counter used to ensure unique div ids to allow for multiple StreetViews on on page */
-	private static $gsv_ctr = 1;
+    /* Counter used to ensure unique div ids to allow for multiple StreetViews on on page */
+    private static $gsv_ctr = 1;
 
 
-	public static function parse_googlestreetview($arguments, $caption = null, $parser = null) {
-		// each of latitude, longitude and heading are required at a bare minimum
-		if(!isset($arguments['latitude'])){
-			return '';
-		}
+    public static function parse_googlestreetview($arguments, $caption = null, $parser = null) {
+        // each of latitude, longitude and heading are required at a bare minimum
+        if(!isset($arguments['latitude'])){
+            return '';
+        }
 
-		if(!isset($arguments['longitude'])){
-			return '';
-		}
+        if(!isset($arguments['longitude'])){
+            return '';
+        }
 
-		if(!isset($arguments['heading'])){
-			return '';
-		}
+        if(!isset($arguments['heading'])){
+            return '';
+        }
 
-		// defaults - these can be overriden by using zoom and pitch in the shortcode
-		$defaults = array(
-			'Zoom' => 1,
-			'Pitch' => 0
-		);
+        // defaults - these can be overriden by using zoom and pitch in the shortcode
+        $defaults = array(
+            'Zoom' => 1,
+            'Pitch' => 0
+        );
 
-		// ensure JavaScript for the map service is only downloaded once
-		$arguments['DownloadJS'] = !MapUtil::get_map_already_rendered();
-		MapUtil::set_map_already_rendered(true);
+        // ensure JavaScript for the map service is only downloaded once
+        $arguments['DownloadJS'] = !MapUtil::get_map_already_rendered();
+        MapUtil::set_map_already_rendered(true);
 
-		// convert parameters to CamelCase as per standard template conventions
-		$arguments['Latitude'] = $arguments['latitude'];
-		$arguments['Longitude'] = $arguments['longitude'];
-		$arguments['Heading'] = $arguments['heading'];
+        // convert parameters to CamelCase as per standard template conventions
+        $arguments['Latitude'] = $arguments['latitude'];
+        $arguments['Longitude'] = $arguments['longitude'];
+        $arguments['Heading'] = $arguments['heading'];
 
-		// optional parameter caption
-		if (isset($arguments['caption'])) {
-			$arguments['Caption'] = $arguments['caption'];
-		}
+        // optional parameter caption
+        if (isset($arguments['caption'])) {
+            $arguments['Caption'] = $arguments['caption'];
+        }
 
-		// optional parameter pitch
-		if (isset($arguments['pitch'])) {
-			$arguments['Pitch'] = $arguments['pitch'];
-		}
+        // optional parameter pitch
+        if (isset($arguments['pitch'])) {
+            $arguments['Pitch'] = $arguments['pitch'];
+        }
 
-		// optional parameter zoom
-		if (isset($arguments['zoom'])) {
-			$arguments['Zoom'] = $arguments['zoom'];
-		}
+        // optional parameter zoom
+        if (isset($arguments['zoom'])) {
+            $arguments['Zoom'] = $arguments['zoom'];
+        }
 
-		// the id of the dom element to be used to render the street view
-		$arguments['DomID'] = 'google_streetview_'.self::$gsv_ctr;
+        // the id of the dom element to be used to render the street view
+        $arguments['DomID'] = 'google_streetview_'.self::$gsv_ctr;
 
-		// incrememt the counter to ensure a unique id for each map canvas
-		self::$gsv_ctr++;
+        // incrememt the counter to ensure a unique id for each map canvas
+        self::$gsv_ctr++;
 
-		// merge defaults and arguments
-		$customised = array_merge($defaults, $arguments);
+        // merge defaults and arguments
+        $customised = array_merge($defaults, $arguments);
 
-		// Include google maps JS at the end of the page
-		//Requirements::javascriptTemplate("mappable/javascript/google/streetview.google.template.js", $customised);
+        // Include google maps JS at the end of the page
+        //Requirements::javascriptTemplate("mappable/javascript/google/streetview.google.template.js", $customised);
 
 
-		//get streetview template template
-		$template = new SSViewer('GoogleStreetView');
+        //get streetview template template
+        $template = new SSViewer('GoogleStreetView');
 
-		//return the template customised with the parmameters
-		return $template->process(new ArrayData($customised));
-	}
+        //return the template customised with the parmameters
+        return $template->process(new ArrayData($customised));
+    }
 
-	/**
-	 * This is only used for testing, otherwise the sequence of tests change the number returned
-	 */
-	public static function resetCounter() {
-		self::$gsv_ctr = 1;
-	}
+    /**
+     * This is only used for testing, otherwise the sequence of tests change the number returned
+     */
+    public static function resetCounter() {
+        self::$gsv_ctr = 1;
+    }
 }

code/shortcodes/GoogleMapShortCodeHandler.php

Indentation +69 added lines, -69 removed lines

@@ -2,73 +2,73 @@
 
 class GoogleMapShortCodeHandler {
 
-	/* Counter used to ensure unique div ids to allow for multiple maps on on page */
-	private static $gsv_ctr = 1;
-
-	public static function parse_googlemap($arguments, $caption = null, $parser = null) {
-		// each of latitude and longitude are required at a bare minimum
-		if(!isset($arguments['latitude'])){
-			return '';
-		}
-
-		if(!isset($arguments['longitude'])){
-			return '';
-		}
-
-		// defaults - can be overriden by using zoom and FIXME in the shortcode
-		$defaults = array(
-			'Zoom' => 5,
-			'MapType' => 'road'
-		);
-
-		// ensure JavaScript for the map service is only downloaded once
-		$arguments['DownloadJS'] = !MapUtil::get_map_already_rendered();
-		MapUtil::set_map_already_rendered(true);
-
-		// convert parameters to CamelCase as per standard template conventions
-		$arguments['Latitude'] = $arguments['latitude'];
-		$arguments['Longitude'] = $arguments['longitude'];
-
-		// optional parameter caption
-		if (isset($arguments['caption'])) {
-			$arguments['Caption'] = $arguments['caption'];
-		}
-
-		if (isset($arguments['maptype'])) {
-			$arguments['MapType'] = $arguments['maptype'];
-		}
-
-		// optional parameter zoom
-		if (isset($arguments['zoom'])) {
-			$arguments['Zoom'] = $arguments['zoom'];
-		}
-
-		// the id of the dom element to be used to render the street view
-		$arguments['DomID'] = 'google_sc_map_'.self::$gsv_ctr;
-
-		// fullscreen
-		$arguments['AllowFullScreen'] = Config::inst()->get('Mappable', 'allow_full_screen');
-
-		// incrememt the counter to ensure a unique id for each map canvas
-		self::$gsv_ctr++;
-
-		// merge defaults and arguments
-		$customised = array_merge($defaults, $arguments);
-
-		// include JavaScript to be appended at the end of the page, namely params for map rendering
-		//Requirements::javascriptTemplate("mappable/javascript/google/map.google.template.js", $customised);
-
-		//get map view template and render the HTML
-		$template = new SSViewer('GoogleMapShortCode');
-
-		//return the template customised with the parmameters
-		return $template->process(new ArrayData($customised));
-	}
-
-	/**
-	 * This is only used for testing, otherwise the sequence of tests change the number returned
-	 */
-	public static function resetCounter() {
-		self::$gsv_ctr = 1;
-	}
+    /* Counter used to ensure unique div ids to allow for multiple maps on on page */
+    private static $gsv_ctr = 1;
+
+    public static function parse_googlemap($arguments, $caption = null, $parser = null) {
+        // each of latitude and longitude are required at a bare minimum
+        if(!isset($arguments['latitude'])){
+            return '';
+        }
+
+        if(!isset($arguments['longitude'])){
+            return '';
+        }
+
+        // defaults - can be overriden by using zoom and FIXME in the shortcode
+        $defaults = array(
+            'Zoom' => 5,
+            'MapType' => 'road'
+        );
+
+        // ensure JavaScript for the map service is only downloaded once
+        $arguments['DownloadJS'] = !MapUtil::get_map_already_rendered();
+        MapUtil::set_map_already_rendered(true);
+
+        // convert parameters to CamelCase as per standard template conventions
+        $arguments['Latitude'] = $arguments['latitude'];
+        $arguments['Longitude'] = $arguments['longitude'];
+
+        // optional parameter caption
+        if (isset($arguments['caption'])) {
+            $arguments['Caption'] = $arguments['caption'];
+        }
+
+        if (isset($arguments['maptype'])) {
+            $arguments['MapType'] = $arguments['maptype'];
+        }
+
+        // optional parameter zoom
+        if (isset($arguments['zoom'])) {
+            $arguments['Zoom'] = $arguments['zoom'];
+        }
+
+        // the id of the dom element to be used to render the street view
+        $arguments['DomID'] = 'google_sc_map_'.self::$gsv_ctr;
+
+        // fullscreen
+        $arguments['AllowFullScreen'] = Config::inst()->get('Mappable', 'allow_full_screen');
+
+        // incrememt the counter to ensure a unique id for each map canvas
+        self::$gsv_ctr++;
+
+        // merge defaults and arguments
+        $customised = array_merge($defaults, $arguments);
+
+        // include JavaScript to be appended at the end of the page, namely params for map rendering
+        //Requirements::javascriptTemplate("mappable/javascript/google/map.google.template.js", $customised);
+
+        //get map view template and render the HTML
+        $template = new SSViewer('GoogleMapShortCode');
+
+        //return the template customised with the parmameters
+        return $template->process(new ArrayData($customised));
+    }
+
+    /**
+     * This is only used for testing, otherwise the sequence of tests change the number returned
+     */
+    public static function resetCounter() {
+        self::$gsv_ctr = 1;
+    }
 }

code/LatLongField.php

Indentation +81 added lines, -81 removed lines

@@ -2,95 +2,95 @@ 
 
 class LatLongField extends FieldGroup {
 
-	protected $latField;
+    protected $latField;
 
-	protected $longField;
+    protected $longField;
 
-	protected $zoomField;
+    protected $zoomField;
 
-	protected $buttonText;
+    protected $buttonText;
 
-	private $guidePoints = null;
+    private $guidePoints = null;
 
-	private static $ctr = 0;
+    private static $ctr = 0;
 
-	/**
-	 * @param string[] $buttonText
-	 */
-	public function __construct($children = array(), $buttonText = null) {
-		self::$ctr++;
+    /**
+     * @param string[] $buttonText
+     */
+    public function __construct($children = array(), $buttonText = null) {
+        self::$ctr++;
 
-		if ((sizeof($children) < 2) || (sizeof($children) > 3) ||
-			 (!$children[0] instanceof FormField) ||
-			 (!$children[1] instanceof FormField)
-		) user_error('LatLongField argument 1 must be an array containing at least two FormField '.
-				'objects for Lat/Long values, respectively.', E_USER_ERROR);
+        if ((sizeof($children) < 2) || (sizeof($children) > 3) ||
+             (!$children[0] instanceof FormField) ||
+             (!$children[1] instanceof FormField)
+        ) user_error('LatLongField argument 1 must be an array containing at least two FormField '.
+                'objects for Lat/Long values, respectively.', E_USER_ERROR);
 
-		parent::__construct($children);
+        parent::__construct($children);
 
-		$this->buttonText = $buttonText ? $buttonText : _t('LatLongField.LOOKUP', 'Search');
-		$this->latField = $children[0]->getName();
-		$this->longField = $children[1]->getName();
+        $this->buttonText = $buttonText ? $buttonText : _t('LatLongField.LOOKUP', 'Search');
+        $this->latField = $children[0]->getName();
+        $this->longField = $children[1]->getName();
 
-		if (sizeof($children) == 3) {
-			$this->zoomField = $children[2]->getName();
-		}
-		$name = "";
-		foreach ($children as $field) {
-			$name .= $field->getName();
-		}
+        if (sizeof($children) == 3) {
+            $this->zoomField = $children[2]->getName();
+        }
+        $name = "";
+        foreach ($children as $field) {
+            $name .= $field->getName();
+        }
 
-		// hide the lat long and zoom fields from the interface
-		foreach ($this->FieldList() as $fieldToHide) {
-			$fieldToHide->addExtraClass('hide');
-		}
+        // hide the lat long and zoom fields from the interface
+        foreach ($this->FieldList() as $fieldToHide) {
+            $fieldToHide->addExtraClass('hide');
+        }
 
-		$this->name = $name;
-	}
+        $this->name = $name;
+    }
 
 
-	public function FieldHolder($properties = array()) {
-		Requirements::javascript(THIRDPARTY_DIR.'/jquery/jquery.js');
-		Requirements::javascript(THIRDPARTY_DIR.'/jquery-livequery/jquery.livequery.js');
-		Requirements::javascript(THIRDPARTY_DIR.'/jquery-metadata/jquery.metadata.js');
-		Requirements::javascript(MAPPABLE_MODULE_PATH.'/javascript/mapField.js');
+    public function FieldHolder($properties = array()) {
+        Requirements::javascript(THIRDPARTY_DIR.'/jquery/jquery.js');
+        Requirements::javascript(THIRDPARTY_DIR.'/jquery-livequery/jquery.livequery.js');
+        Requirements::javascript(THIRDPARTY_DIR.'/jquery-metadata/jquery.metadata.js');
+        Requirements::javascript(MAPPABLE_MODULE_PATH.'/javascript/mapField.js');
 
-		$attributes = array(
-			'class' => 'editableMap',
-			'id' => 'GoogleMap',
-			'data-LatFieldName' => $this->latField,
-			'data-LonFieldName' => $this->longField,
-			'data-ZoomFieldName' => $this->zoomField,
-			'data-UseMapBounds' => false
-	   );
+        $attributes = array(
+            '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');
+        Requirements::css('mappable/css/mapField.css');
 
-		// check for and if required add guide points
-		if (!empty($this->guidePoints)) {
-			$latlongps = array();
+        // check for and if required add guide points
+        if (!empty($this->guidePoints)) {
+            $latlongps = array();
 
-			foreach ($this->guidePoints as $guidepoint) {
-				array_push($latlongps, $guidepoint);
-			}
+            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->create_tag(
-			"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->create_tag(
+            "div",
+            $attributes
+        ).'</div>';
 
-		$this->FieldList()->push(new LiteralField('locationEditor', $content));
+        $this->FieldList()->push(new LiteralField('locationEditor', $content));
 
-		$content2 = <<<HTML
+        $content2 = <<<HTML
 <div id="mapSearch">
 <input name="location_search" id="location_search" size=80/>
 <button class="action" id="searchLocationButton">Search Location Name</button>
@@ -99,12 +99,12 @@ 
 </div>
 HTML;
 
-		$this->FieldList()->push(new LiteralField('mapSearch', $content2));
+        $this->FieldList()->push(new LiteralField('mapSearch', $content2));
 
-		return parent::FieldHolder();
-	}
+        return parent::FieldHolder();
+    }
 
-	/*
+    /*
 	Set guidance points for the map being edited.  For example in a photographic set show the map
 	position of some other images so that subsequent photo edits do not start with a map centred
 	at the origin
@@ -112,16 +112,16 @@ 
 	@var newGuidePoints array of points expressed as associative arrays containing keys latitude
 						and longitude mapping to geographical locations
 	*/
-	public function setGuidePoints($newGuidePoints) {
-		$this->guidePoints = $newGuidePoints;
-	}
-
-	/**
-	 * Accessor to guidepoints.  For testing purposes
-	 * @return array guidepoints
-	 */
-	public function getGuidePoints() {
-		return $this->guidePoints;
-	}
+    public function setGuidePoints($newGuidePoints) {
+        $this->guidePoints = $newGuidePoints;
+    }
+
+    /**
+     * Accessor to guidepoints.  For testing purposes
+     * @return array guidepoints
+     */
+    public function getGuidePoints() {
+        return $this->guidePoints;
+    }
 
 }

code/MappableDataObjectSet.php

Indentation +20 added lines, -20 removed lines

@@ -8,27 +8,27 @@
  */
 class MappableDataObjectSet extends Extension {
 
-	/**
-	 * Optional template values for the map info windows
-	 */
-	private $MarkerTemplateValues = null;
+    /**
+     * Optional template values for the map info windows
+     */
+    private $MarkerTemplateValues = null;
 
-	/**
-	 * Pass through values to the markers so that when rendering the map info windows, these
-	 * parameters are available to the template.  This is of course optional
-	 *
-	 * @param array $values hash array of template key to template value
-	 */
-	public function setMarkerTemplateValues($values) {
-		$this->MarkerTemplateValues = $values;
-	}
+    /**
+     * Pass through values to the markers so that when rendering the map info windows, these
+     * parameters are available to the template.  This is of course optional
+     *
+     * @param array $values hash array of template key to template value
+     */
+    public function setMarkerTemplateValues($values) {
+        $this->MarkerTemplateValues = $values;
+    }
 
-	public function getRenderableMap($width = null, $height = null) {
-		$gmap = MapUtil::get_map($this->owner, $this->MarkerTemplateValues);
-		$w = $width ? $width : MapUtil::$map_width;
-		$h = $height ? $height : MapUtil::$map_height;
-		$gmap->setSize($w,$h);
-		return $gmap;
-	}
+    public function getRenderableMap($width = null, $height = null) {
+        $gmap = MapUtil::get_map($this->owner, $this->MarkerTemplateValues);
+        $w = $width ? $width : MapUtil::$map_width;
+        $h = $height ? $height : MapUtil::$map_height;
+        $gmap->setSize($w,$h);
+        return $gmap;
+    }
 
 }

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

Indentation +42 added lines, -42 removed lines

@@ -4,52 +4,52 @@
  */
 class MapField extends DatalessField {
 
-		/**
-		 * @var int $headingLevel The level of the <h1> to <h6> HTML tag. Default: 2
-		 */
-		protected $headingLevel = 2;
-		private $divId;
+        /**
+         * @var int $headingLevel The level of the <h1> to <h6> HTML tag. Default: 2
+         */
+        protected $headingLevel = 2;
+        private $divId;
 
-		/**
-		 * @param string $name
-		 * @param string $title
-		 */
-		function __construct($name, $title = null, $headingLevel = 2, $allowHTML = false, $form = null) {
-			$this->divId = $name;
-			// legacy handling for old parameters: $title, $heading, ...
-			// instead of new handling: $name, $title, $heading, ...
-			$args = func_get_args();
-			if(!isset($args[1]) || is_numeric($args[1])) {
-					$title = (isset($args[0])) ? $args[0] : null;
-					// Use "HeaderField(title)" as the default field name for a HeaderField;
-					// if it's just set to title then we risk causing accidental duplicate-field creation.
+        /**
+         * @param string $name
+         * @param string $title
+         */
+        function __construct($name, $title = null, $headingLevel = 2, $allowHTML = false, $form = null) {
+            $this->divId = $name;
+            // legacy handling for old parameters: $title, $heading, ...
+            // instead of new handling: $name, $title, $heading, ...
+            $args = func_get_args();
+            if(!isset($args[1]) || is_numeric($args[1])) {
+                    $title = (isset($args[0])) ? $args[0] : null;
+                    // Use "HeaderField(title)" as the default field name for a HeaderField;
+                    // if it's just set to title then we risk causing accidental duplicate-field creation.
 
-					// this means i18nized fields won't be easily accessible through fieldByName()
-					$name = 'MapField' . $title;
-					$headingLevel = (isset($args[1])) ? $args[1] : null;
-					$allowHTML = (isset($args[2])) ? $args[2] : null;
-					$form = (isset($args[3])) ? $args[3] : null;
-			}
+                    // this means i18nized fields won't be easily accessible through fieldByName()
+                    $name = 'MapField' . $title;
+                    $headingLevel = (isset($args[1])) ? $args[1] : null;
+                    $allowHTML = (isset($args[2])) ? $args[2] : null;
+                    $form = (isset($args[3])) ? $args[3] : null;
+            }
 
-			if($headingLevel) $this->headingLevel = $headingLevel;
-			$this->allowHTML = $allowHTML;
-			parent::__construct($name, $title, null, $allowHTML, $form);
-		}
+            if($headingLevel) $this->headingLevel = $headingLevel;
+            $this->allowHTML = $allowHTML;
+            parent::__construct($name, $title, null, $allowHTML, $form);
+        }
 
-		function Field($properties = array()) {
-				Requirements::javascript('framework/thirdparty/jquery/jquery.js');
-				Requirements::javascript('framework/thirdparty/jquery-livequery/jquery.livequery.js');
-				$attributes = array(
-						'class' => 'middleColumn',
-						'id' => $this->divId,
-						'style' => "width:100%;height:300px;margin:5px 0px 5px 5px;position:relative;"
-				);
+        function Field($properties = array()) {
+                Requirements::javascript('framework/thirdparty/jquery/jquery.js');
+                Requirements::javascript('framework/thirdparty/jquery-livequery/jquery.livequery.js');
+                $attributes = array(
+                        'class' => 'middleColumn',
+                        'id' => $this->divId,
+                        'style' => "width:100%;height:300px;margin:5px 0px 5px 5px;position:relative;"
+                );
 
-				Requirements::css('mappable/css/mapField.css');
+                Requirements::css('mappable/css/mapField.css');
 
-				return '<div class="editableMap">' . $this->createTag(
-						"div",
-						$attributes
-				) . '</div>';
-		}
+                return '<div class="editableMap">' . $this->createTag(
+                        "div",
+                        $attributes
+                ) . '</div>';
+        }
 }

code/MapUtil.php

Indentation +217 added lines, -217 removed lines

@@ -3,221 +3,221 @@
 class MapUtil
 {
 
-	/**
-	 * @var string The Google Maps API key
-	 */
-	protected static $api_key;
-
-	/**
-	 * @var int Number of active {@see GoogleMapsAPI} instances (for the HTML ID)
-	 */
-	protected static $instances = 0;
-
-	/**
-	 * @var int The default width of a Google Map
-	 */
-	public static $map_width = '100%';
-
-	/**
-	 * @var int The default height of a Google Map
-	 */
-	public static $map_height = '400px';
-
-	/**
-	 * @var int Prefix for the div ID of the map
-	 */
-	public static $div_id = "google_map";
-
-	/**
-	 * @var boolean Automatic center/zoom for the map
-	 */
-	public static $automatic_center = true;
-
-	/**
-	 * @var boolean Show the marker fields on the map
-	 */
-	public static $hide_marker = false;
-
-	/**
-	 * @var boolean Show the marker fields on the map
-	 */
-	public static $map_type = 'google.maps.MapTypeId.ROADMAP';
-
-	/**
-	 * @var string $center Center of map (adress)
-	 */
-	public static $center = 'Paris, France';
-
-	/* Signals whether at least one map has already been rendered */
-	private static $map_already_rendered = false;
-
-	/* Whether or not to allow full screen */
-	private static $allow_full_screen = null;
-
-
-	public static function reset() {
-		self::$api_key = null;
-		self::$instances = 0;
-		self::$map_width = '100%';
-		self::$map_height = '400px';
-		self::$div_id = "google_map";
-		self::$automatic_center = true;
-		self::$hide_marker = false;
-		self::$map_type = 'google.maps.MapTypeId.ROADMAP';
-		self::$center = 'Paris, France';
-		self::$map_already_rendered = false;
-		self::$allow_full_screen = null;
-		Config::inst()->update('Mappable', 'language', 'en');
-	}
-
-	/**
-	 * Set the API key for Google Maps
-	 *
-	 * @param string $key
-	 */
-	public static function set_api_key($key) {
-		self::$api_key = $key;
-	}
-
-	/**
-	 * @param boolean $new_map_already_rendered
-	 */
-	public static function set_map_already_rendered($new_map_already_rendered) {
-		self::$map_already_rendered = $new_map_already_rendered;
-	}
-
-	public static function get_map_already_rendered() {
-		return self::$map_already_rendered;
-	}
-
-	/**
-	 * Set the default size of the map
-	 *
-	 * @param int $width
-	 * @param int $height
-	 */
-	public static function set_map_size($width, $height) {
-		self:: $map_width = $width;
-		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;
-	}
-
-	/**
-	 * Set the center of the gmap (an address, using text geocoder query)
-	 *
-	 * @param string $center GoogleMap  center (an address)
-	 *
-	 * @return void
-	 */
-	public static function set_center($center)
-	{
-		self::$center = $center;
-	}
-
-	/**
-	 * Get a new GoogleMapAPI object and load it with the default settings
-	 *
-	 * @return MapAPI
-	 */
-	public static function instance()
-	{
-		self::$instances++;
-
-		if (self::$allow_full_screen == null) {
-			self::$allow_full_screen = Config::inst()->get('Mappable', 'allow_full_screen');
-		}
-
-		$url = Director::absoluteBaseURL();
-
-		// remove http and https
-		$url = str_replace('http://', '', $url);
-		$url = str_replace('https://', '', $url);
-		$parts = explode('/', $url);
-		$host = $parts[0];
-
-		$key = self::$api_key;
-
-		// if an array, get the key by an array keyed by host
-		if (is_array($key)) {
-			$key = $key[$host];
-		}
-
-		$gmap = new MapAPI($key);
-		$gmap->setDivId(self::$div_id."_".self::$instances);
-		$gmap->setEnableAutomaticCenterZoom(self::$automatic_center);
-		$gmap->setSize(self::$map_width, self::$map_height);
-		$gmap->setDefaultHideMarker(self::$hide_marker);
-		$gmap->setMapType(self::$map_type);
-		$gmap->setCenter(self::$center);
-		$gmap->setAllowFullScreen(self::$allow_full_screen);
-		$language = Config::inst()->get('Mappable', 'language');
-		$gmap->setLang($language);
-		return $gmap;
-	}
-
-
-	/**
-	 * Sanitize a string of HTML content for safe inclusion in the JavaScript
-	 * for a Google Map
-	 *
-	 * @return string
-	 */
-	public static function sanitize($content) {
-		return addslashes(str_replace(array("\n", "\r", "\t"), '', $content));
-	}
-
-
-	/**
-	 * Creates a new {@link GoogleMapsAPI} object loaded with the default settings
-	 * and places all of the items in a {@link SS_List}
-	 * e.g. {@link DataList} or {@link ArrayList} on the map
-	 *
-	 * @param SS_List list of objects to display on a map
-	 * @param  array $infowindowtemplateparams Optional array of extra parameters to pass to the map info window
-	 * @return MapAPI
-	 */
-	public static function get_map(SS_List $list, $infowindowtemplateparams) {
-		$gmap = self::instance();
-		if ($list) {
-			foreach ($list as $mappable) {
-				if (self::ChooseToAddDataobject($mappable))
-					$gmap->addMarkerAsObject($mappable, $infowindowtemplateparams);
-			}
-		}
-		return $gmap;
-	}
-
-	/**
-	 * Determines if the current DataObject should be included to the map
-	 * Checks if it has Mappable interface implemented
-	 * If it has MapExtension included, the value of MapPinEdited is also checked
-	 *
-	 * @param DataObject $do
-	 * @return bool
-	 */
-	private static function ChooseToAddDataobject(DataObject $do) {
-		$isMappable = $do->is_a('Mappable');
-
-		foreach ($do->getExtensionInstances() as $extension) {
-			$isMappable = $isMappable || $extension instanceof Mappable;
-		}
-
-		$filterMapPinEdited = $do->hasExtension('MapExtension')
-			? $do->MapPinEdited
-			: true;
-
-		return $isMappable && $filterMapPinEdited;
-	}
+    /**
+     * @var string The Google Maps API key
+     */
+    protected static $api_key;
+
+    /**
+     * @var int Number of active {@see GoogleMapsAPI} instances (for the HTML ID)
+     */
+    protected static $instances = 0;
+
+    /**
+     * @var int The default width of a Google Map
+     */
+    public static $map_width = '100%';
+
+    /**
+     * @var int The default height of a Google Map
+     */
+    public static $map_height = '400px';
+
+    /**
+     * @var int Prefix for the div ID of the map
+     */
+    public static $div_id = "google_map";
+
+    /**
+     * @var boolean Automatic center/zoom for the map
+     */
+    public static $automatic_center = true;
+
+    /**
+     * @var boolean Show the marker fields on the map
+     */
+    public static $hide_marker = false;
+
+    /**
+     * @var boolean Show the marker fields on the map
+     */
+    public static $map_type = 'google.maps.MapTypeId.ROADMAP';
+
+    /**
+     * @var string $center Center of map (adress)
+     */
+    public static $center = 'Paris, France';
+
+    /* Signals whether at least one map has already been rendered */
+    private static $map_already_rendered = false;
+
+    /* Whether or not to allow full screen */
+    private static $allow_full_screen = null;
+
+
+    public static function reset() {
+        self::$api_key = null;
+        self::$instances = 0;
+        self::$map_width = '100%';
+        self::$map_height = '400px';
+        self::$div_id = "google_map";
+        self::$automatic_center = true;
+        self::$hide_marker = false;
+        self::$map_type = 'google.maps.MapTypeId.ROADMAP';
+        self::$center = 'Paris, France';
+        self::$map_already_rendered = false;
+        self::$allow_full_screen = null;
+        Config::inst()->update('Mappable', 'language', 'en');
+    }
+
+    /**
+     * Set the API key for Google Maps
+     *
+     * @param string $key
+     */
+    public static function set_api_key($key) {
+        self::$api_key = $key;
+    }
+
+    /**
+     * @param boolean $new_map_already_rendered
+     */
+    public static function set_map_already_rendered($new_map_already_rendered) {
+        self::$map_already_rendered = $new_map_already_rendered;
+    }
+
+    public static function get_map_already_rendered() {
+        return self::$map_already_rendered;
+    }
+
+    /**
+     * Set the default size of the map
+     *
+     * @param int $width
+     * @param int $height
+     */
+    public static function set_map_size($width, $height) {
+        self:: $map_width = $width;
+        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;
+    }
+
+    /**
+     * Set the center of the gmap (an address, using text geocoder query)
+     *
+     * @param string $center GoogleMap  center (an address)
+     *
+     * @return void
+     */
+    public static function set_center($center)
+    {
+        self::$center = $center;
+    }
+
+    /**
+     * Get a new GoogleMapAPI object and load it with the default settings
+     *
+     * @return MapAPI
+     */
+    public static function instance()
+    {
+        self::$instances++;
+
+        if (self::$allow_full_screen == null) {
+            self::$allow_full_screen = Config::inst()->get('Mappable', 'allow_full_screen');
+        }
+
+        $url = Director::absoluteBaseURL();
+
+        // remove http and https
+        $url = str_replace('http://', '', $url);
+        $url = str_replace('https://', '', $url);
+        $parts = explode('/', $url);
+        $host = $parts[0];
+
+        $key = self::$api_key;
+
+        // if an array, get the key by an array keyed by host
+        if (is_array($key)) {
+            $key = $key[$host];
+        }
+
+        $gmap = new MapAPI($key);
+        $gmap->setDivId(self::$div_id."_".self::$instances);
+        $gmap->setEnableAutomaticCenterZoom(self::$automatic_center);
+        $gmap->setSize(self::$map_width, self::$map_height);
+        $gmap->setDefaultHideMarker(self::$hide_marker);
+        $gmap->setMapType(self::$map_type);
+        $gmap->setCenter(self::$center);
+        $gmap->setAllowFullScreen(self::$allow_full_screen);
+        $language = Config::inst()->get('Mappable', 'language');
+        $gmap->setLang($language);
+        return $gmap;
+    }
+
+
+    /**
+     * Sanitize a string of HTML content for safe inclusion in the JavaScript
+     * for a Google Map
+     *
+     * @return string
+     */
+    public static function sanitize($content) {
+        return addslashes(str_replace(array("\n", "\r", "\t"), '', $content));
+    }
+
+
+    /**
+     * Creates a new {@link GoogleMapsAPI} object loaded with the default settings
+     * and places all of the items in a {@link SS_List}
+     * e.g. {@link DataList} or {@link ArrayList} on the map
+     *
+     * @param SS_List list of objects to display on a map
+     * @param  array $infowindowtemplateparams Optional array of extra parameters to pass to the map info window
+     * @return MapAPI
+     */
+    public static function get_map(SS_List $list, $infowindowtemplateparams) {
+        $gmap = self::instance();
+        if ($list) {
+            foreach ($list as $mappable) {
+                if (self::ChooseToAddDataobject($mappable))
+                    $gmap->addMarkerAsObject($mappable, $infowindowtemplateparams);
+            }
+        }
+        return $gmap;
+    }
+
+    /**
+     * Determines if the current DataObject should be included to the map
+     * Checks if it has Mappable interface implemented
+     * If it has MapExtension included, the value of MapPinEdited is also checked
+     *
+     * @param DataObject $do
+     * @return bool
+     */
+    private static function ChooseToAddDataobject(DataObject $do) {
+        $isMappable = $do->is_a('Mappable');
+
+        foreach ($do->getExtensionInstances() as $extension) {
+            $isMappable = $isMappable || $extension instanceof Mappable;
+        }
+
+        $filterMapPinEdited = $do->hasExtension('MapExtension')
+            ? $do->MapPinEdited
+            : true;
+
+        return $isMappable && $filterMapPinEdited;
+    }
 }