Merge pull request #442 from JeroenDeDauw/fixparams

Fix circles and rectangles paremeters
ProfessionalWiki · Jul 4, 2018 · 7810137 · 7810137
2 parents f0874eb + 547ed4d
commit 7810137
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 5 deletions.
diff --git a/Maps.php b/Maps.php
@@ -70,7 +70,7 @@
 		);
 	}
 
-	define( 'Maps_VERSION', '5.5.0' );
+	define( 'Maps_VERSION', '5.5.1' );
 	define( 'SM_VERSION', Maps_VERSION );
 
 	if ( $GLOBALS['egMapsGMaps3Language'] === '' ) {

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -3,6 +3,15 @@ different releases and which versions of PHP and MediaWiki they support, see the
 [platform compatibility tables](INSTALL.md#platform-compatibility-and-release-status).
 
 
+## Maps 5.5.1
+
+Released on July 4th, 2018.
+
+* Fixed fatal error when using `#display_map` parameter `circles`
+* Fixed fatal error when using `#display_map` parameter `rectangles`
+* Fixed `#display_map` parameter `rectangles` fill color modifier (it is no longer ignored)
+* Fixed `#display_map` parameter `rectangles` fill opacity modifier (it is no longer ignored)
+
 ## Maps 5.5.0
 
 Released on July 3rd, 2018.

diff --git a/includes/parsers/CircleParser.php b/includes/parsers/CircleParser.php
@@ -21,8 +21,8 @@ class CircleParser implements ValueParser {
 
 	private $geocoder;
 
-	public function __construct( Geocoder $geocoder = null ) {
-		$this->geocoder = $geocoder ?? MapsFactory::newDefault()->newGeocoder();
+	public function __construct( $geocoder = null ) {
+		$this->geocoder = $geocoder instanceof Geocoder ? $geocoder : MapsFactory::newDefault()->newGeocoder();
 	}
 
 	/**

diff --git a/includes/parsers/RectangleParser.php b/includes/parsers/RectangleParser.php
@@ -21,8 +21,8 @@ class RectangleParser implements ValueParser {
 
 	private $geocoder;
 
-	public function __construct( Geocoder $geocoder = null ) {
-		$this->geocoder = $geocoder ?? MapsFactory::newDefault()->newGeocoder();
+	public function __construct( $geocoder = null ) {
+		$this->geocoder = $geocoder instanceof Geocoder ? $geocoder : MapsFactory::newDefault()->newGeocoder();
 	}
 
 	/**
@@ -63,6 +63,14 @@ public function parse( $value ) {
 			$rectangle->setStrokeWeight( array_shift( $metaData ) );
 		}
 
+		if ( $metaData !== [] ) {
+			$rectangle->setFillColor( array_shift( $metaData ) );
+		}
+
+		if ( $metaData !== [] ) {
+			$rectangle->setFillOpacity( array_shift( $metaData ) );
+		}
+
 		return $rectangle;
 	}
 

diff --git a/tests/Integration/Parser/DisplayMapTest.php b/tests/Integration/Parser/DisplayMapTest.php
@@ -107,4 +107,32 @@ public function testLocationDescriptionGetsIncluded() {
 		);
 	}
 
+	public function testRectangleDisplay() {
+		$this->assertContains(
+			'"title":"title',
+			$this->parse( '{{#display_map:rectangles=1,1:2,2~title}}' )
+		);
+	}
+
+	public function testCircleDisplay() {
+		$this->assertContains(
+			'"title":"title',
+			$this->parse( '{{#display_map:circles=1,1:2~title}}' )
+		);
+	}
+
+	public function testRectangleFillOpacityIsUsed() {
+		$this->assertContains(
+			'"fillOpacity":"fill opacity"',
+			$this->parse( '{{#display_map:rectangles=1,1:2,2~title~text~color~opacity~thickness~fill color~fill opacity}}' )
+		);
+	}
+
+	public function testRectangleFillColorIsUsed() {
+		$this->assertContains(
+			'"fillColor":"fill color"',
+			$this->parse( '{{#display_map:rectangles=1,1:2,2~title~text~color~opacity~thickness~fill color~fill opacity}}' )
+		);
+	}
+
 }