http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73789
Revision: 73789
Author: jeroendedauw
Date: 2010-09-26 19:37:18 +0000 (Sun, 26 Sep 2010)
Log Message:
-----------
Changes for 0.7 - fixed some issues with display_point
Modified Paths:
--------------
trunk/extensions/Maps/includes/features/Maps_BasePointMap.php
trunk/extensions/Maps/includes/parserHooks/Maps_DisplayPoint.php
Modified: trunk/extensions/Maps/includes/features/Maps_BasePointMap.php
===================================================================
--- trunk/extensions/Maps/includes/features/Maps_BasePointMap.php
2010-09-26 18:47:32 UTC (rev 73788)
+++ trunk/extensions/Maps/includes/features/Maps_BasePointMap.php
2010-09-26 19:37:18 UTC (rev 73789)
@@ -114,7 +114,6 @@
$this->title = $parser->parse( $this->title, $wgTitle, new
ParserOptions() )->getText();
$this->label = $parser->parse( $this->label, $wgTitle, new
ParserOptions() )->getText();
- /* TODO
// Each $args is an array containg the coordinate set as first
element, possibly followed by meta data.
foreach ( $this->coordinates as $args ) {
$markerData = MapsCoordinateParser::parseCoordinates(
array_shift( $args ) );
@@ -162,7 +161,7 @@
$this->markerData[] = $markerData;
}
- */
+
}
/**
Modified: trunk/extensions/Maps/includes/parserHooks/Maps_DisplayPoint.php
===================================================================
--- trunk/extensions/Maps/includes/parserHooks/Maps_DisplayPoint.php
2010-09-26 18:47:32 UTC (rev 73788)
+++ trunk/extensions/Maps/includes/parserHooks/Maps_DisplayPoint.php
2010-09-26 19:37:18 UTC (rev 73789)
@@ -86,15 +86,12 @@
protected function getParameterInfo() {
global $egMapsMapWidth, $egMapsMapHeight,
$egMapsDefaultServices, $egMapsDefaultTitle, $egMapsDefaultLabel,
$egMapsDefaultMapCentre;
- // TODO
- //Validator::addOutputFormat( 'geoPoints', array( __CLASS__,
'formatGeoPoints' ) );
-
$params = MapsMapper::getCommonParameters();
$params['mappingservice']->default =
$egMapsDefaultServices['display_point'];
$params['mappingservice']->addManipulations( new
MapsParamService( 'display_point' ) );
- $params['coordinates'] = new Parameter( 'coordinates' );
+ $params['coordinates'] = new ListParameter( 'coordinates' );
$params['coordinates']->addAliases( 'coords', 'location',
'address', 'addresses', 'locations' );
$params['coordinates']->addCriteria( new CriterionIsLocation(
'~' ) );
$params['coordinates']->addManipulations( new
MapsParamCoordSet( '~' ) );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
