-
+
*/
diff --git a/includes/ext.maps.coord.js b/includes/ext.maps.coord.js
index d568f67f9..729281ae5 100644
--- a/includes/ext.maps.coord.js
+++ b/includes/ext.maps.coord.js
@@ -3,8 +3,7 @@
* @see http://www.mediawiki.org/wiki/Extension:Maps
*
* @since 1.0
- * @ingroup Maps
- *
+ *
* @licence GNU GPL v2++
* @author Jeroen De Dauw
*/
diff --git a/includes/geocoders/Maps_GeocoderusGeocoder.php b/includes/geocoders/Maps_GeocoderusGeocoder.php
new file mode 100644
index 000000000..825e05e3a
--- /dev/null
+++ b/includes/geocoders/Maps_GeocoderusGeocoder.php
@@ -0,0 +1,57 @@
+=5.3 becomes acceptable.
+ *
+ * @since 3.0
+ */
+ public static function register() {
+ \Maps\Geocoders::registerGeocoder( 'geocoderus', __CLASS__ );
+ return true;
+ }
+
+ /**
+ * @see \Maps\Geocoder::getRequestUrl
+ *
+ * @since 3.0
+ *
+ * @param string $address
+ *
+ * @return string
+ */
+ protected function getRequestUrl( $address ) {
+ return 'http://geocoder.us/service/rest/?address=' . urlencode( $address );
+ }
+
+ /**
+ * @see \Maps\Geocoder::parseResponse
+ *
+ * @since 3.0
+ *
+ * @param string $address
+ *
+ * @return array
+ */
+ protected function parseResponse( $response ) {
+ $lon = self::getXmlElementValue( $response, 'geo:long' );
+ $lat = self::getXmlElementValue( $response, 'geo:lat' );
+
+ // In case one of the values is not found, return false.
+ if ( !$lon || !$lat ) return false;
+
+ return array(
+ 'lat' => (float)$lat,
+ 'lon' => (float)$lon
+ );
+ }
+}
diff --git a/includes/geocoders/Maps_GeonamesGeocoder.php b/includes/geocoders/Maps_GeonamesGeocoder.php
index 69450740b..5fd8b85a5 100644
--- a/includes/geocoders/Maps_GeonamesGeocoder.php
+++ b/includes/geocoders/Maps_GeonamesGeocoder.php
@@ -4,9 +4,6 @@
* Class for geocoding requests with the GeoNames webservice.
*
* @since 1.0
- * @file Maps_GeonamesGeocoder.php
- * @ingroup Maps
- * @ingroup Geocoders
*
* @licence GNU GPL v2+
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
diff --git a/includes/geocoders/Maps_GoogleGeocoder.php b/includes/geocoders/Maps_GoogleGeocoder.php
index 58dcbe0c0..d73347a19 100644
--- a/includes/geocoders/Maps_GoogleGeocoder.php
+++ b/includes/geocoders/Maps_GoogleGeocoder.php
@@ -5,10 +5,6 @@
*
* Webservice documentation: http://code.google.com/apis/maps/documentation/geocoding/
*
- * @file Maps_GoogleGeocoder.php
- * @ingroup Maps
- * @ingroup Geocoders
- *
* @licence GNU GPL v2+
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
* @author Sergey Chernyshev
diff --git a/includes/iMappingService.php b/includes/iMappingService.php
index ec8987200..d73fc7455 100644
--- a/includes/iMappingService.php
+++ b/includes/iMappingService.php
@@ -4,9 +4,6 @@
* Interface that should be implemented by all mapping feature classes.
*
* @since 0.6.3
- *
- * @file iMappingService.php
- * @ingroup Maps
*
* @licence GNU GPL v2+
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
@@ -20,7 +17,7 @@ interface iMappingService {
*
* @return string
*/
- function getName();
+ public function getName();
/**
* Adds the dependencies to the parser output as head items.
@@ -29,7 +26,7 @@ function getName();
*
* @param mixed $parserOrOut
*/
- function addDependencies( &$parserOrOut );
+ public function addDependencies( &$parserOrOut );
/**
* Adds service-specific parameter definitions to the provided parameter list.
@@ -40,7 +37,7 @@ function addDependencies( &$parserOrOut );
*
* @return array
*/
- function addParameterInfo( array &$parameterInfo );
+ public function addParameterInfo( array &$parameterInfo );
/**
* Adds a feature to this service. This is to indicate this service has support for this feature.
@@ -50,7 +47,7 @@ function addParameterInfo( array &$parameterInfo );
* @param string $featureName
* @param string $handlingClass
*/
- function addFeature( $featureName, $handlingClass );
+ public function addFeature( $featureName, $handlingClass );
/**
* Returns the name of the class that handles the provided feature in this service, or false if there is none.
@@ -61,7 +58,7 @@ function addFeature( $featureName, $handlingClass );
*
* @return mixed String or false
*/
- function getFeature( $featureName );
+ public function getFeature( $featureName );
/**
* Returns an instance of the class handling the provided feature with this service, or false if there is none.
@@ -72,7 +69,7 @@ function getFeature( $featureName );
*
* @return object or false
*/
- function getFeatureInstance( $featureName );
+ public function getFeatureInstance( $featureName );
/**
* Returns a list of aliases.
@@ -81,7 +78,7 @@ function getFeatureInstance( $featureName );
*
* @return array
*/
- function getAliases();
+ public function getAliases();
/**
* Returns if the service has a certain alias or not.
@@ -92,7 +89,7 @@ function getAliases();
*
* @return boolean
*/
- function hasAlias( $alias );
+ public function hasAlias( $alias );
/**
* Returns the default zoomlevel for the mapping service.
@@ -101,7 +98,7 @@ function hasAlias( $alias );
*
* @return integer
*/
- function getDefaultZoom();
+ public function getDefaultZoom();
/**
* Returns the zoomlevel that shows the whole earth for the mapping service.
@@ -123,6 +120,6 @@ public function getEarthZoom();
*
* @return string
*/
- function getMapId( $increment = true );
+ public function getMapId( $increment = true );
}
\ No newline at end of file
diff --git a/includes/parserhooks/Maps_Coordinates.php b/includes/parserhooks/Maps_Coordinates.php
index 3e1c38bc7..1b52733aa 100644
--- a/includes/parserhooks/Maps_Coordinates.php
+++ b/includes/parserhooks/Maps_Coordinates.php
@@ -1,4 +1,5 @@
*/
@@ -90,11 +88,11 @@ protected function getDefaultParameters( $type ) {
*/
public function render( array $parameters ) {
$options = new \ValueFormatters\FormatterOptions( array(
- \ValueFormatters\GeoCoordinateFormatter::OPT_FORMAT => $parameters['format'],
- // TODO \ValueFormatters\GeoCoordinateFormatter::OPT_DIRECTIONAL => $parameters['directional']
+ GeoCoordinateFormatter::OPT_FORMAT => $parameters['format'],
+ GeoCoordinateFormatter::OPT_DIRECTIONAL => $parameters['directional']
) );
- $coordinateFormatter = new \ValueFormatters\GeoCoordinateFormatter( $options );
+ $coordinateFormatter = new GeoCoordinateFormatter( $options );
$output = $coordinateFormatter->format( $parameters['location'] );
diff --git a/includes/parserhooks/Maps_DisplayMap.php b/includes/parserhooks/Maps_DisplayMap.php
index a6136d973..e99c4cc8b 100644
--- a/includes/parserhooks/Maps_DisplayMap.php
+++ b/includes/parserhooks/Maps_DisplayMap.php
@@ -5,9 +5,6 @@
*
* @since 0.7
*
- * @file Maps_DisplayMap.php
- * @ingroup Maps
- *
* @licence GNU GPL v2+
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
*/
@@ -99,22 +96,22 @@ public static function getCommonMapParams() {
);
$params['polygons'] = array(
- // TODO 'type' => 'mapspolygon',
+ 'type' => 'mapspolygon',
'default' => array(),
'delimiter' => ';',
'islist' => true,
);
$params['circles'] = array(
+ 'type' => 'mapscircle',
'default' => array(),
- // TODO 'manipulations' => new MapsParamCircle( '~' ), // TODO
'delimiter' => ';',
'islist' => true,
);
$params['rectangles'] = array(
+ 'type' => 'mapsrectangle',
'default' => array(),
- // TODO 'manipulations' => new MapsParamRectangle( '~' ), // TODO
'delimiter' => ';',
'islist' => true,
);
@@ -198,11 +195,12 @@ public function render( array $parameters ) {
$parameters['zoom'] = false;
}
+ $this->parser->addTrackingCategory( 'maps-tracking-category' );
return $mapClass->renderMap( $parameters, $this->parser );
}
/**
- * Returns the parser function otpions.
+ * Returns the parser function options.
* @see ParserHook::getFunctionOptions
*
* @since 0.7
diff --git a/includes/parserhooks/Maps_Distance.php b/includes/parserhooks/Maps_Distance.php
index 7e79de744..45f2cccbb 100644
--- a/includes/parserhooks/Maps_Distance.php
+++ b/includes/parserhooks/Maps_Distance.php
@@ -6,9 +6,6 @@
*
* @since 0.7
*
- * @file Maps_Distance.php
- * @ingroup Maps
- *
* @licence GNU GPL v2+
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
*/
diff --git a/includes/parserhooks/Maps_Finddestination.php b/includes/parserhooks/Maps_Finddestination.php
index a9ea5e56c..66c5797bc 100644
--- a/includes/parserhooks/Maps_Finddestination.php
+++ b/includes/parserhooks/Maps_Finddestination.php
@@ -1,4 +1,5 @@
*/
-use DataValues\LatLongValue;
class MapsFinddestination extends ParserHook {
@@ -127,11 +124,11 @@ public function render( array $parameters ) {
);
$options = new \ValueFormatters\FormatterOptions( array(
- \ValueFormatters\GeoCoordinateFormatter::OPT_FORMAT => $parameters['format'],
- // TODO \ValueFormatters\GeoCoordinateFormatter::OPT_DIRECTIONAL => $parameters['directional']
+ GeoCoordinateFormatter::OPT_FORMAT => $parameters['format'],
+ GeoCoordinateFormatter::OPT_DIRECTIONAL => $parameters['directional']
) );
- $formatter = new \ValueFormatters\GeoCoordinateFormatter( $options );
+ $formatter = new GeoCoordinateFormatter( $options );
$geoCoords = new \DataValues\LatLongValue( $destination['lat'], $destination['lon'] );
$output = $formatter->format( $geoCoords );
diff --git a/includes/parserhooks/Maps_Geocode.php b/includes/parserhooks/Maps_Geocode.php
index 9504d3e88..05704a8f4 100644
--- a/includes/parserhooks/Maps_Geocode.php
+++ b/includes/parserhooks/Maps_Geocode.php
@@ -1,4 +1,5 @@
*/
@@ -115,11 +113,11 @@ public function render( array $parameters ) {
$coordinates = $parameters['location']->getCoordinates();
$options = new \ValueFormatters\FormatterOptions( array(
- \ValueFormatters\GeoCoordinateFormatter::OPT_FORMAT => $parameters['format'],
- // TODO \ValueFormatters\GeoCoordinateFormatter::OPT_DIRECTIONAL => $parameters['directional']
+ GeoCoordinateFormatter::OPT_FORMAT => $parameters['format'],
+ GeoCoordinateFormatter::OPT_DIRECTIONAL => $parameters['directional']
) );
- $formatter = new \ValueFormatters\GeoCoordinateFormatter( $options );
+ $formatter = new GeoCoordinateFormatter( $options );
return $formatter->format( $coordinates );
}
diff --git a/includes/parserhooks/Maps_Geodistance.php b/includes/parserhooks/Maps_Geodistance.php
index aca666fb1..34ee88d11 100644
--- a/includes/parserhooks/Maps_Geodistance.php
+++ b/includes/parserhooks/Maps_Geodistance.php
@@ -6,13 +6,9 @@
*
* @since 0.7
*
- * @file Maps_Geodistance.php
- * @ingroup Maps
- *
* @licence GNU GPL v2+
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
*/
-use ValueParsers\GeoCoordinateParser;
class MapsGeodistance extends ParserHook {
diff --git a/includes/parserhooks/Maps_MapsDoc.php b/includes/parserhooks/Maps_MapsDoc.php
index e10785c10..8d7ec5ac6 100644
--- a/includes/parserhooks/Maps_MapsDoc.php
+++ b/includes/parserhooks/Maps_MapsDoc.php
@@ -6,9 +6,6 @@
*
* @since 1.0
*
- * @file Maps_MapsDoc.php
- * @ingroup Maps
- *
* @licence GNU GPL v2+
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
*/
diff --git a/includes/parsers/CircleParser.php b/includes/parsers/CircleParser.php
new file mode 100644
index 000000000..6af0ac4bc
--- /dev/null
+++ b/includes/parsers/CircleParser.php
@@ -0,0 +1,79 @@
+
+ */
+class CircleParser extends StringValueParser {
+
+ protected $supportGeocoding = true;
+
+ // TODO: use options
+ protected $metaDataSeparator = '~';
+
+ /**
+ * @see StringValueParser::stringParse
+ *
+ * @since 3.0
+ *
+ * @param string $value
+ *
+ * @return Circle
+ */
+ public function stringParse( $value ) {
+ $metaData = explode( $this->metaDataSeparator , $value );
+ $circleData = explode( ':' , array_shift( $metaData ) );
+
+ $circle = new Circle( $this->stringToLatLongValue( $circleData[0] ), (float)$circleData[1] );
+
+ if ( $metaData !== array() ) {
+ $circle->setTitle( array_shift( $metaData ) );
+ }
+
+ if ( $metaData !== array() ) {
+ $circle->setText( array_shift( $metaData ) );
+ }
+
+ if ( $metaData !== array() ) {
+ $circle->setStrokeColor( array_shift( $metaData ) );
+ }
+
+ if ( $metaData !== array() ) {
+ $circle->setStrokeOpacity( array_shift( $metaData ) );
+ }
+
+ if ( $metaData !== array() ) {
+ $circle->setStrokeWeight( array_shift( $metaData ) );
+ }
+
+ return $circle;
+ }
+
+ protected function stringToLatLongValue( $location ) {
+ if ( $this->supportGeocoding && Geocoders::canGeocode() ) {
+ $location = Geocoders::attemptToGeocode( $location );
+
+ if ( $location === false ) {
+ throw new ParseException( 'Failed to parse or geocode' );
+ }
+
+ assert( $location instanceof LatLongValue );
+ return $location;
+ }
+
+ $parser = new GeoCoordinateParser( new \ValueParsers\ParserOptions() );
+ return $parser->parse( $location );
+ }
+
+}
diff --git a/includes/parsers/DistanceParser.php b/includes/parsers/DistanceParser.php
index c131383b1..e2f5fc33a 100644
--- a/includes/parsers/DistanceParser.php
+++ b/includes/parsers/DistanceParser.php
@@ -10,10 +10,6 @@
*
* @since 3.0
*
- * @file
- * @ingroup Maps
- * @ingroup ValueParser
- *
* @licence GNU GPL v2+
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
*/
diff --git a/includes/parsers/LineParser.php b/includes/parsers/LineParser.php
index 07f114df8..cdae58240 100644
--- a/includes/parsers/LineParser.php
+++ b/includes/parsers/LineParser.php
@@ -3,6 +3,7 @@
namespace Maps;
use DataValues\LatLongValue;
+use Maps\Elements\Line;
use ValueParsers\StringValueParser;
/**
@@ -10,21 +11,17 @@
*
* @since 3.0
*
- * @file
- * @ingroup Maps
- * @ingroup ValueParser
- *
* @licence GNU GPL v2+
* @author Kim Eik
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
*/
class LineParser extends StringValueParser {
+ protected $supportGeocoding = true;
+
// TODO: use options
protected $metaDataSeparator = '~';
- protected $supportGeocoding = true;
-
/**
* @see StringValueParser::stringParse
*
@@ -37,7 +34,7 @@ class LineParser extends StringValueParser {
public function stringParse( $value ) {
$parts = explode( $this->metaDataSeparator , $value );
- $line = new Line( $this->parseCoordinates(
+ $line = $this->constructShapeFromLatLongValues( $this->parseCoordinates(
explode( ':' , array_shift( $parts ) )
) );
@@ -78,6 +75,10 @@ protected function parseCoordinates( array $coordinateStrings ) {
return $coordinates;
}
+ protected function constructShapeFromLatLongValues( array $locations ) {
+ return new Line( $locations );
+ }
+
/**
* This method requires that parameters are positionally correct,
* 1. Link (one parameter) or bubble data (two parameters)
diff --git a/includes/parsers/LocationParser.php b/includes/parsers/LocationParser.php
index 00a811748..d4aebd36d 100644
--- a/includes/parsers/LocationParser.php
+++ b/includes/parsers/LocationParser.php
@@ -3,7 +3,9 @@
namespace Maps;
use DataValues\LatLongValue;
+use Maps\Elements\Location;
use MWException;
+use Title;
use ValueParsers\GeoCoordinateParser;
use ValueParsers\ParseException;
use ValueParsers\StringValueParser;
@@ -13,9 +15,6 @@
*
* @since 3.0
*
- * @file
- * @ingroup ValueParsers
- *
* @licence GNU GPL v2+
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
*/
@@ -39,12 +38,12 @@ public function stringParse( $value ) {
$metaData = explode( $separator, $value );
- $coordinates = $this->getCoordinates( array_shift( $metaData ) );
+ $coordinates = $this->stringToLatLongValue( array_shift( $metaData ) );
$location = new Location( $coordinates );
if ( $metaData !== array() ) {
- $location->setTitle( array_shift( $metaData ) );
+ $this->setTitleOrLink( $location, array_shift( $metaData ) );
}
if ( $metaData !== array() ) {
@@ -55,9 +54,49 @@ public function stringParse( $value ) {
$location->setIcon( array_shift( $metaData ) );
}
+ if ( $metaData !== array() ) {
+ $location->setGroup( array_shift( $metaData ) );
+ }
+
+ if ( $metaData !== array() ) {
+ $location->setInlineLabel( array_shift( $metaData ) );
+ }
+
return $location;
}
+ protected function setTitleOrLink( Location $location, $titleOrLink ) {
+ if ( $this->isLink( $titleOrLink ) ) {
+ $this->setLink( $location, $titleOrLink );
+ }
+ else {
+ $location->setTitle( $titleOrLink );
+ }
+ }
+
+ protected function isLink( $value ) {
+ return strpos( $value , 'link:' ) === 0;
+ }
+
+ protected function setLink( Location $location, $link ) {
+ $link = substr( $link, 5 );
+ $location->setLink( $this->getExpandedLink( $link ) );
+ }
+
+ protected function getExpandedLink( $link ) {
+ if ( filter_var( $link , FILTER_VALIDATE_URL , FILTER_FLAG_SCHEME_REQUIRED ) ) {
+ return $link;
+ }
+
+ $title = Title::newFromText( $link );
+
+ if ( $title === null ) {
+ return '';
+ }
+
+ return $title->getFullUrl();
+ }
+
/**
* @since 3.0
*
@@ -66,9 +105,9 @@ public function stringParse( $value ) {
* @return LatLongValue
* @throws ParseException
*/
- protected function getCoordinates( $location ) {
- if ( $this->supportGeocoding && \Maps\Geocoders::canGeocode() ) {
- $location = \Maps\Geocoders::attemptToGeocode( $location );
+ protected function stringToLatLongValue( $location ) {
+ if ( $this->supportGeocoding && Geocoders::canGeocode() ) {
+ $location = Geocoders::attemptToGeocode( $location );
if ( $location === false ) {
throw new ParseException( 'Failed to parse or geocode' );
diff --git a/includes/parsers/PolygonParser.php b/includes/parsers/PolygonParser.php
index 0a017df1c..62e2750eb 100644
--- a/includes/parsers/PolygonParser.php
+++ b/includes/parsers/PolygonParser.php
@@ -2,33 +2,40 @@
namespace Maps;
-use ValueParsers\StringValueParser;
+use Maps\Elements\Line;
+use Maps\Elements\Polygon;
/**
* ValueParser that parses the string representation of a polygon.
*
* @since 3.0
*
- * @file
- * @ingroup Maps
- * @ingroup ValueParser
- *
* @licence GNU GPL v2+
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
*/
-class PolygonParser extends StringValueParser {
-
- /**
- * @see StringValueParser::stringParse
- *
- * @since 3.0
- *
- * @param string $value
- *
- * @return Polygon
- */
- public function stringParse( $value ) {
- // TODO
+class PolygonParser extends LineParser {
+
+ protected function constructShapeFromLatLongValues( array $locations ) {
+ return new Polygon( $locations );
+ }
+
+ protected function handleCommonParams( array &$params, Line &$line ) {
+ parent::handleCommonParams( $params, $line );
+ $this->handlePolygonParams( $params, $line );
+ }
+
+ protected function handlePolygonParams( array &$params, Polygon &$polygon ) {
+ if ( $fillColor = array_shift( $params ) ) {
+ $polygon->setFillColor( $fillColor );
+ }
+
+ if ( $fillOpacity = array_shift( $params ) ) {
+ $polygon->setFillOpacity( $fillOpacity );
+ }
+
+ if ( $showOnlyOnHover = array_shift( $params ) ) {
+ $polygon->setOnlyVisibleOnHover( strtolower( trim( $showOnlyOnHover ) ) === 'on' );
+ }
}
}
diff --git a/includes/parsers/RectangleParser.php b/includes/parsers/RectangleParser.php
new file mode 100644
index 000000000..e7672ecb5
--- /dev/null
+++ b/includes/parsers/RectangleParser.php
@@ -0,0 +1,82 @@
+
+ */
+class RectangleParser extends StringValueParser {
+
+ protected $supportGeocoding = true;
+
+ // TODO: use options
+ protected $metaDataSeparator = '~';
+
+ /**
+ * @see StringValueParser::stringParse
+ *
+ * @since 3.0
+ *
+ * @param string $value
+ *
+ * @return Rectangle
+ */
+ public function stringParse( $value ) {
+ $metaData = explode( $this->metaDataSeparator , $value );
+ $rectangleData = explode( ':' , array_shift( $metaData ) );
+
+ $rectangle = new Rectangle(
+ $this->stringToLatLongValue( $rectangleData[0] ),
+ $this->stringToLatLongValue( $rectangleData[1] )
+ );
+
+ if ( $metaData !== array() ) {
+ $rectangle->setTitle( array_shift( $metaData ) );
+ }
+
+ if ( $metaData !== array() ) {
+ $rectangle->setText( array_shift( $metaData ) );
+ }
+
+ if ( $metaData !== array() ) {
+ $rectangle->setStrokeColor( array_shift( $metaData ) );
+ }
+
+ if ( $metaData !== array() ) {
+ $rectangle->setStrokeOpacity( array_shift( $metaData ) );
+ }
+
+ if ( $metaData !== array() ) {
+ $rectangle->setStrokeWeight( array_shift( $metaData ) );
+ }
+
+ return $rectangle;
+ }
+
+ protected function stringToLatLongValue( $location ) {
+ if ( $this->supportGeocoding && Geocoders::canGeocode() ) {
+ $location = Geocoders::attemptToGeocode( $location );
+
+ if ( $location === false ) {
+ throw new ParseException( 'Failed to parse or geocode' );
+ }
+
+ assert( $location instanceof LatLongValue );
+ return $location;
+ }
+
+ $parser = new GeoCoordinateParser( new \ValueParsers\ParserOptions() );
+ return $parser->parse( $location );
+ }
+
+}
diff --git a/includes/parsers/WmsOverlayParser.php b/includes/parsers/WmsOverlayParser.php
index fb4b8df4b..0b918ab5e 100644
--- a/includes/parsers/WmsOverlayParser.php
+++ b/includes/parsers/WmsOverlayParser.php
@@ -2,8 +2,7 @@
namespace Maps;
-use MWException;
-use ValueParsers\GeoCoordinateParser;
+use Maps\Elements\WmsOverlay;
use ValueParsers\ParseException;
use ValueParsers\StringValueParser;
@@ -12,9 +11,6 @@
*
* @since 3.0
*
- * @file
- * @ingroup ValueParsers
- *
* @licence GNU GPL v2+
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
*/
diff --git a/includes/properties/iBubbleMapElement.php b/includes/properties/iBubbleMapElement.php
index d78606912..74203daff 100644
--- a/includes/properties/iBubbleMapElement.php
+++ b/includes/properties/iBubbleMapElement.php
@@ -3,12 +3,12 @@
interface iBubbleMapElement {
/**
- * @param \text $text
+ * @param string $text
*/
public function setText( $text );
/**
- * @return \text
+ * @return string
*/
public function getText();
diff --git a/includes/services/GoogleMaps3/GoogleMaps3.php b/includes/services/GoogleMaps3/GoogleMaps3.php
index cf02f05ac..67b2a398e 100644
--- a/includes/services/GoogleMaps3/GoogleMaps3.php
+++ b/includes/services/GoogleMaps3/GoogleMaps3.php
@@ -4,15 +4,11 @@
* This groupe contains all Google Maps v3 related files of the Maps extension.
*
* @defgroup MapsGoogleMaps3 Google Maps v3
- * @ingroup Maps
*/
/**
* This file holds the hook and initialization for the Google Maps v3 service.
*
- * @file GoogleMaps3.php
- * @ingroup MapsGoogleMaps3
- *
* @licence GNU GPL v2+
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
*/
@@ -22,12 +18,12 @@
}
call_user_func( function() {
- global $wgResourceModules, $egMapsScriptPath, $wgHooks;
+ global $wgResourceModules, $wgHooks;
$wgResourceModules['ext.maps.googlemaps3'] = array(
'dependencies' => array( 'ext.maps.common' ),
'localBasePath' => __DIR__,
- 'remoteBasePath' => $egMapsScriptPath . '/includes/services/GoogleMaps3',
+ 'remoteExtPath' => '..' . substr( __DIR__, strlen( $GLOBALS['IP'] ) ),
'group' => 'ext.maps',
'scripts' => array(
'jquery.googlemap.js',
@@ -37,12 +33,14 @@
'maps-googlemaps3-incompatbrowser',
'maps-copycoords-prompt',
'maps-searchmarkers-text',
+ 'maps-fullscreen-button',
+ 'maps-fullscreen-button-tooltip',
)
);
$wgResourceModules['ext.maps.gm3.markercluster'] = array(
'localBasePath' => __DIR__ . '/gm3-util-library',
- 'remoteBasePath' => $egMapsScriptPath . '/includes/services/GoogleMaps3/gm3-util-library',
+ 'remoteExtPath' => '..' . substr( __DIR__, strlen( $GLOBALS['IP'] ) ) . 'gm3-util-library',
'group' => 'ext.maps',
'scripts' => array(
'markerclusterer.js',
@@ -51,7 +49,7 @@
$wgResourceModules['ext.maps.gm3.markerwithlabel'] = array(
'localBasePath' => __DIR__ . '/gm3-util-library',
- 'remoteBasePath' => $egMapsScriptPath . '/includes/services/GoogleMaps3/gm3-util-library',
+ 'remoteExtPath' => '..' . substr( __DIR__, strlen( $GLOBALS['IP'] ) ) . 'gm3-util-library',
'group' => 'ext.maps',
'scripts' => array(
'markerwithlabel.js',
@@ -63,17 +61,18 @@
$wgResourceModules['ext.maps.gm3.geoxml'] = array(
'localBasePath' => __DIR__ . '/geoxml3',
- 'remoteBasePath' => $egMapsScriptPath . '/includes/services/GoogleMaps3/geoxml3',
+ 'remoteExtPath' => '..' . substr( __DIR__, strlen( $GLOBALS['IP'] ) ) . 'geoxml3',
'group' => 'ext.maps',
'scripts' => array(
'geoxml3.js',
'ZipFile.complete.js', //kmz handling
+ 'ProjectedOverlay.js', //Overlay handling
),
);
$wgResourceModules['ext.maps.gm3.earth'] = array(
'localBasePath' => __DIR__ . '/gm3-util-library',
- 'remoteBasePath' => $egMapsScriptPath . '/includes/services/GoogleMaps3/gm3-util-library',
+ 'remoteExtPath' => '..' . substr( __DIR__, strlen( $GLOBALS['IP'] ) ) . 'gm3-util-library',
'group' => 'ext.maps',
'scripts' => array(
'googleearth-compiled.js',
diff --git a/includes/services/GoogleMaps3/Maps_GoogleMaps3.php b/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
index 34c050704..aed3927c7 100644
--- a/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
+++ b/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
@@ -6,9 +6,6 @@
*
* @since 0.7
*
- * @file Maps_GoogleMaps3.php
- * @ingroup MapsGoogleMaps3
- *
* @licence GNU GPL v2+
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
*/
@@ -69,7 +66,7 @@ class MapsGoogleMaps3 extends MapsMappingService {
*
* @since 0.6.6
*/
- function __construct( $serviceName ) {
+ public function __construct( $serviceName ) {
parent::__construct(
$serviceName,
array( 'googlemaps', 'google' )
@@ -219,6 +216,12 @@ public function addParameterInfo( array &$params ) {
'message' => 'maps-googlemaps3-par-searchmarkers',
// new CriterionSearchMarkers() FIXME
);
+
+ $params['enablefullscreen'] = array(
+ 'type' => 'boolean',
+ 'default' => false,
+ 'message' => 'maps-googlemaps3-par-enable-fullscreen',
+ );
}
/**
diff --git a/includes/services/GoogleMaps3/geoxml3/ProjectedOverlay.js b/includes/services/GoogleMaps3/geoxml3/ProjectedOverlay.js
new file mode 100644
index 000000000..4056c2c37
--- /dev/null
+++ b/includes/services/GoogleMaps3/geoxml3/ProjectedOverlay.js
@@ -0,0 +1,139 @@
+// Create an overlay on the map from a projected image - Maps v3...
+// Author. John D. Coryat 05/2009
+// USNaviguide LLC - http://www.usnaviguide.com
+// Thanks go to Mile Williams EInsert: http://econym.googlepages.com/einsert.js, Google's GOverlay Example and Bratliff's suggestion...
+// Opacity code from TPhoto: http://gmaps.tommangan.us/addtphoto.html
+// This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//
+// Parameters:
+// map: This Map
+// imageUrl: URL of the image (Mandatory)
+// bounds: Bounds object of image destination (Mandatory)
+// Options:
+// addZoom: Added Zoom factor as a parameter to the imageUrl (include complete parameter, including separater like '?zoom='
+// percentOpacity: Default 50, percent opacity to use when the image is loaded 0-100.
+// id: Default imageUrl, ID of the div
+//
+
+function ProjectedOverlay(map, imageUrl, bounds, opts)
+{
+ google.maps.OverlayView.call(this);
+
+ this.map_ = map;
+ this.url_ = imageUrl ;
+ this.bounds_ = bounds ;
+ this.addZ_ = opts.addZoom || '' ; // Add the zoom to the image as a parameter
+ this.id_ = opts.id || this.url_ ; // Added to allow for multiple images
+ this.percentOpacity_ = opts.percentOpacity || 50 ;
+
+ this.setMap(map);
+}
+
+ProjectedOverlay.prototype = new google.maps.OverlayView();
+
+ProjectedOverlay.prototype.createElement = function()
+{
+ var panes = this.getPanes() ;
+ var div = this.div_ ;
+
+ if (!div)
+ {
+ div = this.div_ = document.createElement("div");
+ div.style.position = "absolute" ;
+ div.setAttribute('id',this.id_) ;
+ this.div_ = div ;
+ this.lastZoom_ = -1 ;
+ if( this.percentOpacity_ )
+ {
+ this.setOpacity(this.percentOpacity_) ;
+ }
+ panes.overlayLayer.appendChild(div);
+ }
+}
+
+// Remove the main DIV from the map pane
+
+ProjectedOverlay.prototype.remove = function()
+{
+ if (this.div_)
+ {
+ this.div_.parentNode.removeChild(this.div_);
+ this.div_ = null;
+ this.setMap(null);
+ }
+}
+
+// Redraw based on the current projection and zoom level...
+
+ProjectedOverlay.prototype.draw = function(firstTime)
+{
+ // Creates the element if it doesn't exist already.
+
+ this.createElement();
+
+ if (!this.div_)
+ {
+ return ;
+ }
+
+ var c1 = this.get('projection').fromLatLngToDivPixel(this.bounds_.getSouthWest());
+ var c2 = this.get('projection').fromLatLngToDivPixel(this.bounds_.getNorthEast());
+
+ if (!c1 || !c2) return;
+
+ // Now position our DIV based on the DIV coordinates of our bounds
+
+ this.div_.style.width = Math.abs(c2.x - c1.x) + "px";
+ this.div_.style.height = Math.abs(c2.y - c1.y) + "px";
+ this.div_.style.left = Math.min(c2.x, c1.x) + "px";
+ this.div_.style.top = Math.min(c2.y, c1.y) + "px";
+
+ // Do the rest only if the zoom has changed...
+
+ if ( this.lastZoom_ == this.map_.getZoom() )
+ {
+ return ;
+ }
+
+ this.lastZoom_ = this.map_.getZoom() ;
+
+ var url = this.url_ ;
+
+ if ( this.addZ_ )
+ {
+ url += this.addZ_ + this.map_.getZoom() ;
+ }
+
+ this.div_.innerHTML = '
' ;
+}
+
+ProjectedOverlay.prototype.setOpacity=function(opacity)
+{
+ if (opacity < 0)
+ {
+ opacity = 0 ;
+ }
+ if(opacity > 100)
+ {
+ opacity = 100 ;
+ }
+ var c = opacity/100 ;
+
+ if (typeof(this.div_.style.filter) =='string')
+ {
+ this.div_.style.filter = 'alpha(opacity:' + opacity + ')' ;
+ }
+ if (typeof(this.div_.style.KHTMLOpacity) == 'string' )
+ {
+ this.div_.style.KHTMLOpacity = c ;
+ }
+ if (typeof(this.div_.style.MozOpacity) == 'string')
+ {
+ this.div_.style.MozOpacity = c ;
+ }
+ if (typeof(this.div_.style.opacity) == 'string')
+ {
+ this.div_.style.opacity = c ;
+ }
+}
+
diff --git a/includes/services/GoogleMaps3/jquery.googlemap.js b/includes/services/GoogleMaps3/jquery.googlemap.js
index ca6cfa19e..909ad4c16 100644
--- a/includes/services/GoogleMaps3/jquery.googlemap.js
+++ b/includes/services/GoogleMaps3/jquery.googlemap.js
@@ -39,19 +39,41 @@
this.circles = [];
- /**
- * All rectangles on the map
- */
- this.rectangles = [];
+ /**
+ * All rectangles on the map
+ */
+ this.rectangles = [];
+
+
+ /**
+ * All image overlays on the map
+ */
+ this.imageoverlays = [];
- /**
- * All image overlays on the map
- */
- this.imageoverlays = [];
+ var getBounds = function() {
+ if (( options.centre === false || options.zoom === false ) && options.locations.length > 1) {
+ bounds = new google.maps.LatLngBounds();
+
+ for (var i = _this.markers.length - 1; i >= 0; i--) {
+ bounds.extend(_this.markers[i].getPosition());
+ }
+ return bounds;
+ }
+ return null;
+ };
+
+ var setZoom = function(bounds) {
+ if (options.zoom === false) {
+ _this.map.fitBounds(bounds);
+ }
+ else {
+ _this.map.setZoom(options.zoom);
+ }
+ };
- /**
+ /**
* Creates a new marker with the provided data,
* adds it to the map, and returns it.
* @param {Object} markerData Contains the fields lat, lon, title, text and icon
@@ -111,7 +133,8 @@
'ext.maps.gm3.markerwithlabel',
function() {
marker = new MarkerWithLabel( markerOptions );
- return addToMapAndHandlers( marker );
+ addToMapAndHandlers( marker );
+ setZoom(getBounds());
}
);
}
@@ -184,7 +207,61 @@
// If there are any non-Google KML/KMZ layers, load the geoxml library and use it to add these layers.
if (options.kml.length != 0) {
mw.loader.using('ext.maps.gm3.geoxml', function () {
- var geoXml = new geoXML3.parser({ map:_this.map, zoom:options.kmlrezoom });
+
+ function addToCopyCoords(doc){
+ if(options.copycoords){
+ for(var i = 0; i < doc.length; i++){
+ addCopyCoordsOnRightClick([
+ doc[i].gpolygons,
+ doc[i].gpolylines,
+ doc[i].ggroundoverlays
+ ]);
+ }
+ }
+ }
+
+
+ var geoXml = new geoXML3.parser({
+ map:_this.map,
+ zoom:options.kmlrezoom,
+ failedParse:function(){
+ alert(mediaWiki.msg('maps-kml-parsing-failed'));
+ }
+ });
+ geoXml.options.afterParse = function(docs){
+ //add toggle functionality
+ var toggleDiv = document.createElement('div');
+ toggleDiv.style.backgroundColor = 'white';
+ toggleDiv.style.marginTop = '5px';
+ toggleDiv.style.padding = '5px';
+ toggleDiv.style.border = '1px solid grey';
+ for(var i = docs.length-1; i >= 0; i--){
+ (function(doc){
+ var label = document.createElement('label');
+ label.style.display = 'block';
+ var text = document.createTextNode(doc.baseUrl.substring(doc.baseDir.length));
+ var checkbox = document.createElement('input');
+ checkbox.setAttribute('type','checkbox');
+ checkbox.style.verticalAlign = '-0.2em';
+ checkbox.checked = true;
+ checkbox.onclick = function(){
+ if(this.checked){
+ geoXml.showDocument(doc);
+ }else{
+ geoXml.hideDocument(doc);
+ }
+ };
+ label.appendChild(checkbox);
+ label.appendChild(text);
+
+ toggleDiv.appendChild(label);
+
+ console.log(toggleDiv);
+ })(docs[i]);
+ }
+ _this.map.controls[google.maps.ControlPosition.TOP_RIGHT].push(toggleDiv);
+ };
+
geoXml.parse(options.kml);
});
}
@@ -319,22 +396,22 @@
});
};
- this.addImageOverlay = function(properties){
- var imageBounds = new google.maps.LatLngBounds(
- new google.maps.LatLng(properties.sw.lat,properties.sw.lon),
- new google.maps.LatLng(properties.ne.lat,properties.ne.lon)
- );
+ this.addImageOverlay = function(properties){
+ var imageBounds = new google.maps.LatLngBounds(
+ new google.maps.LatLng(properties.sw.lat,properties.sw.lon),
+ new google.maps.LatLng(properties.ne.lat,properties.ne.lon)
+ );
- var image = new google.maps.GroundOverlay(properties.image,imageBounds);
- image.setMap(this.map);
+ var image = new google.maps.GroundOverlay(properties.image,imageBounds);
+ image.setMap(this.map);
- this.imageoverlays.push(image);
+ this.imageoverlays.push(image);
- //add click event
- google.maps.event.addListener(image, "click", function (event) {
- openBubbleOrLink.call(this, properties, event, image);
- });
- };
+ //add click event
+ google.maps.event.addListener(image, "click", function (event) {
+ openBubbleOrLink.call(this, properties, event, image);
+ });
+ };
this.removePolygon = function (polygon) {
@@ -357,7 +434,20 @@
this.polygon = [];
};
+ //Rezoom's the map to show all visible markers.
+ this.reZoom = function(){
+ var bounds = new google.maps.LatLngBounds();
+ for(var x = 0; x < this.markers.length; x++){
+ var marker = this.markers[x];
+ if (marker.getVisible() === true) {
+ bounds.extend(marker.getPosition());
+ }
+ }
+ this.map.fitBounds(bounds);
+ }
+
this.setup = function () {
+
var showEarth = $.inArray('earth', options.types) !== -1;
// If there are any non-Google KML/KMZ layers, load the geoxml library and use it to add these layers.
@@ -446,22 +536,9 @@
layer.setMap(map);
}
- var bounds;
-
- if (( options.centre === false || options.zoom === false ) && options.locations.length > 1) {
- bounds = new google.maps.LatLngBounds();
-
- for (var i = this.markers.length - 1; i >= 0; i--) {
- bounds.extend(this.markers[i].getPosition());
- }
- }
+ var bounds = getBounds();
- if (options.zoom === false) {
- map.fitBounds(bounds);
- }
- else {
- map.setZoom(options.zoom);
- }
+ setZoom(bounds);
var centre;
@@ -602,28 +679,6 @@
}
}
- /**
- * used in display_line functionality
- * allows the copy to clipboard of coordinates
- */
- if (options.copycoords) {
- function addRightClickListener(object) {
- google.maps.event.addListener(object, 'rightclick', function (event) {
- prompt(mediaWiki.msg('maps-copycoords-prompt'), event.latLng.lat() + ',' + event.latLng.lng());
- });
- }
-
- for (var x = 0; x < this.markers.length; x++) {
- addRightClickListener(this.markers[x]);
- }
-
- for (var x = 0; x < this.lines.length; x++) {
- addRightClickListener(this.lines[x]);
- }
-
- addRightClickListener(this.map);
- }
-
/**
* Allows grouping of markers.
*/
@@ -638,6 +693,8 @@
);
}
+
+
if (options.searchmarkers) {
var searchBoxValue = mediaWiki.msg('maps-searchmarkers-text');
var searchBox = $('');
@@ -647,34 +704,55 @@
searchBox.appendTo(searchContainer);
map.controls[google.maps.ControlPosition.TOP_RIGHT].push(searchContainer);
+ //prevents markers and other map objects to be placed beneath searchfield
+ google.maps.event.addListenerOnce(map, 'bounds_changed', function () {
+ map.panBy(0,-30);
+ });
+
+
searchBox.on('keyup',function (e) {
for (var i = 0; i < _this.markers.length; i++) {
- var haystack = '';
- var marker = _this.markers[i];
- if (options.searchmarkers == 'title') {
- haystack = marker.title;
- } else if (options.searchmarkers == 'all') {
- haystack = marker.title + marker.text;
- }
-
- marker.setVisible(haystack.toLowerCase().indexOf(e.target.value.toLowerCase()) != -1);
+ var haystack = '';
+ var marker = _this.markers[i];
+ if (options.searchmarkers == 'title') {
+ haystack = marker.title;
+ } else if (options.searchmarkers == 'all') {
+ haystack = marker.title + marker.text;
}
- }).on('focusin', function () {
+
+ var visible = haystack.toLowerCase().indexOf(e.target.value.toLowerCase()) != -1;
+ marker.setVisible(visible);
+ }
+ _this.reZoom();
+ }).on('focusin',function () {
if ($(this).val() === searchBoxValue) {
$(this).val('');
}
- }).on('focusout', function () {
+ }).on('focusout', function () {
if ($(this).val() === '') {
$(this).val(searchBoxValue);
}
- });
+ });
+ }
+
+ if(options.imageoverlays){
+ for (var i = 0; i < options.imageoverlays.length; i++) {
+ this.addImageOverlay(options.imageoverlays[i]);
+ }
}
- if(options.imageoverlays){
- for (var i = 0; i < options.imageoverlays.length; i++) {
- this.addImageOverlay(options.imageoverlays[i]);
- }
- }
+ if (options.copycoords) {
+
+ addCopyCoordsOnRightClick([
+ this.lines,
+ this.circles,
+ this.polygons,
+ this.markers,
+ this.rectangles,
+ this.imageoverlays,
+ this.map
+ ]);
+ }
if (options.wmsoverlay) {
var wmsOptions = {
@@ -720,8 +798,66 @@
map.mapTypes.set('OpenLayers', openlayersWMS);
map.setMapTypeId('OpenLayers');
}
+
+ //Add custom controls
+ // - Fullscreen
+ if(options.enablefullscreen){
+ this.map.controls[google.maps.ControlPosition.TOP_RIGHT].push(new FullscreenControl(this.map));
+ }
};
+ function FullscreenControl(map) {
+
+ var controlDiv = document.createElement('div');
+ controlDiv.style.padding = '5px';
+ controlDiv.index = 1;
+
+ var controlUI = document.createElement('div');
+ controlUI.style.backgroundColor = 'white';
+ controlUI.style.borderStyle = 'solid';
+ controlUI.style.borderWidth = '1px';
+ controlUI.style.cursor = 'pointer';
+ controlUI.style.textAlign = 'center';
+ controlUI.title = mediaWiki.msg('maps-fullscreen-button-tooltip');
+ controlDiv.appendChild(controlUI);
+
+ var controlText = document.createElement('div');
+ controlText.style.fontFamily = 'Arial,sans-serif';
+ controlText.style.fontSize = '12px';
+ controlText.style.paddingLeft = '4px';
+ controlText.style.paddingRight = '4px';
+ controlText.innerHTML = mediaWiki.msg('maps-fullscreen-button');
+ controlUI.appendChild(controlText);
+
+ google.maps.event.addDomListener(controlUI, 'click', function() {
+ var mapDiv = $(map.getDiv());
+ if(mapDiv.data('preFullscreenCss') != null){
+ mapDiv.css(mapDiv.data('preFullscreenCss'));
+ mapDiv.removeData('preFullscreenCss');
+ }else{
+ var fullscreenCss = {
+ position:'fixed',
+ top: 0,
+ left:0,
+ width:'100%',
+ height:'100%',
+ zIndex:10000
+ };
+ var oldState = {};
+ for(var cssProp in fullscreenCss){
+ oldState[cssProp] = mapDiv.css(cssProp);
+ }
+ mapDiv.data('preFullscreenCss',oldState);
+ mapDiv.css(fullscreenCss);
+ }
+
+
+ });
+
+ return controlDiv;
+ }
+
+
function openBubbleOrLink(properties, event, obj) {
if (properties.link) {
window.location.href = properties.link;
@@ -754,6 +890,18 @@
}
}
+ function addCopyCoordsOnRightClick(object) {
+ if(object instanceof Array){
+ for (var x = 0; x < object.length; x++) {
+ addCopyCoordsOnRightClick(object[x]);
+ }
+ }else{
+ google.maps.event.addListener(object, 'rightclick', function (event) {
+ prompt(mediaWiki.msg('maps-copycoords-prompt'), event.latLng.lat() + ',' + event.latLng.lng());
+ });
+ }
+ }
+
//Complete path to OpenLayers WMS layer
this.setup();
diff --git a/includes/services/Leaflet/Leaflet.php b/includes/services/Leaflet/Leaflet.php
index 24f803bf3..11f1126ab 100644
--- a/includes/services/Leaflet/Leaflet.php
+++ b/includes/services/Leaflet/Leaflet.php
@@ -4,15 +4,11 @@
* This groupe contains all Leaflet related files of the Maps extension.
*
* @defgroup Leaflet
- * @ingroup Maps
*/
/**
* This file holds the hook and initialization for the Leaflet service.
*
- * @file
- * @ingroup Leaflet
- *
* @licence GNU GPL v2+
* @author Pavel Astakhov < pastakhov@yandex.ru >
*/
@@ -23,7 +19,7 @@
}
call_user_func( function() {
- global $wgHooks, $wgResourceModules, $egMapsScriptPath;
+ global $wgHooks, $wgResourceModules;
// Specify the function that will initialize the parser function.
$wgHooks['MappingServiceLoad'][] = 'efMapsInitLeaflet';
@@ -31,17 +27,12 @@
$wgResourceModules['ext.maps.leaflet'] = array(
'dependencies' => array( 'ext.maps.common' ),
'localBasePath' => __DIR__,
- 'remoteBasePath' => $egMapsScriptPath . '/includes/services/Leaflet',
+ 'remoteExtPath' => '..' . substr( __DIR__, strlen( $GLOBALS['IP'] ) ),
'group' => 'ext.maps',
'scripts' => array(
- 'leaflet/leaflet.js',
'jquery.leaflet.js',
'ext.maps.leaflet.js',
),
- 'styles' => array(
- 'leaflet/leaflet.css',
- 'leaflet/leaflet.ie.css',
- ),
'messages' => array(
'maps-markers',
'maps-copycoords-prompt',
diff --git a/includes/services/Leaflet/Maps_Leaflet.php b/includes/services/Leaflet/Maps_Leaflet.php
index 2b37469e7..109a6c1b5 100644
--- a/includes/services/Leaflet/Maps_Leaflet.php
+++ b/includes/services/Leaflet/Maps_Leaflet.php
@@ -4,9 +4,6 @@
* Class holding information and functionality specific to Leaflet.
* This information and features can be used by any mapping feature.
*
- * @file Maps_Leaflet.php
- * @ingroup Leaflet
- *
* @licence GNU GPL v2+
* @author Pavel Astakhov < pastakhov@yandex.ru >
*/
@@ -15,7 +12,7 @@ class MapsLeaflet extends MapsMappingService {
/**
* Constructor
*/
- function __construct( $serviceName ) {
+ public function __construct( $serviceName ) {
parent::__construct(
$serviceName,
array( 'leafletmaps', 'leaflet' )
@@ -86,4 +83,14 @@ public function getResourceModules() {
array( 'ext.maps.leaflet' )
);
}
+
+ protected function getDependencies() {
+ $leafletPath = $GLOBALS['wgScriptPath'] . '/extensions/Maps/includes/services/Leaflet/leaflet';
+ return array(
+ Html::linkedStyle( "$leafletPath/leaflet.css" ),
+ '',
+ Html::linkedScript( "$leafletPath/leaflet.js" ),
+ );
+ }
+
}
diff --git a/includes/services/OpenLayers/Maps_OpenLayers.php b/includes/services/OpenLayers/Maps_OpenLayers.php
index e58f41de6..218651618 100644
--- a/includes/services/OpenLayers/Maps_OpenLayers.php
+++ b/includes/services/OpenLayers/Maps_OpenLayers.php
@@ -6,9 +6,6 @@
*
* @since 0.1
*
- * @file Maps_OpenLayers.php
- * @ingroup MapsOpenLayers
- *
* @licence GNU GPL v2+
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
*/
@@ -19,7 +16,7 @@ class MapsOpenLayers extends MapsMappingService {
*
* @since 0.6.6
*/
- function __construct( $serviceName ) {
+ public function __construct( $serviceName ) {
parent::__construct(
$serviceName,
array( 'layers', 'openlayer' )
@@ -190,7 +187,10 @@ public function getResourceModules() {
* @return array
*/
public function getConfigVariables() {
- return array_merge( parent::getConfigVariables(), array( 'egMapsScriptPath' => $GLOBALS['egMapsScriptPath'] ) );
+ return array_merge(
+ parent::getConfigVariables(),
+ array( 'egMapsScriptPath' => $GLOBALS['wgScriptPath'] . '/extensions/Maps/' )
+ );
}
}
diff --git a/includes/services/OpenLayers/OpenLayers.php b/includes/services/OpenLayers/OpenLayers.php
index 5c6114b06..dcff5a5ab 100644
--- a/includes/services/OpenLayers/OpenLayers.php
+++ b/includes/services/OpenLayers/OpenLayers.php
@@ -4,15 +4,11 @@
* This group contains all OpenLayers related files of the Maps extension.
*
* @defgroup MapsOpenLayers OpenLayers
- * @ingroup Maps
*/
/**
* This file holds the hook and initialization for the OpenLayers service.
*
- * @file OpenLayers.php
- * @ingroup MapsOpenLayers
- *
* @licence GNU GPL v2+
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
*/
@@ -22,12 +18,12 @@
}
call_user_func( function() {
- global $wgHooks, $wgResourceModules, $egMapsScriptPath, $wgAutoloadClasses;
+ global $wgHooks, $wgResourceModules, $wgAutoloadClasses;
$wgResourceModules['ext.maps.openlayers'] = array(
'dependencies' => array( 'ext.maps.common' ),
'localBasePath' => __DIR__,
- 'remoteBasePath' => $egMapsScriptPath . '/includes/services/OpenLayers',
+ 'remoteExtPath' => '..' . substr( __DIR__, strlen( $GLOBALS['IP'] ) ),
'group' => 'ext.maps',
'scripts' => array(
'OpenLayers/OpenLayers.js',
diff --git a/includes/specials/SpecialMapEditor.php b/includes/specials/SpecialMapEditor.php
index 1c0ba758f..1a5ccb94a 100644
--- a/includes/specials/SpecialMapEditor.php
+++ b/includes/specials/SpecialMapEditor.php
@@ -5,9 +5,6 @@
*
* @since 2.0
*
- * @file
- * @ingroup Maps
- *
* @licence GNU GPL v2+
* @author Kim Eik
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 5b7bf8de0..05c605dc5 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -20,6 +20,7 @@
includes
+ src
diff --git a/includes/elements/BaseElement.php b/src/Maps/Elements/BaseElement.php
similarity index 97%
rename from includes/elements/BaseElement.php
rename to src/Maps/Elements/BaseElement.php
index 4c50f6ca2..5e7935f8f 100644
--- a/includes/elements/BaseElement.php
+++ b/src/Maps/Elements/BaseElement.php
@@ -1,13 +1,15 @@
diff --git a/includes/elements/Circle.php b/src/Maps/Elements/Circle.php
similarity index 76%
rename from includes/elements/Circle.php
rename to src/Maps/Elements/Circle.php
index 16b422031..a4a31b9f7 100644
--- a/includes/elements/Circle.php
+++ b/src/Maps/Elements/Circle.php
@@ -1,16 +1,13 @@
@@ -31,8 +28,18 @@ class Circle extends \MapsBaseFillableElement {
/**
* @param LatLongValue $circleCentre
* @param integer|float $circleRadius
+ *
+ * @throws InvalidArgumentException
*/
- public function __construct( LatLongValue $circleCentre , $circleRadius ) {
+ public function __construct( LatLongValue $circleCentre, $circleRadius ) {
+ if ( !is_float( $circleRadius ) && !is_int( $circleRadius ) ) {
+ throw new InvalidArgumentException( '$circleRadius must be a float or int' );
+ }
+
+ if ( $circleRadius <= 0 ) {
+ throw new InvalidArgumentException( '$circleRadius must be greater than zero' );
+ }
+
parent::__construct();
$this->setCircleCentre( $circleCentre );
diff --git a/includes/elements/ImageOverlay.php b/src/Maps/Elements/ImageOverlay.php
similarity index 78%
rename from includes/elements/ImageOverlay.php
rename to src/Maps/Elements/ImageOverlay.php
index fc841b9cf..b3dce59da 100644
--- a/includes/elements/ImageOverlay.php
+++ b/src/Maps/Elements/ImageOverlay.php
@@ -1,15 +1,13 @@
@@ -32,8 +30,14 @@ class ImageOverlay extends Rectangle {
* @param LatLongValue $boundsNorthEast
* @param LatLongValue $boundsSouthWest
* @param string $image
+ *
+ * @throws InvalidArgumentException
*/
public function __construct( LatLongValue $boundsNorthEast, LatLongValue $boundsSouthWest, $image ) {
+ if ( !is_string( $image ) ) {
+ throw new InvalidArgumentException( '$image must be a string' );
+ }
+
parent::__construct( $boundsNorthEast, $boundsSouthWest );
$this->image = $image;
}
diff --git a/includes/elements/Line.php b/src/Maps/Elements/Line.php
similarity index 87%
rename from includes/elements/Line.php
rename to src/Maps/Elements/Line.php
index 66d73beb7..6bbb6d143 100644
--- a/includes/elements/Line.php
+++ b/src/Maps/Elements/Line.php
@@ -1,16 +1,15 @@
@@ -30,12 +29,12 @@ class Line extends \MapsBaseStrokableElement {
*
* @param LatLongValue[] $coordinates
*
- * @throws MWException
+ * @throws InvalidArgumentException
*/
public function __construct( array $coordinates = array() ) {
foreach ( $coordinates as $coordinate ) {
if ( !( $coordinate instanceof LatLongValue ) ) {
- throw new MWException( 'Can only construct Maps\Line with DataValues\LatLongValue objects' );
+ throw new InvalidArgumentException( 'Can only construct Line with LatLongValue objects' );
}
}
diff --git a/includes/elements/Location.php b/src/Maps/Elements/Location.php
similarity index 93%
rename from includes/elements/Location.php
rename to src/Maps/Elements/Location.php
index 6b83f9e7c..91d4ec24c 100644
--- a/includes/elements/Location.php
+++ b/src/Maps/Elements/Location.php
@@ -1,8 +1,9 @@
* @author Daniel Werner
*/
-class Location extends \Maps\BaseElement {
+class Location extends BaseElement {
/**
* @since 3.0
@@ -61,7 +60,7 @@ class Location extends \Maps\BaseElement {
protected $visitedIcon = '';
/**
- * Creates and returns a new instance of a \Maps\Location from a latitude and longitude.
+ * Creates and returns a new instance of a Location from a latitude and longitude.
*
* @since 1.0
*
@@ -75,7 +74,7 @@ public static function newFromLatLon( $lat, $lon ) {
}
/**
- * Creates and returns a new instance of a \Maps\Location from an address.
+ * Creates and returns a new instance of a Location from an address.
*
* @since 1.0
*
@@ -162,16 +161,10 @@ public function getCoordinates() {
*
* @since 0.7.1
*
- * @param boolean $geocodeIfEmpty
- *
* @return string
*/
- public function getAddress( $geocodeIfEmpty = true ) {
+ public function getAddress() {
if ( is_null( $this->address ) ) {
- if ( $geocodeIfEmpty ) {
- // TODO: attempt to reverse-geocode
- }
-
$this->address = '';
}
@@ -296,6 +289,8 @@ public function hasVisitedIcon(){
/**
* Returns an object that can directly be converted to JS using json_encode or similar.
*
+ * FIXME: complexity
+ *
* @since 1.0
*
* @param string $defText
@@ -309,6 +304,7 @@ public function hasVisitedIcon(){
*/
public function getJSONObject( $defText = '', $defTitle = '', $defIconUrl = '', $defGroup = '', $defInlineLabel = '', $defVisitedIcon = '' ) {
$parentArray = parent::getJSONObject( $defText , $defTitle );
+
$array = array(
'lat' => $this->coordinates->getLatitude(),
'lon' => $this->coordinates->getLongitude(),
@@ -319,6 +315,7 @@ public function getJSONObject( $defText = '', $defTitle = '', $defIconUrl = '',
'inlineLabel' => $this->hasInlineLabel() ? $this->getInlineLabel() : $defInlineLabel,
'visitedicon' => $this->hasVisitedIcon() ? $this->getVisitedIcon() : $defVisitedIcon,
);
+
return array_merge( $parentArray , $array );
}
diff --git a/src/Maps/Elements/Polygon.php b/src/Maps/Elements/Polygon.php
new file mode 100644
index 000000000..df2ee1d38
--- /dev/null
+++ b/src/Maps/Elements/Polygon.php
@@ -0,0 +1,70 @@
+
+ * @author Jeroen De Dauw < jeroendedauw@gmail.com >
+ */
+class Polygon extends Line implements \iHoverableMapElement {
+
+ protected $onlyVisibleOnHover = false;
+ protected $fillOpacity = '0.5';
+ protected $fillColor = '#FF0000';
+
+ /**
+ * @since 3.0
+ *
+ * @param boolean $visible
+ *
+ * @throws InvalidArgumentException
+ */
+ public function setOnlyVisibleOnHover( $visible ) {
+ if ( !is_bool( $visible ) ) {
+ throw new InvalidArgumentException( '$visible should be a boolean' );
+ }
+
+ $this->onlyVisibleOnHover = $visible;
+ }
+
+ /**
+ * @since 3.0
+ *
+ * @return boolean
+ */
+ public function isOnlyVisibleOnHover() {
+ return $this->onlyVisibleOnHover;
+ }
+
+ public function setFillOpacity( $fillOpacity ) {
+ if ( !is_string( $fillOpacity ) ) {
+ throw new InvalidArgumentException( '$fillOpacity should be a string' );
+ }
+
+ $this->fillOpacity = $fillOpacity;
+ }
+
+ public function setFillColor( $fillColor ) {
+ if ( !is_string( $fillColor ) ) {
+ throw new InvalidArgumentException( '$fillColor should be a string' );
+ }
+
+ $this->fillColor = $fillColor;
+ }
+
+ public function getJSONObject( $defText = '' , $defTitle = '' ) {
+ $json = parent::getJSONObject( $defText, $defTitle );
+
+ $json['onlyVisibleOnHover'] = $this->onlyVisibleOnHover;
+ $json['fillColor'] = $this->fillColor;
+ $json['fillOpacity'] = $this->fillOpacity;
+
+ return $json;
+ }
+
+}
diff --git a/includes/elements/Rectangle.php b/src/Maps/Elements/Rectangle.php
similarity index 88%
rename from includes/elements/Rectangle.php
rename to src/Maps/Elements/Rectangle.php
index d429c98c9..f695c83ac 100644
--- a/includes/elements/Rectangle.php
+++ b/src/Maps/Elements/Rectangle.php
@@ -1,16 +1,13 @@
@@ -35,8 +32,14 @@ class Rectangle extends \MapsBaseFillableElement {
*
* @param LatLongValue $rectangleNorthEast
* @param LatLongValue $rectangleSouthWest
+ *
+ * @throws InvalidArgumentException
*/
public function __construct( LatLongValue $rectangleNorthEast, LatLongValue $rectangleSouthWest ) {
+ if ( $rectangleNorthEast->equals( $rectangleSouthWest ) ) {
+ throw new InvalidArgumentException( '$rectangleNorthEast cannot be equal to $rectangleSouthWest' );
+ }
+
parent::__construct();
// TODO: validate bounds are correct, if not, flip
diff --git a/includes/elements/WmsOverlay.php b/src/Maps/Elements/WmsOverlay.php
similarity index 94%
rename from includes/elements/WmsOverlay.php
rename to src/Maps/Elements/WmsOverlay.php
index a5e7889b0..2ae523920 100644
--- a/includes/elements/WmsOverlay.php
+++ b/src/Maps/Elements/WmsOverlay.php
@@ -1,21 +1,16 @@
*/
-class WmsOverlay extends \Maps\BaseElement {
+class WmsOverlay extends BaseElement {
/**
* @since 3.0
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 748f304a6..df469b773 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -5,15 +5,23 @@
*
* @since 3.0
*
- * @file
- * @ingroup Maps
- *
* @licence GNU GPL v2+
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
*/
+if ( php_sapi_name() !== 'cli' ) {
+ die( 'Not an entry point' );
+}
+
+$pwd = exec( 'pwd' );
+chdir( __DIR__ . '/..' );
+passthru( 'composer update' );
+chdir( $pwd );
+
require_once( __DIR__ . '/evilMediaWikiBootstrap.php' );
-require_once( __DIR__ . '/../Maps.php' );
+require_once( __DIR__ . '/../vendor/autoload.php' );
-//require_once( __DIR__ . '/testLoader.php' );
+foreach ( $GLOBALS['wgExtensionFunctions'] as $extensionFunction ) {
+ call_user_func( $extensionFunction );
+}
\ No newline at end of file
diff --git a/tests/evilMediaWikiBootstrap.php b/tests/evilMediaWikiBootstrap.php
index add7f9a0a..776a6c144 100644
--- a/tests/evilMediaWikiBootstrap.php
+++ b/tests/evilMediaWikiBootstrap.php
@@ -70,7 +70,3 @@ function loadSettings() {
$wgCommandLineMode = true;
return $settingsFile;
}
-
-foreach ( $GLOBALS['wgExtensionFunctions'] as $extensionFunction ) {
- call_user_func( $extensionFunction );
-}
\ No newline at end of file
diff --git a/tests/phpunit/ElementTest.php b/tests/phpunit/ElementTest.php
index 401336f9c..3e894fb8e 100644
--- a/tests/phpunit/ElementTest.php
+++ b/tests/phpunit/ElementTest.php
@@ -1,34 +1,35 @@
*/
-use DataValues\LatLongValue;
-use Maps\Element;
-class ElementTest extends \MediaWikiTestCase {
+class ElementTest extends \PHPUnit_Framework_TestCase {
public function elementProvider() {
$elements = array();
- $elements[] = new \Maps\Rectangle( new LatLongValue( 4, 2 ), new LatLongValue( 5, 6 ) );
- $elements[] = new \Maps\ImageOverlay( new LatLongValue( 4, 2 ), new LatLongValue( 5, 6 ), 'foo' );
- $elements[] = new \Maps\Circle( new LatLongValue( 4, 2 ), 42 );
- $elements[] = new \Maps\Line( array( new LatLongValue( 4, 2 ), new LatLongValue( 5, 6 ) ) );
+ $elements[] = array( new Rectangle( new LatLongValue( 4, 2 ), new LatLongValue( 5, 6 ) ) );
+ $elements[] = array( new ImageOverlay( new LatLongValue( 4, 2 ), new LatLongValue( 5, 6 ), 'foo' ) );
+ $elements[] = array( new Circle( new LatLongValue( 4, 2 ), 42 ) );
+ $elements[] = array( new Line( array( new LatLongValue( 4, 2 ), new LatLongValue( 5, 6 ) ) ) );
+
//$elements[] = new \Maps\Polygon( array( new LatLongValue( 4, 2 ), new LatLongValue( 5, 6 ) ) );
// TODO: location
- return $this->arrayWrap( $elements );
+ return $elements;
}
/**
diff --git a/tests/phpunit/MapsDistanceParserTest.php b/tests/phpunit/MapsDistanceParserTest.php
index f2c801c58..b9c5a94d2 100644
--- a/tests/phpunit/MapsDistanceParserTest.php
+++ b/tests/phpunit/MapsDistanceParserTest.php
@@ -5,14 +5,10 @@
use MapsDistanceParser;
/**
- * Tests for the MapsCoordinates class.
+ * @covers MapsCoordinates
*
- * @file
* @since 0.6.5
*
- * @ingroup Maps
- * @ingroup Test
- *
* @group Maps
*
* @licence GNU GPL v2+
diff --git a/tests/phpunit/elements/BaseElementTest.php b/tests/phpunit/elements/BaseElementTest.php
index af2525ede..772b2d557 100644
--- a/tests/phpunit/elements/BaseElementTest.php
+++ b/tests/phpunit/elements/BaseElementTest.php
@@ -1,6 +1,6 @@
*/
-abstract class BaseElementTest extends \MediaWikiTestCase {
+abstract class BaseElementTest extends \PHPUnit_Framework_TestCase {
/**
* Returns the name of the concrete class tested by this test.
@@ -28,15 +23,11 @@ abstract class BaseElementTest extends \MediaWikiTestCase {
*/
public abstract function getClass();
- /**
- * First element can be a boolean indication if the successive values are valid,
- * or a string indicating the type of exception that should be thrown (ie not valid either).
- *
- * @since 3.0
- *
- * @return array
- */
- public abstract function constructorProvider();
+ public abstract function validConstructorProvider();
+
+ public function invalidConstructorProvider() {
+ return array();
+ }
/**
* Creates and returns a new instance of the concrete class.
@@ -60,48 +51,32 @@ public function newInstance() {
public function instanceProvider() {
$phpFails = array( $this, 'newInstance' );
- return array_filter( array_map(
+ return array_map(
function( array $args ) use ( $phpFails ) {
- $isValid = array_shift( $args ) === true;
-
- if ( $isValid ) {
- return array( call_user_func_array( $phpFails, $args ), $args );
- }
- else {
- return false;
- }
+ return array( call_user_func_array( $phpFails, $args ), $args );
},
- $this->constructorProvider()
- ), 'is_array' );
+ $this->validConstructorProvider()
+ );
}
/**
- * @dataProvider constructorProvider
+ * @dataProvider validConstructorProvider
*
* @since 3.0
*/
- public function testConstructor() {
- $args = func_get_args();
-
- $valid = array_shift( $args );
- $pokemons = null;
-
- try {
- $instance = call_user_func_array( array( $this, 'newInstance' ), $args );
- $this->assertInstanceOf( $this->getClass(), $instance );
- }
- catch ( \Exception $pokemons ) {
- if ( $valid === true ) {
- throw $pokemons;
- }
+ public function testGivenValidArguments_constructorDoesNotThrowException() {
+ $instance = call_user_func_array( array( $this, 'newInstance' ), func_get_args() );
+ $this->assertInstanceOf( $this->getClass(), $instance );
+ }
- if ( is_string( $valid ) ) {
- $this->assertEquals( $valid, get_class( $pokemons ) );
- }
- else {
- $this->assertFalse( $valid );
- }
- }
+ /**
+ * @dataProvider invalidConstructorProvider
+ *
+ * @since 3.0
+ */
+ public function testGivenInvalidArguments_constructorThrowsException() {
+ $this->setExpectedException( 'InvalidArgumentException' );
+ call_user_func_array( array( $this, 'newInstance' ), func_get_args() );
}
/**
@@ -112,4 +87,4 @@ public function testGetOptions( Element $element ) {
$this->assertInstanceOf( '\Maps\ElementOptions', $element->getOptions() );
}
-}
\ No newline at end of file
+}
diff --git a/tests/phpunit/elements/CircleTest.php b/tests/phpunit/elements/CircleTest.php
index 4b99e6763..32a2c6d0b 100644
--- a/tests/phpunit/elements/CircleTest.php
+++ b/tests/phpunit/elements/CircleTest.php
@@ -1,19 +1,15 @@
*/
@@ -27,41 +23,49 @@ class CircleTest extends BaseElementTest {
* @return string
*/
public function getClass() {
- return 'Maps\Circle';
+ return 'Maps\Elements\Circle';
}
- /**
- * @see BaseElementTest::constructorProvider
- *
- * @since 3.0
- *
- * @return array
- */
- public function constructorProvider() {
+ public function validConstructorProvider() {
$argLists = array();
- $argLists[] = array( false );
- $argLists[] = array( false, '' );
- $argLists[] = array( false, '4,2' );
- $argLists[] = array( false, new LatLongValue( 4, 2 ) );
+ $argLists[] = array( new LatLongValue( 4, 2 ), 42 );
+ $argLists[] = array( new LatLongValue( 42, 2.2 ), 9000.1 );
+ $argLists[] = array( new LatLongValue( 4, 2 ), 1 );
+ $argLists[] = array( new LatLongValue( 4, 2 ), 0.1 );
+
+ return $argLists;
+ }
+
+ public function invalidConstructorProvider() {
+ $argLists = array();
- $argLists[] = array( true, new LatLongValue( 4, 2 ), 42 );
- $argLists[] = array( true, new LatLongValue( 42, 2.2 ), 9000.1 );
+ $argLists[] = array( new LatLongValue( 4, 2 ), 'foo' );
- $argLists[] = array( false, '~=[,,_,,]:3', 9000.1 );
+ $argLists[] = array( new LatLongValue( 4, 2 ), 0 );
+ $argLists[] = array( new LatLongValue( 4, 2 ), -42 );
return $argLists;
}
/**
* @dataProvider instanceProvider
- * @param \Maps\Circle $circle
+ * @param Circle $circle
* @param array $arguments
*/
- public function testGetCircleCentre( \Maps\Circle $circle, array $arguments ) {
+ public function testGetCircleCentre( Circle $circle, array $arguments ) {
$this->assertTrue( $circle->getCircleCentre()->equals( $arguments[0] ) );
}
+ /**
+ * @dataProvider instanceProvider
+ * @param Circle $circle
+ * @param array $arguments
+ */
+ public function testGetCircleRadius( Circle $circle, array $arguments ) {
+ $this->assertEquals( $arguments[1], $circle->getCircleRadius() );
+ }
+
}
diff --git a/tests/phpunit/elements/ImageOverlayTest.php b/tests/phpunit/elements/ImageOverlayTest.php
index c466c1b53..419991efe 100644
--- a/tests/phpunit/elements/ImageOverlayTest.php
+++ b/tests/phpunit/elements/ImageOverlayTest.php
@@ -1,19 +1,14 @@
*/
@@ -27,27 +22,24 @@ class ImageOverlayTest extends RectangleTest {
* @return string
*/
public function getClass() {
- return 'Maps\ImageOverlay';
+ return 'Maps\Elements\ImageOverlay';
}
- /**
- * @see BaseElementTest::constructorProvider
- *
- * @since 3.0
- *
- * @return array
- */
- public function constructorProvider() {
- $argLists = array();
+ public function validConstructorProvider() {
+ $argLists = parent::validConstructorProvider();
- foreach ( parent::constructorProvider() as $argList ) {
- $argList[0] = false;
- $argLists[] = $argList;
+ foreach ( $argLists as &$argList ) {
+ $argList[] = 'Foo.png';
}
- foreach ( parent::constructorProvider() as $argList ) {
- $argList[] = 'Foo.png';
- $argLists[] = $argList;
+ return $argLists;
+ }
+
+ public function invalidConstructorProvider() {
+ $argLists = parent::validConstructorProvider();
+
+ foreach ( $argLists as &$argList ) {
+ $argList[] = null;
}
return $argLists;
@@ -55,7 +47,7 @@ public function constructorProvider() {
/**
* @dataProvider instanceProvider
- * @param \Maps\ImageOverlay $imageOverlay
+ * @param ImageOverlay $imageOverlay
* @param array $arguments
*/
public function testGetImage( ImageOverlay $imageOverlay, array $arguments ) {
diff --git a/tests/phpunit/elements/LineTest.php b/tests/phpunit/elements/LineTest.php
index 012531bc9..1bce64af3 100644
--- a/tests/phpunit/elements/LineTest.php
+++ b/tests/phpunit/elements/LineTest.php
@@ -1,20 +1,15 @@
*/
@@ -28,29 +23,16 @@ class LineTest extends BaseElementTest {
* @return string
*/
public function getClass() {
- return 'Maps\Line';
+ return 'Maps\Elements\Line';
}
- /**
- * @see BaseElementTest::constructorProvider
- *
- * @since 3.0
- *
- * @return array
- */
- public function constructorProvider() {
+ public function validConstructorProvider() {
$argLists = array();
- $argLists[] = array( false );
- $argLists[] = array( false, '' );
- $argLists[] = array( false, '4,2' );
- $argLists[] = array( false, new LatLongValue( 4, 2 ) );
-
- $argLists[] = array( true, array() );
- $argLists[] = array( true, array( new LatLongValue( 4, 2 ) ) );
+ $argLists[] = array( array() );
+ $argLists[] = array( array( new LatLongValue( 4, 2 ) ) );
$argLists[] = array(
- true,
array(
new LatLongValue( 4, 2 ),
new LatLongValue( 2, 4 ),
@@ -58,16 +40,22 @@ public function constructorProvider() {
)
);
- $argLists[] = array( false, array( '~=[,,_,,]:3' ) );
- $argLists[] = array( false, array( new LatLongValue( 4, 2 ), '~=[,,_,,]:3' ) );
- $argLists[] = array( false, array( '~=[,,_,,]:3', new LatLongValue( 4, 2 ) ) );
+ return $argLists;
+ }
+
+ public function invalidConstructorProvider() {
+ $argLists = array();
+
+ $argLists[] = array( array( '~=[,,_,,]:3' ) );
+ $argLists[] = array( array( new LatLongValue( 4, 2 ), '~=[,,_,,]:3' ) );
+ $argLists[] = array( array( '~=[,,_,,]:3', new LatLongValue( 4, 2 ) ) );
return $argLists;
}
/**
* @dataProvider instanceProvider
- * @param \Maps\Line $line
+ * @param Line $line
* @param array $arguments
*/
public function testGetLineCoordinates( Line $line, array $arguments ) {
diff --git a/tests/phpunit/elements/LocationTest.php b/tests/phpunit/elements/LocationTest.php
index 9ef152402..6fd0db25e 100644
--- a/tests/phpunit/elements/LocationTest.php
+++ b/tests/phpunit/elements/LocationTest.php
@@ -1,72 +1,37 @@
*/
-class LocationTest extends BaseElementTest {
+class LocationTest extends \PHPUnit_Framework_TestCase {
- /**
- * @see BaseElementTest::getClass
- *
- * @since 3.0
- *
- * @return string
- */
- public function getClass() {
- return 'Maps\Location';
- }
-
- /**
- * @see BaseElementTest::constructorProvider
- *
- * @since 3.0
- *
- * @return array
- */
- public function constructorProvider() {
+ public function latLongValueProvider() {
$argLists = array();
- $argLists[] = array( false );
- $argLists[] = array( false, '' );
- $argLists[] = array( false, '4,2' );
- $argLists[] = array( false, array() );
- $argLists[] = array( false, array( new LatLongValue( 4, 2 ) ) );
-
- $argLists[] = array( true, new LatLongValue( 4, 2 ) );
- $argLists[] = array( true, new LatLongValue( 42, 42 ) );
- $argLists[] = array( true, new LatLongValue( -4.2, -42 ) );
+ $argLists[] = array( new LatLongValue( 0, 0 ) );
+ $argLists[] = array( new LatLongValue( 4, 2 ) );
+ $argLists[] = array( new LatLongValue( 42, 42 ) );
+ $argLists[] = array( new LatLongValue( -4.2, -42 ) );
return $argLists;
}
/**
- * @dataProvider instanceProvider
- * @param Location $location
- * @param array $arguments
+ * @dataProvider latLongValueProvider
*/
- public function testGetLineCoordinates( Location $location, array $arguments ) {
- $coordinates = $location->getCoordinates();
-
- $this->assertType( 'DataValues\LatLongValue', $coordinates );
- $this->assertTrue( $coordinates->equals( $arguments[0] ) );
+ public function testGivenLatLongInConstructor_getCoordinatesReturnsIt( LatLongValue $latLong ) {
+ $location = new Location( $latLong );
+ $this->assertTrue( $latLong->equals( $location->getCoordinates() ) );
}
}
-
-
-
diff --git a/tests/phpunit/elements/PolygonTest.php b/tests/phpunit/elements/PolygonTest.php
index 827b63d0a..ab7364d13 100644
--- a/tests/phpunit/elements/PolygonTest.php
+++ b/tests/phpunit/elements/PolygonTest.php
@@ -1,19 +1,14 @@
*/
@@ -27,12 +22,12 @@ class PolygonTest extends LineTest {
* @return string
*/
public function getClass() {
- return 'Maps\Polygon';
+ return 'Maps\Elements\Polygon';
}
/**
* @dataProvider instanceProvider
- * @param \Maps\Polygon $polygon
+ * @param Polygon $polygon
* @param array $arguments
*/
public function testSetOnlyVisibleOnHover( Polygon $polygon, array $arguments ) {
@@ -45,6 +40,36 @@ public function testSetOnlyVisibleOnHover( Polygon $polygon, array $arguments )
$this->assertFalse( $polygon->isOnlyVisibleOnHover() );
}
+ /**
+ * @dataProvider instanceProvider
+ * @param Polygon $polygon
+ * @param array $arguments
+ */
+ public function testSetFillOpacity( Polygon $polygon, array $arguments ) {
+ $polygon->setFillOpacity( '0.42' );
+ $this->assertHasJsonKeyWithValue( $polygon, 'fillOpacity', '0.42' );
+ }
+
+ protected function assertHasJsonKeyWithValue( Polygon $polygon, $key, $value ) {
+ $json = $polygon->getJSONObject();
+
+ $this->assertArrayHasKey( $key, $json );
+ $this->assertEquals(
+ $value,
+ $json[$key]
+ );
+ }
+
+ /**
+ * @dataProvider instanceProvider
+ * @param Polygon $polygon
+ * @param array $arguments
+ */
+ public function testSetFillColor( Polygon $polygon, array $arguments ) {
+ $polygon->setFillColor( '#FFCCCC' );
+ $this->assertHasJsonKeyWithValue( $polygon, 'fillColor', '#FFCCCC' );
+ }
+
}
diff --git a/tests/phpunit/elements/RectangleTest.php b/tests/phpunit/elements/RectangleTest.php
index 43a758b11..09d08e8dc 100644
--- a/tests/phpunit/elements/RectangleTest.php
+++ b/tests/phpunit/elements/RectangleTest.php
@@ -1,20 +1,15 @@
*/
@@ -28,37 +23,29 @@ class RectangleTest extends BaseElementTest {
* @return string
*/
public function getClass() {
- return 'Maps\Rectangle';
+ return 'Maps\Elements\Rectangle';
}
- /**
- * @see BaseElementTest::constructorProvider
- *
- * @since 3.0
- *
- * @return array
- */
- public function constructorProvider() {
+ public function validConstructorProvider() {
$argLists = array();
- $argLists[] = array( false );
- $argLists[] = array( false, '' );
- $argLists[] = array( false, '4,2' );
- $argLists[] = array( false, new LatLongValue( 4, 2 ) );
- $argLists[] = array( false, array() );
- $argLists[] = array( false, array( new LatLongValue( 4, 2 ) ) );
- $argLists[] = array( false, new LatLongValue( 4, 2 ), 'foobar' );
- $argLists[] = array( false, 'foobar', new LatLongValue( 4, 2 ) );
+ $argLists[] = array( new LatLongValue( 4, 2 ), new LatLongValue( -4, -2 ) );
+ $argLists[] = array( new LatLongValue( -42, -42 ), new LatLongValue( -4, -2 ) );
+
+ return $argLists;
+ }
+
+ public function invalidConstructorProvider() {
+ $argLists = array();
- $argLists[] = array( true, new LatLongValue( 4, 2 ), new LatLongValue( 4, 2 ) );
- $argLists[] = array( true, new LatLongValue( 4, 2 ), new LatLongValue( -4, -2 ) );
+ $argLists[] = array( new LatLongValue( 4, 2 ), new LatLongValue( 4, 2 ) );
return $argLists;
}
/**
* @dataProvider instanceProvider
- * @param \Maps\Rectangle $rectangle
+ * @param Rectangle $rectangle
* @param array $arguments
*/
public function testGetCorners( Rectangle $rectangle, array $arguments ) {
@@ -68,7 +55,7 @@ public function testGetCorners( Rectangle $rectangle, array $arguments ) {
/**
* @dataProvider instanceProvider
- * @param \Maps\Rectangle $rectangle
+ * @param Rectangle $rectangle
* @param array $arguments
*/
public function testSetCorners( Rectangle $rectangle, array $arguments ) {
diff --git a/tests/phpunit/parserhooks/CoordinatesTest.php b/tests/phpunit/parserhooks/CoordinatesTest.php
index a26662179..3036ce5b9 100644
--- a/tests/phpunit/parserhooks/CoordinatesTest.php
+++ b/tests/phpunit/parserhooks/CoordinatesTest.php
@@ -2,14 +2,11 @@
namespace Maps\Test;
+use DataValues\LatLongValue;
+use ParamProcessor\ParamDefinition;
+
/**
- * Tests for the Maps\Coordinates class.
- *
- * @file
- * @since 2.0
- *
- * @ingroup Maps
- * @ingroup Test
+ * @covers MapsCoordinates
*
* @group Maps
* @group ParserHook
@@ -39,13 +36,18 @@ public function parametersProvider() {
$paramLists[] = array(
array(
- 'location' => '4,2'
+ 'location' => '4,2',
+ 'format' => 'dms',
+ 'directional' => 'no',
),
'4° 0\' 0", 2° 0\' 0"'
);
+
$paramLists[] = array(
array(
- 'location' => '55 S, 37.6176330 W'
+ 'location' => '55 S, 37.6176330 W',
+ 'format' => 'dms',
+ 'directional' => 'no',
),
'-55° 0\' 0", -37° 37\' 3.4788"'
);
@@ -54,10 +56,28 @@ public function parametersProvider() {
array(
'location' => '4,2',
'format' => 'float',
+ 'directional' => 'no',
),
'4, 2'
);
+ $paramLists[] = array(
+ array(
+ 'location' => '-4,-2',
+ 'format' => 'float',
+ 'directional' => 'yes',
+ ),
+ '4 S, 2 W'
+ );
+
+ $paramLists[] = array(
+ array(
+ 'location' => '55 S, 37.6176330 W',
+ 'directional' => 'yes',
+ ),
+ '55° 0\' 0" S, 37° 37\' 3.4788" W'
+ );
+
return $paramLists;
}
@@ -67,7 +87,7 @@ public function parametersProvider() {
* @return array
*/
public function processingProvider() {
- $definitions = \ParamDefinition::getCleanDefinitions( $this->getInstance()->getParamDefinitions() );
+ $definitions = ParamDefinition::getCleanDefinitions( $this->getInstance()->getParamDefinitions() );
$argLists = array();
$values = array(
@@ -75,7 +95,7 @@ public function processingProvider() {
);
$expected = array(
- 'location' => new \DataValues\LatLongValue( 4, 2 ),
+ 'location' => new LatLongValue( 4, 2 ),
);
$argLists[] = array( $values, $expected );
@@ -87,7 +107,7 @@ public function processingProvider() {
);
$expected = array(
- 'location' => new \DataValues\LatLongValue( 4, 2 ),
+ 'location' => new LatLongValue( 4, 2 ),
'directional' => !$definitions['directional']->getDefault(),
'format' => Maps_COORDS_DD,
);
@@ -101,7 +121,7 @@ public function processingProvider() {
);
$expected = array(
- 'location' => new \DataValues\LatLongValue( 4, 2 ),
+ 'location' => new LatLongValue( 4, 2 ),
'directional' => !$definitions['directional']->getDefault(),
'format' => Maps_COORDS_DD,
);
diff --git a/tests/phpunit/parserhooks/DisplayMapTest.php b/tests/phpunit/parserhooks/DisplayMapTest.php
index 8e97a57a3..c74d067a6 100644
--- a/tests/phpunit/parserhooks/DisplayMapTest.php
+++ b/tests/phpunit/parserhooks/DisplayMapTest.php
@@ -2,14 +2,10 @@
namespace Maps\Test;
+use Maps\Elements\Location;
+
/**
- * Tests for the Maps\DisplayMap class.
- *
- * @file
- * @since 2.0
- *
- * @ingroup Maps
- * @ingroup Test
+ * @covers MapsDisplayMap
*
* @group Maps
* @group ParserHook
@@ -66,10 +62,8 @@ public function testForSomeReasonPhpSegfaultsIfThereIsOneMethodLess() {
* @return array
*/
public function processingProvider() {
- $definitions = $this->getInstance()->getParamDefinitions();
$argLists = array();
- // TODO
$values = array(
'locations' => '4,2',
'width' => '420',
@@ -78,7 +72,7 @@ public function processingProvider() {
);
$expected = array(
- 'coordinates' => array( new \Maps\Location( new \DataValues\LatLongValue( 4, 2 ) ) ),
+ 'coordinates' => array( new Location( new \DataValues\LatLongValue( 4, 2 ) ) ),
'width' => '420px',
'height' => '420px',
'mappingservice' => 'openlayers',
diff --git a/tests/phpunit/parserhooks/DistanceTest.php b/tests/phpunit/parserhooks/DistanceTest.php
index fccf41766..3f25b02ea 100644
--- a/tests/phpunit/parserhooks/DistanceTest.php
+++ b/tests/phpunit/parserhooks/DistanceTest.php
@@ -3,13 +3,7 @@
namespace Maps\Test;
/**
- * Tests for the Maps\Distance class.
- *
- * @file
- * @since 2.0
- *
- * @ingroup Maps
- * @ingroup Test
+ * @covers MapsDistance
*
* @group Maps
* @group ParserHook
diff --git a/tests/phpunit/parserhooks/FinddestinationTest.php b/tests/phpunit/parserhooks/FinddestinationTest.php
index 56963b2ce..7bbfe53ba 100644
--- a/tests/phpunit/parserhooks/FinddestinationTest.php
+++ b/tests/phpunit/parserhooks/FinddestinationTest.php
@@ -2,14 +2,10 @@
namespace Maps\Test;
+use Maps\Elements\Location;
+
/**
- * Tests for the Maps\Finddestination class.
- *
- * @file
- * @since 2.0
- *
- * @ingroup Maps
- * @ingroup Test
+ * @covers MapsFinddestination
*
* @group Maps
* @group ParserHook
@@ -101,7 +97,7 @@ public function processingProvider() {
$expected = array(
'distance' => $expectedDistance,
'bearing' => (float)$bearing,
- 'location' => new \Maps\Location( $coordinateParser->parse( $location )->getValue() ),
+ 'location' => new Location( $coordinateParser->parse( $location )->getValue() ),
);
$argLists[] = array( $values, $expected );
diff --git a/tests/phpunit/parserhooks/GeocodeTest.php b/tests/phpunit/parserhooks/GeocodeTest.php
index 384fa879e..c3bb0878f 100644
--- a/tests/phpunit/parserhooks/GeocodeTest.php
+++ b/tests/phpunit/parserhooks/GeocodeTest.php
@@ -2,14 +2,10 @@
namespace Maps\Test;
+use Maps\Elements\Location;
+
/**
- * Tests for the Maps\Geocode class.
- *
- * @file
- * @since 2.0
- *
- * @ingroup Maps
- * @ingroup Test
+ * @covers MapsGeocode
*
* @group Maps
* @group ParserHook
@@ -55,7 +51,7 @@ public function processingProvider() {
);
$expected = array(
- 'location' => new \Maps\Location( new \DataValues\LatLongValue( 4, 2 ) ),
+ 'location' => new Location( new \DataValues\LatLongValue( 4, 2 ) ),
'allowcoordinates' => true,
);
diff --git a/tests/phpunit/parserhooks/GeodistanceTest.php b/tests/phpunit/parserhooks/GeodistanceTest.php
index 29c125f9f..632f21f8d 100644
--- a/tests/phpunit/parserhooks/GeodistanceTest.php
+++ b/tests/phpunit/parserhooks/GeodistanceTest.php
@@ -2,14 +2,11 @@
namespace Maps\Test;
+use DataValues\LatLongValue;
+use Maps\Elements\Location;
+
/**
- * Tests for the Maps\Geodistance class.
- *
- * @file
- * @since 2.0
- *
- * @ingroup Maps
- * @ingroup Test
+ * @covers MapsGeodistance
*
* @group Maps
* @group ParserHook
@@ -64,8 +61,8 @@ public function processingProvider() {
);
$expected = array(
- 'location1' => new \Maps\Location( new \DataValues\LatLongValue( 4, 2 ) ),
- 'location2' => new \Maps\Location( new \DataValues\LatLongValue( 42, 0 ) ),
+ 'location1' => new Location( new LatLongValue( 4, 2 ) ),
+ 'location2' => new Location( new LatLongValue( 42, 0 ) ),
);
$argLists[] = array( $values, $expected );
@@ -78,8 +75,8 @@ public function processingProvider() {
);
$expected = array(
- 'location1' => new \Maps\Location( new \DataValues\LatLongValue( 4, 2 ) ),
- 'location2' => new \Maps\Location( new \DataValues\LatLongValue( 42, 0 ) ),
+ 'location1' => new Location( new LatLongValue( 4, 2 ) ),
+ 'location2' => new Location( new LatLongValue( 42, 0 ) ),
'decimals' => 1,
);
diff --git a/tests/phpunit/parserhooks/MapsDocTest.php b/tests/phpunit/parserhooks/MapsDocTest.php
index 8285aa028..77151bacf 100644
--- a/tests/phpunit/parserhooks/MapsDocTest.php
+++ b/tests/phpunit/parserhooks/MapsDocTest.php
@@ -3,13 +3,7 @@
namespace Maps\Test;
/**
- * Tests for the Maps\MapsDoc class.
- *
- * @file
- * @since 2.0
- *
- * @ingroup Maps
- * @ingroup Test
+ * @covers MapsMapsDoc
*
* @group Maps
* @group ParserHook
diff --git a/tests/phpunit/parserhooks/ParserHookTest.php b/tests/phpunit/parserhooks/ParserHookTest.php
index c7b6ac2ac..f8a274182 100644
--- a/tests/phpunit/parserhooks/ParserHookTest.php
+++ b/tests/phpunit/parserhooks/ParserHookTest.php
@@ -2,22 +2,17 @@
namespace Maps\Test;
+use ParamProcessor\ParamDefinition;
+use ParamProcessor\Processor;
+
/**
- * Tests for the MapsCoordinates class.
- *
- * @file
- * @since 2.0
- *
- * @ingroup Maps
- * @ingroup Test
- *
* @group Maps
* @group ParserHook
*
* @licence GNU GPL v2+
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
*/
-abstract class ParserHookTest extends \MediaWikiTestCase {
+abstract class ParserHookTest extends \PHPUnit_Framework_TestCase {
/**
* @since 2.0
@@ -77,16 +72,16 @@ public function processingProvider() {
public function testParamProcessing( array $parameters, array $expectedValues ) {
$definitions = $this->getInstance()->getParamDefinitions();
- $processor = \ParamProcessor\Processor::newDefault();
+ $processor = Processor::newDefault();
$processor->setParameters( $parameters, $definitions );
- $processor->validateParameters();
+ $result = $processor->processParameters();
- if ( $processor->hasFatalError() ) {
- throw new \MWException( 'Fatal error occurred during the param processing: ' . $processor->hasFatalError()->getMessage() );
+ if ( $result->hasFatal() ) {
+ $this->fail( 'Fatal error occurred during the param processing: ' . $processor->hasFatalError()->getMessage() );
}
- $actual = $processor->getParameterValues();
+ $actual = $result->getParameters();
$expectedValues = array_merge( $this->getDefaultValues(), $expectedValues );
@@ -95,8 +90,10 @@ public function testParamProcessing( array $parameters, array $expectedValues )
$this->assertEquals(
$expected,
- $actual[$name],
- 'Expected ' . var_export( $expected, true ) . ' should match actual ' . var_export( $actual[$name], true )
+ $actual[$name]->getValue(),
+ 'Expected ' . var_export( $expected, true )
+ . ' should match actual '
+ . var_export( $actual[$name]->getValue(), true )
);
}
}
@@ -109,7 +106,7 @@ public function testParamProcessing( array $parameters, array $expectedValues )
* @return array
*/
protected function getDefaultValues() {
- $definitions = \ParamDefinition::getCleanDefinitions( $this->getInstance()->getParamDefinitions() );
+ $definitions = ParamDefinition::getCleanDefinitions( $this->getInstance()->getParamDefinitions() );
$defaults = array();
@@ -122,4 +119,13 @@ protected function getDefaultValues() {
return $defaults;
}
+ protected function arrayWrap( array $elements ) {
+ return array_map(
+ function ( $element ) {
+ return array( $element );
+ },
+ $elements
+ );
+ }
+
}
\ No newline at end of file
diff --git a/tests/phpunit/parsers/CircleParserTest.php b/tests/phpunit/parsers/CircleParserTest.php
new file mode 100644
index 000000000..206ea3fd5
--- /dev/null
+++ b/tests/phpunit/parsers/CircleParserTest.php
@@ -0,0 +1,44 @@
+
+ */
+class CircleParserTest extends \PHPUnit_Framework_TestCase {
+
+ public function testCanConstruct() {
+ new CircleParser();
+ $this->assertTrue( true );
+ }
+
+ public function testGivenCoordinateAndRadius_parserReturnsCircle() {
+ $parser = new CircleParser();
+
+ $circle = $parser->parse( '57.421,23.90625:32684.605182' );
+
+ $this->assertInstanceOf( 'Maps\Elements\Circle', $circle );
+
+ $expectedLatLong = new LatLongValue( 57.421, 23.90625 );
+ $this->assertTrue( $expectedLatLong->equals( $circle->getCircleCentre() ) );
+
+ $this->assertEquals( 32684.605182, $circle->getCircleRadius() );
+ }
+
+ public function testGivenTitleAndText_circleHasProvidedMetaData() {
+ $parser = new CircleParser();
+
+ $circle = $parser->parse( '57.421,23.90625:32684.605182~title~text' );
+
+ $this->assertInstanceOf( 'Maps\Elements\Circle', $circle );
+
+ $this->assertEquals( 'title', $circle->getTitle() );
+ $this->assertEquals( 'text', $circle->getText() );
+ }
+
+}
diff --git a/tests/phpunit/parsers/DistanceParserTest.php b/tests/phpunit/parsers/DistanceParserTest.php
index 2caccefd8..8fcbdc581 100644
--- a/tests/phpunit/parsers/DistanceParserTest.php
+++ b/tests/phpunit/parsers/DistanceParserTest.php
@@ -3,16 +3,7 @@
namespace Maps\Test;
/**
- * Unit tests for the Maps\DistanceParser class.
- *
- * @since 3.0
- *
- * @ingroup MapsTest
- *
- * @group ValueParsers
- * @group Maps
- * @group DistanceParserTest
- *
+ * @covers Maps\DistanceParser
* @licence GNU GPL v2+
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
*/
diff --git a/tests/phpunit/parsers/LineParserTest.php b/tests/phpunit/parsers/LineParserTest.php
index a58858071..846d4daf6 100644
--- a/tests/phpunit/parsers/LineParserTest.php
+++ b/tests/phpunit/parsers/LineParserTest.php
@@ -3,19 +3,10 @@
namespace Maps\Test;
use DataValues\LatLongValue;
-use Maps\Line;
+use Maps\Elements\Line;
/**
- * Unit tests for the Maps\LineParser class.
- *
- * @since 3.0
- *
- * @ingroup MapsTest
- *
- * @group ValueParsers
- * @group Maps
- * @group LineParserTest
- *
+ * @covers Maps\LineParser
* @licence GNU GPL v2+
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
*/
diff --git a/tests/phpunit/parsers/LocationParserTest.php b/tests/phpunit/parsers/LocationParserTest.php
index 77b112982..b78b44666 100644
--- a/tests/phpunit/parsers/LocationParserTest.php
+++ b/tests/phpunit/parsers/LocationParserTest.php
@@ -3,19 +3,12 @@
namespace Maps\Test;
use DataValues\LatLongValue;
-use Maps\Location;
+use Maps\Elements\Location;
+use Maps\LocationParser;
+use Title;
/**
- * Unit tests for the Maps\LocationParser class.
- *
- * @since 3.0
- *
- * @ingroup MapsTest
- *
- * @group ValueParsers
- * @group Maps
- * @group LocationParserTest
- *
+ * @covers Maps\LocationParser
* @licence GNU GPL v2+
* @author Jeroen De Dauw < jeroendedauw@gmail.com >
*/
@@ -76,4 +69,75 @@ protected function requireDataValue() {
return false;
}
+ /**
+ * @dataProvider titleProvider
+ */
+ public function testGivenTitleThatIsNotLink_titleIsSetAndLinkIsNot( $title ) {
+ $parser = new LocationParser();
+ $location = $parser->parse( '4,2~' . $title );
+
+ $this->assertTitleAndLinkAre( $location, $title, '' );
+ }
+
+ public function titleProvider() {
+ return array(
+ array( '' ),
+ array( 'Title' ),
+ array( 'Some title' ),
+ array( 'link' ),
+ array( 'links:foo' ),
+ );
+ }
+
+ protected function assertTitleAndLinkAre( Location $location, $title, $link ) {
+ $this->assertHasJsonKeyWithValue( $location, 'title', $title );
+ $this->assertHasJsonKeyWithValue( $location, 'link', $link );
+ }
+
+ protected function assertHasJsonKeyWithValue( Location $polygon, $key, $value ) {
+ $json = $polygon->getJSONObject();
+
+ $this->assertArrayHasKey( $key, $json );
+ $this->assertEquals(
+ $value,
+ $json[$key]
+ );
+ }
+
+ /**
+ * @dataProvider linkProvider
+ */
+ public function testGivenTitleThatIsLink_linkIsSetAndTitleIsNot( $link ) {
+ $parser = new LocationParser();
+ $location = $parser->parse( '4,2~link:' . $link );
+
+ $this->assertTitleAndLinkAre( $location, '', $link );
+ }
+
+ public function linkProvider() {
+ return array(
+ array( 'https://semantic-mediawiki.org' ),
+ array( 'http://www.semantic-mediawiki.org' ),
+ array( 'irc://freenode.net' ),
+ );
+ }
+
+ /**
+ * @dataProvider titleLinkProvider
+ */
+// public function testGivenPageTitleAsLink_pageTitleIsTurnedIntoUrl( $link ) {
+// $parser = new LocationParser();
+// $location = $parser->parse( '4,2~link:' . $link );
+//
+// $linkUrl = Title::newFromText( $link )->getFullURL();
+// $this->assertTitleAndLinkAre( $location, '', $linkUrl );
+// }
+//
+// public function titleLinkProvider() {
+// return array(
+// array( 'Foo' ),
+// array( 'Some_Page' ),
+// );
+// }
+
}
diff --git a/tests/phpunit/parsers/RectlangleParserTest.php b/tests/phpunit/parsers/RectlangleParserTest.php
new file mode 100644
index 000000000..6a2788e2f
--- /dev/null
+++ b/tests/phpunit/parsers/RectlangleParserTest.php
@@ -0,0 +1,45 @@
+
+ */
+class RectangleParserTest extends \PHPUnit_Framework_TestCase {
+
+ public function testCanConstruct() {
+ new RectangleParser();
+ $this->assertTrue( true );
+ }
+
+ public function testGivenBoundingBox_parserReturnsRectangle() {
+ $parser = new RectangleParser();
+
+ $rectangle = $parser->parse( '51.8357775,33.83789:46,23.37890625' );
+
+ $this->assertInstanceOf( 'Maps\Elements\Rectangle', $rectangle );
+
+ $expectedNorthEast = new LatLongValue( 51.8357775, 33.83789 );
+ $this->assertTrue( $expectedNorthEast->equals( $rectangle->getRectangleNorthEast() ) );
+
+ $expectedSouthWest = new LatLongValue( 46, 23.37890625 );
+ $this->assertTrue( $expectedSouthWest->equals( $rectangle->getRectangleSouthWest() ) );
+ }
+
+ public function testGivenTitleAndText_rectangleHasProvidedMetaData() {
+ $parser = new RectangleParser();
+
+ $rectangle = $parser->parse( "51.8357775,33.83789:46,23.37890625~I'm a square~of doom" );
+
+ $this->assertInstanceOf( 'Maps\Elements\Rectangle', $rectangle );
+
+ $this->assertEquals( "I'm a square", $rectangle->getTitle() );
+ $this->assertEquals( 'of doom', $rectangle->getText() );
+ }
+
+}
diff --git a/tests/phpunit/parsers/WmsOverlayParserTest.php b/tests/phpunit/parsers/WmsOverlayParserTest.php
index 16707ca63..1b141af7b 100644
--- a/tests/phpunit/parsers/WmsOverlayParserTest.php
+++ b/tests/phpunit/parsers/WmsOverlayParserTest.php
@@ -2,19 +2,10 @@
namespace Maps\Test;
-use Maps\WmsOverlay;
+use Maps\Elements\WmsOverlay;
/**
- * Unit tests for the Maps\WmsOverlayParser class.
- *
- * @since 3.0
- *
- * @ingroup MapsTest
- *
- * @group ValueParsers
- * @group Maps
- * @group WmsOverlayParserTest
- *
+ * @covers Maps\WmsOverlayParser
* @licence GNU GPL v2+
* @author Mathias Mølster Lidal
*/
+
+
%3\$s
diff --git a/includes/editor/css/mapeditor.css b/includes/editor/css/mapeditor.css index 33c30a4fa..9c3fe7c4d 100644 --- a/includes/editor/css/mapeditor.css +++ b/includes/editor/css/mapeditor.css @@ -1,8 +1,24 @@ -#code-output, #code-input-container,#code-input { - height: 100%; +#code-output-container, #code-input-container,#code-input { + height: 100% !important; width: 100%; } +#code-output-container { + overflow: visible; +} + +textarea#code-input, textarea#code-output { + resize: none; +} + +#code-output { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + border: none; + padding: 10px; +} + #map-canvas { width: 100%; height: 500px; diff --git a/includes/editor/js/mapeditor.js b/includes/editor/js/mapeditor.js index c2c718c03..a0ca35291 100644 --- a/includes/editor/js/mapeditor.js +++ b/includes/editor/js/mapeditor.js @@ -1,721 +1,721 @@ var mapEditor = { - __map:null, - __drawingManager:null, - __mapObjects:[], - __controlsDiv:null, - __options:{ - canvas:'map-canvas', - onRightClick:function(){} - }, - __mapObjectOptions: { - marker:{ - draggable:true - }, - polyline:{ - strokeWeight:2, - strokeOpacity:1, - strokeColor:'#FF0000', - editable:true - }, - circle:{ - strokeWeight:2, - strokeOpacity:1, - strokeColor:'#FF0000', - fillColor:'#FF0000', - fillOpacity:0.5, - editable:true - }, - rectangle:{ - strokeWeight:2, - strokeOpacity:1, - strokeColor:'#FF0000', - fillColor:'#FF0000', - fillOpacity:0.5, - editable:true - }, - polygon:{ - strokeWeight:2, - strokeOpacity:1, - strokeColor:'#FF0000', - fillColor:'#FF0000', - fillOpacity:0.5, - editable:true - }, - imageoverlay:{ - strokeWeight:1, - strokeOpacity:0.5, - strokeColor:'#000', - fillOpacity:0.0, - editable:true - } - }, - __mapParameters:{ - mappingservice: { - values:mw.config.get( 'egMapsAvailableServices' ) - }, - copycoords: { - values:['on','off'] - }, - markercluster: { - values:['on','off'] - }, - searchmarkers:{ - values:['title','all'] - }, - 'static':{ - values:['on','off'] - }, - maxzoom: { - values:[] - }, - minzoom: { - values:[] - }, - zoom:{ - values:[] - }, - centre:{ - values:[] - }, - title:{ - values:[] - }, - label:{ - values:[] - }, - icon:{ - values:[] - }, - type:{ - values:[] - }, - types:{ - values:[] - }, - layers:{ - values:[] - }, - controls:{ - values:[] - }, - zoomstyle:{ - values:['default','small','large'] - }, - typestyle:{ - values:[] - }, - autoinfowindows:{ - values:['on','off'] - }, - kml:{ - values:[] - }, - gkml:{ - values:[] - }, - fusiontables:{ - values:[] - }, - resizable:{ - values:[] - }, - tilt:{ - values:[] - }, - kmlrezoom:{ - values:['on','off'] - }, - poi:{ - values:['on','off'] - }, - visitedicon:{ - values:[] - } - }, - __addMapObject:function(o){ - var idx = this.__mapObjects.indexOf(o); - if(idx === -1){ - this.__mapObjects.push(o); - o.overlay.setMap(this.__map); - } - }, - __removeMapObject:function(o){ - var idx = this.__mapObjects.indexOf(o); - if(idx !== -1){ - this.__mapObjects[idx].overlay.setMap(null); - this.__mapObjects.splice(idx,1); - } - }, - __createOrUpdateImageOverlay:function(e,imageUrl){ - //remove old image overlay if exists - this.__removeMapObject(e.imageoverlay); - - //set to new type so it doesn't collide with rectangle - e.type = 'imageoverlaybounds'; - - //add map objects - this.__addMapObject(e); - var image = new google.maps.GroundOverlay(imageUrl, e.overlay.getBounds()); - var imageOverlay = { - overlay:image, - type:'imageoverlay' - }; - this.__addMapObject(imageOverlay); - e.imageoverlay = imageOverlay; - imageOverlay.metadata = e.metadata; - - //register right click listener if not already done - if(e.rightClickListener !== true){ - google.maps.event.addListener(e.overlay, 'rightclick', function () { - mapEditor.__options.onRightClick(e); - }); - e.rightClickListener = true; - } - - //register bounds change listener if not already done - if(e.boundsChangedListener !== true){ - google.maps.event.addListener(e.overlay, 'bounds_changed', function () { - //destroy and recreate imageoverlay (due to no e.imageoverlay.setBounds() method) - mapEditor.__createOrUpdateImageOverlay(e, e.imageoverlay.overlay.getUrl()); - }); - e.boundsChangedListener = true; - } - - return imageOverlay; - }, - __initControls:function(){ - //Create root controls element - var controlDiv = this.__controlsDiv = document.createElement('div'); - controlDiv.setAttribute('class','mapeditor-controls'); - controlDiv.index = 1; - - this.__map.controls[google.maps.ControlPosition.BOTTOM_CENTER].push(controlDiv); - }, - __initMap:function(){ - var myOptions = { - center:new google.maps.LatLng(0, 0), - zoom:1, - mapTypeId:google.maps.MapTypeId.ROADMAP - }; - - this.__map = new google.maps.Map(document.getElementById(this.__options.canvas),myOptions); - - //noinspection JSUnresolvedVariable - var drawingManager = this.__drawingManager = new google.maps.drawing.DrawingManager({ - drawingMode:null, - drawingControl:true, - drawingControlOptions:{ - position:google.maps.ControlPosition.TOP_CENTER - }, - markerOptions:this.__mapObjectOptions.marker, - circleOptions:this.__mapObjectOptions.circle, - rectangleOptions:this.__mapObjectOptions.rectangle, - polygonOptions:this.__mapObjectOptions.polygon, - polylineOptions:this.__mapObjectOptions.polyline - }); - drawingManager.setMap(this.__map); - - google.maps.event.addListener(drawingManager, 'overlaycomplete', function (e) { - mapEditor.__addMapObject(e); - mapEditor.__registerRightClickListener(e); - google.maps.event.trigger(e.overlay, 'rightclick'); - }); - }, - __readMapObjectOptionsFromMetadata:function(e){ - var options = $.extend({},this.__mapObjectOptions[e.type]); - for(var key in e.metadata){ - var data = e.metadata[key]; - if(data.value.trim() !== ''){ - options[data.name] = data.value; - } - } - try{ - e.overlay.setOptions(options); - return true; - }catch(e){ - return false; - } - }, - __writeMetaDataToMapObject:function(e,metadata){ - e.metadata = this.__arrayToObject(metadata); - }, - __convertPositionalParametersToMetaData:function(positionalArray){ - var positionalNames = [ - 'title', - 'text', - 'strokeColor', - 'strokeOpacity', - 'strokeWeight', - 'fillColor', - 'fillOpacity', - 'showOnHover' - ]; - - if(positionalArray !== undefined && positionalArray.length > 0){ - if(positionalArray[0].trim().indexOf('link:') === 0){ - positionalNames.splice(0,1); - positionalNames[0] = 'link'; - } - } - - for(var x = 0; x < positionalArray.length; x++){ - positionalArray[x] = { - name:positionalNames[x], - value:positionalArray[x].trim() - }; - } - return this.__arrayToObject(positionalArray); - }, - __arrayToObject:function(arr){ - var o = {}; - for (var i = 0; i < arr.length; ++i){ - o[i] = arr[i]; - } - return o; - }, - __registerRightClickListener:function(e){ - google.maps.event.addListener(e.overlay, 'rightclick', function () { - mapEditor.__options.onRightClick(e); - }); - }, - __generateWikiCode:function( seperators ){ - var code = seperators.codeStart; - - var markers = ''; - var circles = ''; - var polygons = ''; - var lines = ''; - var rectangles = ''; - var imageoverlays = ''; - - for(var x = 0; x < this.__mapObjects.length; x++){ - var mapObject = this.__mapObjects[x].overlay; - var mapObjectType = this.__mapObjects[x].type; - var mapObjectMeta = this.__mapObjects[x].metadata; - - var metadata = ''; - if(mapObjectMeta !== undefined){ - var delimiterPosition = ''; - for(var key in mapObjectMeta){ - var data = mapObjectMeta[key]; - delimiterPosition += delimiterPosition.length > 0 ? ' ~' : '~'; - if(data.value !== ''){ - if(data.name === 'link' && data.value.indexOf('link:') === -1){ - data.value = 'link:'+data.value; - } - if(!(mapObjectType === 'imageoverlay' && data.name === 'image')){ - metadata += delimiterPosition+data.value; - delimiterPosition = ''; - } - } - } - } - - var serializedData = mapObject+metadata; - if (mapObjectType === 'marker') { - markers += markers === '' ? serializedData : '; '+serializedData; - } else if (mapObjectType === 'circle') { - circles += circles === '' ? serializedData : '; '+serializedData; - } else if (mapObjectType === 'polygon') { - polygons += polygons === '' ? serializedData : '; '+serializedData; - } else if (mapObjectType === 'polyline') { - lines += lines === '' ? serializedData : '; '+serializedData; - } else if (mapObjectType === 'rectangle') { - rectangles += rectangles === '' ? serializedData : '; '+serializedData; - }else if(mapObjectType === 'imageoverlay'){ - imageoverlays += imageoverlays === '' ? serializedData : '; '+serializedData; - } - } - - - code += markers !== '' ? markers : ''; - code += circles !== '' ? seperators.separator+'circles='+circles : ''; - code += polygons !== '' ? seperators.separator+'polygons='+polygons : ''; - code += lines !== '' ? seperators.separator+'lines='+lines : ''; - code += rectangles !== '' ? seperators.separator+'rectangles='+rectangles : ''; - code += imageoverlays !== '' ? seperators.separator+'imageoverlays='+imageoverlays : ''; - - //add map parameters - for(var param in this.__mapParameters){ - var value = this.__mapParameters[param].value; - if(value === undefined || value === ''){ - continue; - } - code += '\n|'+param+'='+value; - } - - code += seperators.codeEnd; - return code; - }, - __importWikiCode:function(rawData){ - var syntaxPattern = /^\{\{#display_map:[\s\S]*\}\}[\s\n]*$/i; - if(rawData.match(syntaxPattern) === null){ //NO MATCH - return false; - }else{ - try{ - var patterns = { - marker: /^\{\{#display_map:\s*(.*)/i, - polyline: /\|\s*lines=(.*)/i, - circle:/\|\s*circles=(.*)/i, - polygon:/\|\s*polygons=(.*)/i, - rectangle:/\|\s*rectangles=(.*)/i, - imageoverlay:/\|\s*imageoverlays=(.*)/i, - parameter:/\|\s*(.*)=(.*)/i - }; - var mapObjects = []; - rawData = rawData.split('\n'); - for(var j = 0; j < rawData.length; j++){ - for (var key in patterns){ - var match = rawData[j].match(patterns[key]); - if(match !== null && match[1].trim().length !== 0){ - var isMapObject = false; - if(key !== 'parameter'){ - var data = match[1].split(';'); - for(var i = 0; i < data.length; i++){ - - var metadata = data[i].split('~'); - metadata.splice(0,1); - if(metadata.length > 0){ - data[i] = data[i].substring(0,data[i].indexOf('~')); - } - metadata = this.__convertPositionalParametersToMetaData(metadata); - - var options = this.__mapObjectOptions[key]; - var mapObject = null; - if (key === 'marker') { - var position = data[i].split(','); - //noinspection JSValidateTypes - options = $.extend({ - position: new google.maps.LatLng(position[0],position[1]) - },options); - mapObject = new google.maps.Marker(options); - } else if (key === 'circle') { - var parts = data[i].split(':'); - var radius = parts[1]; - var position = parts[0].split(','); - //noinspection JSValidateTypes - options = $.extend({ - center: new google.maps.LatLng(position[0],position[1]), - radius: parseFloat(radius) - },options); - mapObject = new google.maps.Circle(options); - } else if (key === 'polygon') { - var paths = data[i].split(':'); - for(var x = 0; x < paths.length; x++){ - var position = paths[x].split(','); - paths[x] = new google.maps.LatLng(position[0],position[1]); - } - paths = new google.maps.MVCArray(paths); - //noinspection JSValidateTypes - options = $.extend({ - paths: paths - },options); - mapObject = new google.maps.Polygon(options); - } else if (key === 'polyline') { - var paths = data[i].split(':'); - for(var x = 0; x < paths.length; x++){ - var position = paths[x].split(','); - paths[x] = new google.maps.LatLng(position[0],position[1]); - } - paths = new google.maps.MVCArray(paths); - //noinspection JSValidateTypes - options = $.extend({ - path: paths - },options); - mapObject = new google.maps.Polyline(options); - } else if (key === 'rectangle') { - var parts = data[i].split(':'); - var ne = parts[0].split(','); - var sw = parts[1].split(','); - sw = new google.maps.LatLng(sw[0],sw[1]); - ne = new google.maps.LatLng(ne[0],ne[1]); - //noinspection JSValidateTypes - options = $.extend({ - bounds: new google.maps.LatLngBounds(sw,ne) - },options); - mapObject = new google.maps.Rectangle(options); - }else if (key === 'imageoverlay'){ - var parts = data[i].split(':'); - var ne = parts[0].split(','); - var sw = parts[1].split(','); - var imageUrl = parts[2]; - sw = new google.maps.LatLng(sw[0],sw[1]); - ne = new google.maps.LatLng(ne[0],ne[1]); - - options = $.extend({ - bounds: new google.maps.LatLngBounds(sw,ne) - },options); - var rectangle = new google.maps.Rectangle(options); - - //add image url as metadata entry - metadata.image = { - name:'image',value:imageUrl - }; - - mapObject = { - type:'imageoverlaybounds', - overlay:rectangle, - metadata:metadata - }; - - this.__createOrUpdateImageOverlay(mapObject,imageUrl); - this.__readMapObjectOptionsFromMetadata(mapObject); - - } - if(mapObject !== null){ - //imageoverlay needs special handling - if(key !== 'imageoverlay' ){ - mapObject = { - type:key, - overlay:mapObject, - metadata:metadata - }; - - this.__registerRightClickListener(mapObject); - this.__addMapObject(mapObject); - this.__readMapObjectOptionsFromMetadata(mapObject); - } - - isMapObject = true; - - } - } - }else if(!isMapObject){ - //handle global map parameters - if(this.__mapParameters[match[1]] === undefined){ - this.__mapParameters[match[1]] = {}; - } - this.__mapParameters[match[1]].value = match[2]; - } - } - } - } - }catch(e){ - console.log('An error occurred when parsing data'); - return false; - } - return true; - } - }, - addControlButton:function (text, onclick){ - // Set CSS for the control border - var controlUI = $(''); - $(controlUI).click(function(){ - onclick.call(this); - }).appendTo(this.__controlsDiv); - - // Set CSS for the control interior - var controlText = $('') - .text(text).appendTo(controlUI); - }, - setup:function(o){ - //extend options - $.extend(this.__options,o); - - //Override tostring methods for wiki code generation - google.maps.LatLng.prototype.toString = function(){ - return this.lat()+','+this.lng(); - }; - - google.maps.Rectangle.prototype.toString = function(){ - var bounds = this.getBounds(); - var ne = bounds.getNorthEast(); - var sw = bounds.getSouthWest(); - return ne+':'+sw; - }; - - google.maps.Marker.prototype.toString = function(){ - var position = this.getPosition(); - return position.lat()+','+position.lng(); - }; - - google.maps.Circle.prototype.toString = function(){ - var center = this.getCenter(); - var radius = this.getRadius(); - return center.lat()+','+center.lng()+':'+radius; - }; - - google.maps.Polygon.prototype.toString = function(){ - var polygons = ''; - this.getPath().forEach(function(e){ - polygons += ':'+e; - }); - return polygons.substr(1); - }; - - google.maps.Polyline.prototype.toString = function(){ - var lines = ''; - this.getPath().forEach(function(e){ - lines += ':'+e; - }); - return lines.substr(1); - }; - - google.maps.GroundOverlay.prototype.toString = function(){ - var bounds = this.getBounds(); - var sw = bounds.getSouthWest(); - var ne = bounds.getNorthEast(); - return [ne,sw,this.getUrl()].join(':'); - }; - - //initialize rest - this.__initMap(); - this.__initControls(); - } + __map:null, + __drawingManager:null, + __mapObjects:[], + __controlsDiv:null, + __options:{ + canvas:'map-canvas', + onRightClick:function(){} + }, + __mapObjectOptions: { + marker:{ + draggable:true + }, + polyline:{ + strokeWeight:2, + strokeOpacity:1, + strokeColor:'#FF0000', + editable:true + }, + circle:{ + strokeWeight:2, + strokeOpacity:1, + strokeColor:'#FF0000', + fillColor:'#FF0000', + fillOpacity:0.5, + editable:true + }, + rectangle:{ + strokeWeight:2, + strokeOpacity:1, + strokeColor:'#FF0000', + fillColor:'#FF0000', + fillOpacity:0.5, + editable:true + }, + polygon:{ + strokeWeight:2, + strokeOpacity:1, + strokeColor:'#FF0000', + fillColor:'#FF0000', + fillOpacity:0.5, + editable:true + }, + imageoverlay:{ + strokeWeight:1, + strokeOpacity:0.5, + strokeColor:'#000', + fillOpacity:0.0, + editable:true + } + }, + __mapParameters:{ + mappingservice: { + values:mw.config.get( 'egMapsAvailableServices' ) + }, + copycoords: { + values:['on','off'] + }, + markercluster: { + values:['on','off'] + }, + searchmarkers:{ + values:['title','all'] + }, + 'static':{ + values:['on','off'] + }, + maxzoom: { + values:[] + }, + minzoom: { + values:[] + }, + zoom:{ + values:[] + }, + centre:{ + values:[] + }, + title:{ + values:[] + }, + label:{ + values:[] + }, + icon:{ + values:[] + }, + type:{ + values:[] + }, + types:{ + values:[] + }, + layers:{ + values:[] + }, + controls:{ + values:[] + }, + zoomstyle:{ + values:['default','small','large'] + }, + typestyle:{ + values:[] + }, + autoinfowindows:{ + values:['on','off'] + }, + kml:{ + values:[] + }, + gkml:{ + values:[] + }, + fusiontables:{ + values:[] + }, + resizable:{ + values:[] + }, + tilt:{ + values:[] + }, + kmlrezoom:{ + values:['on','off'] + }, + poi:{ + values:['on','off'] + }, + visitedicon:{ + values:[] + } + }, + __addMapObject:function(o){ + var idx = this.__mapObjects.indexOf(o); + if(idx === -1){ + this.__mapObjects.push(o); + o.overlay.setMap(this.__map); + } + }, + __removeMapObject:function(o){ + var idx = this.__mapObjects.indexOf(o); + if(idx !== -1){ + this.__mapObjects[idx].overlay.setMap(null); + this.__mapObjects.splice(idx,1); + } + }, + __createOrUpdateImageOverlay:function(e,imageUrl){ + //remove old image overlay if exists + this.__removeMapObject(e.imageoverlay); + + //set to new type so it doesn't collide with rectangle + e.type = 'imageoverlaybounds'; + + //add map objects + this.__addMapObject(e); + var image = new google.maps.GroundOverlay(imageUrl, e.overlay.getBounds()); + var imageOverlay = { + overlay:image, + type:'imageoverlay' + }; + this.__addMapObject(imageOverlay); + e.imageoverlay = imageOverlay; + imageOverlay.metadata = e.metadata; + + //register right click listener if not already done + if(e.rightClickListener !== true){ + google.maps.event.addListener(e.overlay, 'rightclick', function () { + mapEditor.__options.onRightClick(e); + }); + e.rightClickListener = true; + } + + //register bounds change listener if not already done + if(e.boundsChangedListener !== true){ + google.maps.event.addListener(e.overlay, 'bounds_changed', function () { + //destroy and recreate imageoverlay (due to no e.imageoverlay.setBounds() method) + mapEditor.__createOrUpdateImageOverlay(e, e.imageoverlay.overlay.getUrl()); + }); + e.boundsChangedListener = true; + } + + return imageOverlay; + }, + __initControls:function(){ + //Create root controls element + var controlDiv = this.__controlsDiv = document.createElement('div'); + controlDiv.setAttribute('class','mapeditor-controls'); + controlDiv.index = 1; + + this.__map.controls[google.maps.ControlPosition.BOTTOM_CENTER].push(controlDiv); + }, + __initMap:function(){ + var myOptions = { + center:new google.maps.LatLng(0, 0), + zoom:1, + mapTypeId:google.maps.MapTypeId.ROADMAP + }; + + this.__map = new google.maps.Map(document.getElementById(this.__options.canvas),myOptions); + + //noinspection JSUnresolvedVariable + var drawingManager = this.__drawingManager = new google.maps.drawing.DrawingManager({ + drawingMode:null, + drawingControl:true, + drawingControlOptions:{ + position:google.maps.ControlPosition.TOP_CENTER + }, + markerOptions:this.__mapObjectOptions.marker, + circleOptions:this.__mapObjectOptions.circle, + rectangleOptions:this.__mapObjectOptions.rectangle, + polygonOptions:this.__mapObjectOptions.polygon, + polylineOptions:this.__mapObjectOptions.polyline + }); + drawingManager.setMap(this.__map); + + google.maps.event.addListener(drawingManager, 'overlaycomplete', function (e) { + mapEditor.__addMapObject(e); + mapEditor.__registerRightClickListener(e); + google.maps.event.trigger(e.overlay, 'rightclick'); + }); + }, + __readMapObjectOptionsFromMetadata:function(e){ + var options = $.extend({},this.__mapObjectOptions[e.type]); + for(var key in e.metadata){ + var data = e.metadata[key]; + if(data.value.trim() !== ''){ + options[data.name] = data.value; + } + } + try{ + e.overlay.setOptions(options); + return true; + }catch(e){ + return false; + } + }, + __writeMetaDataToMapObject:function(e,metadata){ + e.metadata = this.__arrayToObject(metadata); + }, + __convertPositionalParametersToMetaData:function(positionalArray){ + var positionalNames = [ + 'title', + 'text', + 'strokeColor', + 'strokeOpacity', + 'strokeWeight', + 'fillColor', + 'fillOpacity', + 'showOnHover' + ]; + + if(positionalArray !== undefined && positionalArray.length > 0){ + if(positionalArray[0].trim().indexOf('link:') === 0){ + positionalNames.splice(0,1); + positionalNames[0] = 'link'; + } + } + + for(var x = 0; x < positionalArray.length; x++){ + positionalArray[x] = { + name:positionalNames[x], + value:positionalArray[x].trim() + }; + } + return this.__arrayToObject(positionalArray); + }, + __arrayToObject:function(arr){ + var o = {}; + for (var i = 0; i < arr.length; ++i){ + o[i] = arr[i]; + } + return o; + }, + __registerRightClickListener:function(e){ + google.maps.event.addListener(e.overlay, 'rightclick', function () { + mapEditor.__options.onRightClick(e); + }); + }, + __generateWikiCode:function( seperators ){ + var code = seperators.codeStart; + + var markers = ''; + var circles = ''; + var polygons = ''; + var lines = ''; + var rectangles = ''; + var imageoverlays = ''; + + for(var x = 0; x < this.__mapObjects.length; x++){ + var mapObject = this.__mapObjects[x].overlay; + var mapObjectType = this.__mapObjects[x].type; + var mapObjectMeta = this.__mapObjects[x].metadata; + + var metadata = ''; + if(mapObjectMeta !== undefined){ + var delimiterPosition = ''; + for(var key in mapObjectMeta){ + var data = mapObjectMeta[key]; + delimiterPosition += delimiterPosition.length > 0 ? ' ~' : '~'; + if(data.value !== ''){ + if(data.name === 'link' && data.value.indexOf('link:') === -1){ + data.value = 'link:'+data.value; + } + if(!(mapObjectType === 'imageoverlay' && data.name === 'image')){ + metadata += delimiterPosition+data.value; + delimiterPosition = ''; + } + } + } + } + + var serializedData = mapObject+metadata; + if (mapObjectType === 'marker') { + markers += markers === '' ? serializedData : '; '+serializedData; + } else if (mapObjectType === 'circle') { + circles += circles === '' ? serializedData : '; '+serializedData; + } else if (mapObjectType === 'polygon') { + polygons += polygons === '' ? serializedData : '; '+serializedData; + } else if (mapObjectType === 'polyline') { + lines += lines === '' ? serializedData : '; '+serializedData; + } else if (mapObjectType === 'rectangle') { + rectangles += rectangles === '' ? serializedData : '; '+serializedData; + }else if(mapObjectType === 'imageoverlay'){ + imageoverlays += imageoverlays === '' ? serializedData : '; '+serializedData; + } + } + + + code += markers !== '' ? markers : ''; + code += circles !== '' ? seperators.separator+'circles='+circles : ''; + code += polygons !== '' ? seperators.separator+'polygons='+polygons : ''; + code += lines !== '' ? seperators.separator+'lines='+lines : ''; + code += rectangles !== '' ? seperators.separator+'rectangles='+rectangles : ''; + code += imageoverlays !== '' ? seperators.separator+'imageoverlays='+imageoverlays : ''; + + //add map parameters + for(var param in this.__mapParameters){ + var value = this.__mapParameters[param].value; + if(value === undefined || value === ''){ + continue; + } + code += '\n|'+param+'='+value; + } + + code += seperators.codeEnd; + return code; + }, + __importWikiCode:function(rawData){ + var syntaxPattern = /^\{\{#display_map:[\s\S]*\}\}[\s\n]*$/i; + if(rawData.match(syntaxPattern) === null){ //NO MATCH + return false; + }else{ + try{ + var patterns = { + marker: /^\{\{#display_map:\s*(.*)/i, + polyline: /\|\s*lines=(.*)/i, + circle:/\|\s*circles=(.*)/i, + polygon:/\|\s*polygons=(.*)/i, + rectangle:/\|\s*rectangles=(.*)/i, + imageoverlay:/\|\s*imageoverlays=(.*)/i, + parameter:/\|\s*(.*)=(.*)/i + }; + var mapObjects = []; + rawData = rawData.split('\n'); + for(var j = 0; j < rawData.length; j++){ + for (var key in patterns){ + var match = rawData[j].match(patterns[key]); + if(match !== null && match[1].trim().length !== 0){ + var isMapObject = false; + if(key !== 'parameter'){ + var data = match[1].split(';'); + for(var i = 0; i < data.length; i++){ + + var metadata = data[i].split('~'); + metadata.splice(0,1); + if(metadata.length > 0){ + data[i] = data[i].substring(0,data[i].indexOf('~')); + } + metadata = this.__convertPositionalParametersToMetaData(metadata); + + var options = this.__mapObjectOptions[key]; + var mapObject = null; + if (key === 'marker') { + var position = data[i].split(','); + //noinspection JSValidateTypes + options = $.extend({ + position: new google.maps.LatLng(position[0],position[1]) + },options); + mapObject = new google.maps.Marker(options); + } else if (key === 'circle') { + var parts = data[i].split(':'); + var radius = parts[1]; + var position = parts[0].split(','); + //noinspection JSValidateTypes + options = $.extend({ + center: new google.maps.LatLng(position[0],position[1]), + radius: parseFloat(radius) + },options); + mapObject = new google.maps.Circle(options); + } else if (key === 'polygon') { + var paths = data[i].split(':'); + for(var x = 0; x < paths.length; x++){ + var position = paths[x].split(','); + paths[x] = new google.maps.LatLng(position[0],position[1]); + } + paths = new google.maps.MVCArray(paths); + //noinspection JSValidateTypes + options = $.extend({ + paths: paths + },options); + mapObject = new google.maps.Polygon(options); + } else if (key === 'polyline') { + var paths = data[i].split(':'); + for(var x = 0; x < paths.length; x++){ + var position = paths[x].split(','); + paths[x] = new google.maps.LatLng(position[0],position[1]); + } + paths = new google.maps.MVCArray(paths); + //noinspection JSValidateTypes + options = $.extend({ + path: paths + },options); + mapObject = new google.maps.Polyline(options); + } else if (key === 'rectangle') { + var parts = data[i].split(':'); + var ne = parts[0].split(','); + var sw = parts[1].split(','); + sw = new google.maps.LatLng(sw[0],sw[1]); + ne = new google.maps.LatLng(ne[0],ne[1]); + //noinspection JSValidateTypes + options = $.extend({ + bounds: new google.maps.LatLngBounds(sw,ne) + },options); + mapObject = new google.maps.Rectangle(options); + }else if (key === 'imageoverlay'){ + var parts = data[i].split(':'); + var ne = parts[0].split(','); + var sw = parts[1].split(','); + var imageUrl = parts[2]; + sw = new google.maps.LatLng(sw[0],sw[1]); + ne = new google.maps.LatLng(ne[0],ne[1]); + + options = $.extend({ + bounds: new google.maps.LatLngBounds(sw,ne) + },options); + var rectangle = new google.maps.Rectangle(options); + + //add image url as metadata entry + metadata.image = { + name:'image',value:imageUrl + }; + + mapObject = { + type:'imageoverlaybounds', + overlay:rectangle, + metadata:metadata + }; + + this.__createOrUpdateImageOverlay(mapObject,imageUrl); + this.__readMapObjectOptionsFromMetadata(mapObject); + + } + if(mapObject !== null){ + //imageoverlay needs special handling + if(key !== 'imageoverlay' ){ + mapObject = { + type:key, + overlay:mapObject, + metadata:metadata + }; + + this.__registerRightClickListener(mapObject); + this.__addMapObject(mapObject); + this.__readMapObjectOptionsFromMetadata(mapObject); + } + + isMapObject = true; + + } + } + }else if(!isMapObject){ + //handle global map parameters + if(this.__mapParameters[match[1]] === undefined){ + this.__mapParameters[match[1]] = {}; + } + this.__mapParameters[match[1]].value = match[2]; + } + } + } + } + }catch(e){ + console.log('An error occurred when parsing data'); + return false; + } + return true; + } + }, + addControlButton:function (text, onclick){ + // Set CSS for the control border + var controlUI = $(''); + $(controlUI).click(function(){ + onclick.call(this); + }).appendTo(this.__controlsDiv); + + // Set CSS for the control interior + var controlText = $('') + .text(text).appendTo(controlUI); + }, + setup:function(o){ + //extend options + $.extend(this.__options,o); + + //Override tostring methods for wiki code generation + google.maps.LatLng.prototype.toString = function(){ + return this.lat()+','+this.lng(); + }; + + google.maps.Rectangle.prototype.toString = function(){ + var bounds = this.getBounds(); + var ne = bounds.getNorthEast(); + var sw = bounds.getSouthWest(); + return ne+':'+sw; + }; + + google.maps.Marker.prototype.toString = function(){ + var position = this.getPosition(); + return position.lat()+','+position.lng(); + }; + + google.maps.Circle.prototype.toString = function(){ + var center = this.getCenter(); + var radius = this.getRadius(); + return center.lat()+','+center.lng()+':'+radius; + }; + + google.maps.Polygon.prototype.toString = function(){ + var polygons = ''; + this.getPath().forEach(function(e){ + polygons += ':'+e; + }); + return polygons.substr(1); + }; + + google.maps.Polyline.prototype.toString = function(){ + var lines = ''; + this.getPath().forEach(function(e){ + lines += ':'+e; + }); + return lines.substr(1); + }; + + google.maps.GroundOverlay.prototype.toString = function(){ + var bounds = this.getBounds(); + var sw = bounds.getSouthWest(); + var ne = bounds.getNorthEast(); + return [ne,sw,this.getUrl()].join(':'); + }; + + //initialize rest + this.__initMap(); + this.__initControls(); + } }; $(document).ready(function(){ - function openDialog(e){ - if(e.metadata !== undefined){ - for(var key in e.metadata){ - var data = e.metadata[key]; - $(this).find('form input[name="'+data.name+'"]').val(data.value); - } - } - var i18nButtons = {}; - i18nButtons[mw.msg('mapeditor-done-button')] = function () { - var form = $(this).find('form'); - form.find('.miniColors').each(function(){ - if($(this).val() === '#'){ - $(this).val(''); - } - }); - mapEditor.__writeMetaDataToMapObject(e,form.serializeArray()); - $(this).dialog("close"); - if(!mapEditor.__readMapObjectOptionsFromMetadata(e)){ - alert(mw.msg('mapeditor-parser-error')); - } - }; - i18nButtons[mw.msg('mapeditor-remove-button')] = function () { - mapEditor.__removeMapObject(e); - $(this).dialog("close"); - }; - - this.dialog({ - modal:true, - buttons:i18nButtons, - open:function(){ - if(e.metadata !== undefined){ - var isText = true; - for(var key in e.metadata){ - var data = e.metadata[key]; - if(data.name === 'link' && data.value.length > 0){ - isText = false; - break; - } - } - //depending on existing metadata, - //show either form with title/text fields or just link field - if(isText){ - $(this).find('input[value="text"]').trigger('click'); - }else{ - $(this).find('input[value="link"]').trigger('click'); - } - }else{ - //default trigger click on text radio button - $(this).find('input[value="text"]').trigger('click'); - } - - - }, - beforeClose:function(){ - //reset the form - var form = $(this).find('form'); - form[0].reset(); - form.find('.opacity-data-holder').text(mw.msg('mapeditor-none-text')); - form.find('.ui-slider').slider('value',-1); - form.find('.miniColors').miniColors('value','#fff').val(''); - } - }); - } - - function openImageOverlayDialog(e,callback){ - - var form = $('#imageoverlay-form'); - - var i18nButtons = {}; - i18nButtons[mw.msg('mapeditor-done-button')] = function(){ - var imageUrl = $(this).find('input[name="image"]').val(); - mapEditor.__createOrUpdateImageOverlay(e,imageUrl); - - var metadata = form.find('form').serializeArray(); - mapEditor.__writeMetaDataToMapObject(e,metadata); - mapEditor.__writeMetaDataToMapObject(e.imageoverlay,metadata); - - form.dialog("close"); - }; - - i18nButtons[mw.msg('mapeditor-remove-button')] = function () { - mapEditor.__removeMapObject(e.imageoverlay); - e.imageoverlay = undefined; - form.dialog("close"); - }; - - form.dialog({ - modal:true, - buttons:i18nButtons, - open:function(){ - //restore data from previous edits - if(e.metadata !== undefined){ - var isText = true; - for(var key in e.metadata){ - var data = e.metadata[key]; - if(data.name === 'link' && data.value.length > 0){ - isText = false; - } - form.find('form input[name="'+data.name+'"]').val(data.value); - } - //depending on existing metadata, - //show either form with title/text fields or just link field - if(isText){ - form.find('input[value="text"]').trigger('click'); - }else{ - form.find('input[value="link"]').trigger('click'); - } - }else{ - //default trigger click on text radio button - form.find('input[value="text"]').trigger('click'); - } - }, - beforeClose:function(){ - mapEditor.__drawingManager.setMap(mapEditor.__map); //re-enable standard drawing manager - if(e.imageoverlay === undefined){ - mapEditor.__removeMapObject(e); - } - - //reset the form - var formElement = form.find('form'); - formElement[0].reset(); - - if(callback !== undefined && typeof(callback) === 'function'){ - callback(); - } - - } - }); - } - - mapEditor.setup({ - onRightClick:function(e){ - if (e.type === 'marker') { - openDialog.call($('#marker-form'),e); - } else if (e.type === 'circle') { - openDialog.call($('#fillable-form'),e); - } else if (e.type === 'polygon') { - openDialog.call($('#polygon-form'),e); - } else if (e.type === 'polyline') { - openDialog.call($('#strokable-form'),e); - } else if (e.type === 'rectangle') { - openDialog.call($('#fillable-form'),e); - } else if (e.type === 'imageoverlaybounds') { - openImageOverlayDialog(e); - } - } - }); - - //add custom controls + function openDialog(e){ + if(e.metadata !== undefined){ + for(var key in e.metadata){ + var data = e.metadata[key]; + $(this).find('form input[name="'+data.name+'"]').val(data.value); + } + } + var i18nButtons = {}; + i18nButtons[mw.msg('mapeditor-done-button')] = function () { + var form = $(this).find('form'); + form.find('.miniColors').each(function(){ + if($(this).val() === '#'){ + $(this).val(''); + } + }); + mapEditor.__writeMetaDataToMapObject(e,form.serializeArray()); + $(this).dialog("close"); + if(!mapEditor.__readMapObjectOptionsFromMetadata(e)){ + alert(mw.msg('mapeditor-parser-error')); + } + }; + i18nButtons[mw.msg('mapeditor-remove-button')] = function () { + mapEditor.__removeMapObject(e); + $(this).dialog("close"); + }; + + this.dialog({ + modal:true, + buttons:i18nButtons, + open:function(){ + if(e.metadata !== undefined){ + var isText = true; + for(var key in e.metadata){ + var data = e.metadata[key]; + if(data.name === 'link' && data.value.length > 0){ + isText = false; + break; + } + } + //depending on existing metadata, + //show either form with title/text fields or just link field + if(isText){ + $(this).find('input[value="text"]').trigger('click'); + }else{ + $(this).find('input[value="link"]').trigger('click'); + } + }else{ + //default trigger click on text radio button + $(this).find('input[value="text"]').trigger('click'); + } + + + }, + beforeClose:function(){ + //reset the form + var form = $(this).find('form'); + form[0].reset(); + form.find('.opacity-data-holder').text(mw.msg('mapeditor-none-text')); + form.find('.ui-slider').slider('value',-1); + form.find('.miniColors').miniColors('value','#fff').val(''); + } + }); + } + + function openImageOverlayDialog(e,callback){ + + var form = $('#imageoverlay-form'); + + var i18nButtons = {}; + i18nButtons[mw.msg('mapeditor-done-button')] = function(){ + var imageUrl = $(this).find('input[name="image"]').val(); + mapEditor.__createOrUpdateImageOverlay(e,imageUrl); + + var metadata = form.find('form').serializeArray(); + mapEditor.__writeMetaDataToMapObject(e,metadata); + mapEditor.__writeMetaDataToMapObject(e.imageoverlay,metadata); + + form.dialog("close"); + }; + + i18nButtons[mw.msg('mapeditor-remove-button')] = function () { + mapEditor.__removeMapObject(e.imageoverlay); + e.imageoverlay = undefined; + form.dialog("close"); + }; + + form.dialog({ + modal:true, + buttons:i18nButtons, + open:function(){ + //restore data from previous edits + if(e.metadata !== undefined){ + var isText = true; + for(var key in e.metadata){ + var data = e.metadata[key]; + if(data.name === 'link' && data.value.length > 0){ + isText = false; + } + form.find('form input[name="'+data.name+'"]').val(data.value); + } + //depending on existing metadata, + //show either form with title/text fields or just link field + if(isText){ + form.find('input[value="text"]').trigger('click'); + }else{ + form.find('input[value="link"]').trigger('click'); + } + }else{ + //default trigger click on text radio button + form.find('input[value="text"]').trigger('click'); + } + }, + beforeClose:function(){ + mapEditor.__drawingManager.setMap(mapEditor.__map); //re-enable standard drawing manager + if(e.imageoverlay === undefined){ + mapEditor.__removeMapObject(e); + } + + //reset the form + var formElement = form.find('form'); + formElement[0].reset(); + + if(callback !== undefined && typeof(callback) === 'function'){ + callback(); + } + + } + }); + } + + mapEditor.setup({ + onRightClick:function(e){ + if (e.type === 'marker') { + openDialog.call($('#marker-form'),e); + } else if (e.type === 'circle') { + openDialog.call($('#fillable-form'),e); + } else if (e.type === 'polygon') { + openDialog.call($('#polygon-form'),e); + } else if (e.type === 'polyline') { + openDialog.call($('#strokable-form'),e); + } else if (e.type === 'rectangle') { + openDialog.call($('#fillable-form'),e); + } else if (e.type === 'imageoverlaybounds') { + openImageOverlayDialog(e); + } + } + }); + + //add custom controls if( $('#map-canvas').attr('context') != 'forminput' ) { //for Special:MapEditor var editorMarkers = { 'codeStart' : '{{#display_map: ', @@ -729,9 +729,12 @@ $(document).ready(function(){ code = code.split('\n').join('\r\n'); } $('#code-output').text(code); - $('#code-output').dialog({ + $('#code-output-container').dialog({ modal:true, - width:'80%' + width:'80%', + open:function(){ + $('#code-output').focus(); + } }); }); @@ -767,153 +770,153 @@ $(document).ready(function(){ }); } - mapEditor.addControlButton(mw.msg('mapeditor-mapparam-button'), function(){ - var i18nButtons = {}; - i18nButtons[mw.msg('mapeditor-done-button')] = function(){ - var data = $(this).find('form input').not('select').serializeArray(); - for(var x = 0; x < data.length; x++){ - mapEditor.__mapParameters[data[x].name].value = data[x].value; - } - $(this).dialog('close'); - }; - $('#map-parameter-form').dialog({ - modal:true, - width: 500, - buttons:i18nButtons - }); - }); - - mapEditor.addControlButton(mw.msg('mapeditor-clear-button'), function(){ - while(mapEditor.__mapObjects.length > 0){ - var mapObj = mapEditor.__mapObjects.pop(); - mapObj.overlay.setMap(null); - } - for(var param in mapEditor.__mapParameters){ - mapEditor.__mapParameters[param].value = undefined; - } - }); - - mapEditor.addControlButton(mw.msg('mapeditor-imageoverlay-button'), function(){ - var button = $(this); - if(button.data('clicked') === true){ - return; //already clicked, disregard this click - }else{ - button.data('clicked',true); - } - - mapEditor.__drawingManager.setMap(null); //disable current drawing manager - - var drawingManager = new google.maps.drawing.DrawingManager({ - drawingMode:google.maps.drawing.OverlayType.RECTANGLE, - drawingControl:false, - rectangleOptions:mapEditor.__mapObjectOptions.imageoverlay - }); - drawingManager.setMap(mapEditor.__map); - - google.maps.event.addListener(drawingManager, 'overlaycomplete', function (e) { - mapEditor.__addMapObject(e); //add if it doesn't already exist. - - drawingManager.setMap(null); - - openImageOverlayDialog(e,function(){ - //re-enable button - button.data('clicked',false); - }); - - }); - - }); - - - - //init map parameters - var formselect = $('#map-parameter-form select[name="key"]'); - formselect.on('change',function(){ - var option = $(this); - var key = option.val(); - var value = mapEditor.__mapParameters[key].value; - if(value === undefined){ - value = ''; - } - - var parent = option.parent(); - var input = $(''); - var removeButton = $('[x]'); - var option2 = option.clone(true); - var container = $(''); - - option2.find('option[value="'+key+'"]').remove(); - option.attr('disabled',true); - removeButton.on('click',function(){ - var removedKey = $(this).prevAll('select').val(); - var activeSelect = $(this).parent().parent().find('select').not('select[disabled="disabled"]'); - var option = $(''); - activeSelect.children().first().after(option); - $(this).parent().remove(); - mapEditor.__mapParameters[key].value = undefined; - return false; - }); - - parent.append(input); - parent.append(removeButton); - parent.parent().append(container); - container.append(option2); - - input.autocomplete({ - source: mapEditor.__mapParameters[key].values, - minLength: 0, - autoFocus: true - }); - input.autocomplete('search',''); - }); - - for(var parameter in mapEditor.__mapParameters){ - var option = $(''); - formselect.append(option); - } - - //hide link input initially - $('input[name="link"]').attr('disabled',true).hide().prev().hide(); - - //init text/link switcher - $('input[name="switch"]').on('click',function(){ - if($(this).val() === 'link'){ - $(this).parent().next().find('input[name="title"],input[name="text"]').attr('disabled',true).hide().prev().hide(); - $(this).parent().next().find('input[name="link"]').attr('disabled',false).show().prev().show(); - }else{ - $(this).parent().next().find('input[name="title"],input[name="text"]').attr('disabled',false).show().prev().show(); - $(this).parent().next().find('input[name="link"]').attr('disabled',true).hide().prev().hide(); - } - }); - - //init enter keypress to press done on dialog. - $('.mapeditor-dialog').on('keypress',function(e){ - if(e.keyCode === 13){ - $(this).dialog('option','buttons').Done.call(this); - } - }); - - //init sliders - $('input[name="strokeOpacity"],input[name="fillOpacity"]').each(function(){ - var input = $(this); - var dataHolder = $(''+mw.msg('mapeditor-none-text')+''); - dataHolder.css({fontSize: 12}); - var slider = $('').slider({ - min: -1, - slide: function(event, ui){ - if(ui.value === -1){ - input.val(''); - dataHolder.text(mw.msg('mapeditor-none-text')); - }else{ - input.val( ui.value/100 ); - dataHolder.text(ui.value+'%'); - } - } - }); - input.before(dataHolder); - input.after(slider); - }); - - //init color pickers - $('input[name="strokeColor"],input[name="fillColor"]').miniColors().miniColors('value','').val(''); + mapEditor.addControlButton(mw.msg('mapeditor-mapparam-button'), function(){ + var i18nButtons = {}; + i18nButtons[mw.msg('mapeditor-done-button')] = function(){ + var data = $(this).find('form input').not('select').serializeArray(); + for(var x = 0; x < data.length; x++){ + mapEditor.__mapParameters[data[x].name].value = data[x].value; + } + $(this).dialog('close'); + }; + $('#map-parameter-form').dialog({ + modal:true, + width: 500, + buttons:i18nButtons + }); + }); + + mapEditor.addControlButton(mw.msg('mapeditor-clear-button'), function(){ + while(mapEditor.__mapObjects.length > 0){ + var mapObj = mapEditor.__mapObjects.pop(); + mapObj.overlay.setMap(null); + } + for(var param in mapEditor.__mapParameters){ + mapEditor.__mapParameters[param].value = undefined; + } + }); + + mapEditor.addControlButton(mw.msg('mapeditor-imageoverlay-button'), function(){ + var button = $(this); + if(button.data('clicked') === true){ + return; //already clicked, disregard this click + }else{ + button.data('clicked',true); + } + + mapEditor.__drawingManager.setMap(null); //disable current drawing manager + + var drawingManager = new google.maps.drawing.DrawingManager({ + drawingMode:google.maps.drawing.OverlayType.RECTANGLE, + drawingControl:false, + rectangleOptions:mapEditor.__mapObjectOptions.imageoverlay + }); + drawingManager.setMap(mapEditor.__map); + + google.maps.event.addListener(drawingManager, 'overlaycomplete', function (e) { + mapEditor.__addMapObject(e); //add if it doesn't already exist. + + drawingManager.setMap(null); + + openImageOverlayDialog(e,function(){ + //re-enable button + button.data('clicked',false); + }); + + }); + + }); + + + + //init map parameters + var formselect = $('#map-parameter-form select[name="key"]'); + formselect.on('change',function(){ + var option = $(this); + var key = option.val(); + var value = mapEditor.__mapParameters[key].value; + if(value === undefined){ + value = ''; + } + + var parent = option.parent(); + var input = $(''); + var removeButton = $('[x]'); + var option2 = option.clone(true); + var container = $(''); + + option2.find('option[value="'+key+'"]').remove(); + option.attr('disabled',true); + removeButton.on('click',function(){ + var removedKey = $(this).prevAll('select').val(); + var activeSelect = $(this).parent().parent().find('select').not('select[disabled="disabled"]'); + var option = $(''); + activeSelect.children().first().after(option); + $(this).parent().remove(); + mapEditor.__mapParameters[key].value = undefined; + return false; + }); + + parent.append(input); + parent.append(removeButton); + parent.parent().append(container); + container.append(option2); + + input.autocomplete({ + source: mapEditor.__mapParameters[key].values, + minLength: 0, + autoFocus: true + }); + input.autocomplete('search',''); + }); + + for(var parameter in mapEditor.__mapParameters){ + var option = $(''); + formselect.append(option); + } + + //hide link input initially + $('input[name="link"]').attr('disabled',true).hide().prev().hide(); + + //init text/link switcher + $('input[name="switch"]').on('click',function(){ + if($(this).val() === 'link'){ + $(this).parent().next().find('input[name="title"],input[name="text"]').attr('disabled',true).hide().prev().hide(); + $(this).parent().next().find('input[name="link"]').attr('disabled',false).show().prev().show(); + }else{ + $(this).parent().next().find('input[name="title"],input[name="text"]').attr('disabled',false).show().prev().show(); + $(this).parent().next().find('input[name="link"]').attr('disabled',true).hide().prev().hide(); + } + }); + + //init enter keypress to press done on dialog. + $('.mapeditor-dialog').on('keypress',function(e){ + if(e.keyCode === 13){ + $(this).dialog('option','buttons').Done.call(this); + } + }); + + //init sliders + $('input[name="strokeOpacity"],input[name="fillOpacity"]').each(function(){ + var input = $(this); + var dataHolder = $(''+mw.msg('mapeditor-none-text')+''); + dataHolder.css({fontSize: 12}); + var slider = $('').slider({ + min: -1, + slide: function(event, ui){ + if(ui.value === -1){ + input.val(''); + dataHolder.text(mw.msg('mapeditor-none-text')); + }else{ + input.val( ui.value/100 ); + dataHolder.text(ui.value+'%'); + } + } + }); + input.before(dataHolder); + input.after(slider); + }); + + //init color pickers + $('input[name="strokeColor"],input[name="fillColor"]').miniColors().miniColors('value','').val(''); }); \ No newline at end of file diff --git a/includes/elements/Polygon.php b/includes/elements/Polygon.php deleted file mode 100644 index 64c99e480..000000000 --- a/includes/elements/Polygon.php +++ /dev/null @@ -1,51 +0,0 @@ - - * @author Jeroen De Dauw < jeroendedauw@gmail.com > - */ -class Polygon extends Line implements \iHoverableMapElement { - - /** - * @since 3.0 - * - * @var boolean - */ - protected $onlyVisibleOnHover = false; - - /** - * @since 3.0 - * - * @param boolean $visible - * - * @throws MWException - */ - public function setOnlyVisibleOnHover( $visible ) { - if ( !is_bool( $visible ) ) { - throw new MWException( '$visible should be a boolean' ); - } - - $this->onlyVisibleOnHover = $visible; - } - - /** - * @since 3.0 - * - * @return boolean - */ - public function isOnlyVisibleOnHover() { - return $this->onlyVisibleOnHover; - } - -} diff --git a/includes/ext.maps.common.js b/includes/ext.maps.common.js index 2dab2a49d..f61da8854 100644 --- a/includes/ext.maps.common.js +++ b/includes/ext.maps.common.js @@ -3,8 +3,7 @@ * @see http://www.mediawiki.org/wiki/Extension:Maps * * @since 1.0 - * @ingroup Maps - * + * * @licence GNU GPL v2++ * @author Jeroen De Dauw