http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73702
Revision: 73702
Author: jeroendedauw
Date: 2010-09-25 02:10:49 +0000 (Sat, 25 Sep 2010)
Log Message:
-----------
Follow up to r73699
Modified Paths:
--------------
trunk/extensions/Maps/Maps.php
trunk/extensions/Maps/includes/parserHooks/Maps_DisplayPoint.php
trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMaps.php
trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayers.php
trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMaps.php
Modified: trunk/extensions/Maps/Maps.php
===================================================================
--- trunk/extensions/Maps/Maps.php 2010-09-25 01:48:28 UTC (rev 73701)
+++ trunk/extensions/Maps/Maps.php 2010-09-25 02:10:49 UTC (rev 73702)
@@ -117,6 +117,10 @@
$wgAutoloadClasses['MapsGoogleGeocoder'] = $geoDir .
'Maps_GoogleGeocoder.php';
$wgAutoloadClasses['MapsYahooGeocoder'] = $geoDir .
'Maps_YahooGeocoder.php';
+ // Autoload the "includes/manipulations/" classes.
+ $manDir = $incDir . 'manipulations/';
+ $wgAutoloadClasses['MapsParamService'] = $manDir .
'Maps_ParamService.php';
+
// Autoload the "includes/parserHooks/" classes.
$phDir = $incDir . '/parserHooks/';
$wgAutoloadClasses['MapsCoordinates'] = $phDir .
'Maps_Coordinates.php';
@@ -158,8 +162,9 @@
'description' => wfMsgExt( 'maps_desc', 'parsemag',
$servicesList ),
);
- Validator::addOutputFormat( 'mapdimension', array( 'MapsMapper',
'setMapDimension' ) );
- Validator::addOutputFormat( 'coordinateset', array( 'MapsMapper',
'formatLocation' ) );
+ // TODO
+ //Validator::addOutputFormat( 'mapdimension', array( 'MapsMapper',
'setMapDimension' ) );
+ //Validator::addOutputFormat( 'coordinateset', array( 'MapsMapper',
'formatLocation' ) );
return true;
}
Modified: trunk/extensions/Maps/includes/parserHooks/Maps_DisplayPoint.php
===================================================================
--- trunk/extensions/Maps/includes/parserHooks/Maps_DisplayPoint.php
2010-09-25 01:48:28 UTC (rev 73701)
+++ trunk/extensions/Maps/includes/parserHooks/Maps_DisplayPoint.php
2010-09-25 02:10:49 UTC (rev 73702)
@@ -87,7 +87,7 @@
global $egMapsMapWidth, $egMapsMapHeight,
$egMapsDefaultServices, $egMapsDefaultTitle, $egMapsDefaultLabel;
// TODO
- Validator::addOutputFormat( 'geoPoints', array( __CLASS__,
'formatGeoPoints' ) );
+ //Validator::addOutputFormat( 'geoPoints', array( __CLASS__,
'formatGeoPoints' ) );
$params = MapsMapper::getCommonParameters();
Modified: trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMaps.php
===================================================================
--- trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMaps.php
2010-09-25 01:48:28 UTC (rev 73701)
+++ trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMaps.php
2010-09-25 02:10:49 UTC (rev 73702)
@@ -57,8 +57,9 @@
protected function initParameterInfo( array &$params ) {
global $egMapsGoogleMapsType, $egMapsGoogleMapsTypes,
$egMapsGoogleAutozoom, $egMapsGMapControls;
- Validator::addOutputFormat( 'gmaptype', array( __CLASS__,
'setGMapType' ) );
- Validator::addOutputFormat( 'gmaptypes', array( __CLASS__,
'setGMapTypes' ) );
+ // TODO
+ //Validator::addOutputFormat( 'gmaptype', array( __CLASS__,
'setGMapType' ) );
+ //Validator::addOutputFormat( 'gmaptypes', array( __CLASS__,
'setGMapTypes' ) );
//$params['zoom']->addCriterion( new CriterionInRange( 0, 20 )
);
//$params['zoom']->setDefault( self::getDefaultZoom() );
Modified:
trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
===================================================================
--- trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
2010-09-25 01:48:28 UTC (rev 73701)
+++ trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
2010-09-25 02:10:49 UTC (rev 73702)
@@ -45,8 +45,9 @@
protected function initParameterInfo( array &$params ) {
global $egMapsGMaps3Type, $egMapsGMaps3Types;
- Validator::addOutputFormat( 'gmap3type', array( __CLASS__,
'setGMapType' ) );
- Validator::addOutputFormat( 'gmap3types', array( __CLASS__,
'setGMapTypes' ) );
+ // TODO
+ //Validator::addOutputFormat( 'gmap3type', array( __CLASS__,
'setGMapType' ) );
+ //Validator::addOutputFormat( 'gmap3types', array( __CLASS__,
'setGMapTypes' ) );
$params['type'] = new Parameter(
'type',
Modified: trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayers.php
===================================================================
--- trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayers.php
2010-09-25 01:48:28 UTC (rev 73701)
+++ trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayers.php
2010-09-25 02:10:49 UTC (rev 73702)
@@ -43,7 +43,8 @@
protected function initParameterInfo( array &$params ) {
global $egMapsOLLayers, $egMapsOLControls,
$egMapsOpenLayersZoom;
- Validator::addOutputFormat( 'olgroups', array( __CLASS__,
'unpackLayerGroups' ) );
+ // TODO
+ //Validator::addOutputFormat( 'olgroups', array( __CLASS__,
'unpackLayerGroups' ) );
//$params['zoom']->addCriterion( new CriterionInRange( 0, 19 )
);
//$params['zoom']->setDefault( self::getDefaultZoom() );
Modified: trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMaps.php
===================================================================
--- trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMaps.php
2010-09-25 01:48:28 UTC (rev 73701)
+++ trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMaps.php
2010-09-25 02:10:49 UTC (rev 73702)
@@ -43,8 +43,9 @@
protected function initParameterInfo( array &$params ) {
global $egMapsYahooAutozoom, $egMapsYahooMapsType,
$egMapsYahooMapsTypes, $egMapsYahooMapsZoom, $egMapsYMapControls;
- Validator::addOutputFormat( 'ymaptype', array( __CLASS__,
'setYMapType' ) );
- Validator::addOutputFormat( 'ymaptypes', array( __CLASS__,
'setYMapTypes' ) );
+ // TODO
+ //Validator::addOutputFormat( 'ymaptype', array( __CLASS__,
'setYMapType' ) );
+ //Validator::addOutputFormat( 'ymaptypes', array( __CLASS__,
'setYMapTypes' ) );
//$params['zoom']->addCriterion( new CriterionInRange( 1, 13 )
);
//$params['zoom']->setDefault( self::getDefaultZoom() );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
