Re add image overlay support

Maps.php

@@ -219,4 +219,8 @@
 	$wgParamDefinitions['wmsoverlay'] = array(
 		'string-parser' => 'Maps\WmsOverlayParser',
 	);
+
+	$wgParamDefinitions['mapsimageoverlay'] = array(
+		'string-parser' => 'Maps\ImageOverlayParser',
+	);
 } );

docs/RELEASE-NOTES.md

@@ -6,6 +6,7 @@ These are the release notes for the [Maps extension](../README.md).
 * Removed support for the deprecated Google JavaScript API
 * Updated the translations to use the new MediaWiki JSON format
 * Re added support for fill color and fill opacity parameters for circles
+* Re added image overlay support for Google Maps
 
 ## Maps 3.0.1
 

includes/parsers/ImageOverlayParser.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Maps;
+
+use Maps\Elements\ImageOverlay;
+use Maps\Elements\WmsOverlay;
+use ValueParsers\GeoCoordinateParser;
+use ValueParsers\ParseException;
+use ValueParsers\StringValueParser;
+
+/**
+ * @since 3.1
+ *
+ * @licence GNU GPL v2+
+ * @author Jeroen De Dauw < [email protected] >
+ */
+class ImageOverlayParser extends StringValueParser {
+
+	/**
+	 * @since 3.1
+	 *
+	 * @param string $value
+	 *
+	 * @return WmsOverlay
+	 * @throws ParseException
+	 */
+	protected function stringParse( $value ) {
+		$parameters = explode( '~', $value );
+		$imageParameters = explode( ':', $parameters[0], 3 );
+
+		if ( count( $imageParameters ) === 3 ) {
+			$boundsNorthEast = $this->stringToLatLongValue( $imageParameters[0] );
+			$boundsSouthWest = $this->stringToLatLongValue( $imageParameters[1] );
+			$imageUrl = \MapsMapper::getFileUrl( $imageParameters[2] );
+
+			return new ImageOverlay( $boundsNorthEast, $boundsSouthWest, $imageUrl );
+		}
+
+		throw new ParseException( 'Need 3 parameters for an image overlay' );
+	}
+
+	private function stringToLatLongValue( $location ) {
+		$parser = new GeoCoordinateParser( new \ValueParsers\ParserOptions() );
+		return $parser->parse( $location );
+	}
+
+}

includes/services/GoogleMaps3/Maps_GoogleMaps3.php

@@ -184,12 +184,11 @@ public function addParameterInfo( array &$params ) {
 		);
 
 		$params['imageoverlays'] = array(
-			'type' => 'integer',
+			'type' => 'mapsimageoverlay',
 			'default' => array(),
-			'message' => 'maps-googlemaps3-par-imageoverlays',
-			'islist' => true,
 			'delimiter' => ';',
-			// new MapsParamImageOverlay('~') FIXME
+			'islist' => true,
+			'message' => 'maps-googlemaps3-par-imageoverlays',
 		);
 
 		$params['kml'] = array(

src/Maps/Elements/ImageOverlay.php

@@ -16,11 +16,9 @@
 class ImageOverlay extends Rectangle {
 
 	/**
-	 * @since 3.0
-	 *
 	 * @var string
 	 */
-	protected $image;
+	private $imageUrl;
 
 	/**
 	 * Constructor.
@@ -39,7 +37,7 @@ public function __construct( LatLongValue $boundsNorthEast, LatLongValue $bounds
 		}
 
 		parent::__construct( $boundsNorthEast, $boundsSouthWest );
-		$this->image = $image;
+		$this->imageUrl = $image;
 	}
 
 	/**
@@ -48,7 +46,23 @@ public function __construct( LatLongValue $boundsNorthEast, LatLongValue $bounds
 	 * @return string
 	 */
 	public function getImage() {
-		return $this->image;
+		return $this->imageUrl;
+	}
+
+	/**
+	 * @since 3.0
+	 *
+	 * @param string $defText
+	 * @param string $defTitle
+	 *
+	 * @return array
+	 */
+	public function getJSONObject( $defText = '' , $defTitle = '' ) {
+		$data = parent::getJSONObject( $defText , $defTitle );
+
+		$data['image'] = $this->imageUrl;
+
+		return $data;
 	}
 
 }

src/Maps/Elements/Rectangle.php

@@ -92,7 +92,6 @@ public function setRectangleNorthEast( LatLongValue $rectangleNorthEast ) {
 	 * @return array
 	 */
 	public function getJSONObject( $defText = '' , $defTitle = '' ) {
-
 		$parentArray = parent::getJSONObject( $defText , $defTitle );
 		$array = array(
 			'ne' => array(