http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73932
Revision: 73932
Author: jeroendedauw
Date: 2010-09-29 01:23:32 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
Changes for 0.7 - matching changes in Validator 0.4
Modified Paths:
--------------
trunk/extensions/Maps/Maps_Settings.php
trunk/extensions/Maps/includes/Maps_Mapper.php
trunk/extensions/Maps/includes/Maps_MappingService.php
trunk/extensions/Maps/includes/features/Maps_BasePointMap.php
trunk/extensions/Maps/includes/iMappingFeature.php
trunk/extensions/Maps/includes/iMappingService.php
trunk/extensions/Maps/includes/manipulations/Maps_ParamService.php
trunk/extensions/Maps/includes/parserHooks/Maps_DisplayMap.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_Settings.php
===================================================================
--- trunk/extensions/Maps/Maps_Settings.php 2010-09-29 00:56:58 UTC (rev
73931)
+++ trunk/extensions/Maps/Maps_Settings.php 2010-09-29 01:23:32 UTC (rev
73932)
@@ -90,7 +90,6 @@
include_once $egMapsDir . 'includes/services/OSM/OSM.php';
# Array of String. Array containing all the mapping services that will
be made available to the user.
- # Currently Maps provides the following services: googlemaps,
yahoomaps, openlayers, osm.
$egMapsAvailableServices = array(
'googlemaps2',
'googlemaps3',
Modified: trunk/extensions/Maps/includes/Maps_Mapper.php
===================================================================
--- trunk/extensions/Maps/includes/Maps_Mapper.php 2010-09-29 00:56:58 UTC
(rev 73931)
+++ trunk/extensions/Maps/includes/Maps_Mapper.php 2010-09-29 01:23:32 UTC
(rev 73932)
@@ -168,7 +168,7 @@
$params['zoom'] = new Parameter(
'zoom',
Parameter::TYPE_INTEGER,
- 10, // TODO
+ 10,
array( 'service' )
);
Modified: trunk/extensions/Maps/includes/Maps_MappingService.php
===================================================================
--- trunk/extensions/Maps/includes/Maps_MappingService.php 2010-09-29
00:56:58 UTC (rev 73931)
+++ trunk/extensions/Maps/includes/Maps_MappingService.php 2010-09-29
01:23:32 UTC (rev 73932)
@@ -41,16 +41,6 @@
protected $features;
/**
- * A list of parameter info specific to the service, which can be used
by any feature
- * to pass along to Validator to handle parameters.
- *
- * @since 0.6.3
- *
- * @var mixed Array or false
- */
- private $parameterInfo = false;
-
- /**
* A list of dependencies (header items) that have been added.
*
* @since 0.6.3
@@ -82,17 +72,13 @@
}
/**
- * @see iMappingService::getParameterInfo
+ * @see iMappingService::addParameterInfo
*
- * @since 0.6.3
+ * @since 0.7
+ *
+ * @param array $parameterInfo
*/
- public final function getParameterInfo() {
- if ( $this->parameterInfo === false ) {
- $this->parameterInfo = array();
- $this->initParameterInfo( $this->parameterInfo );
- }
-
- return $this->parameterInfo;
+ public function addParameterInfo( array &$parameterInfo ) {
}
/**
@@ -224,16 +210,4 @@
return array();
}
- /**
- * Initializes the service parameters.
- *
- * You can override this method to set service specific parameters in
the inheriting class.
- *
- * @since 0.6.3
- *
- * @param array $parameters
- */
- protected function initParameterInfo( array &$parameters ) {
- }
-
}
\ No newline at end of file
Modified: trunk/extensions/Maps/includes/features/Maps_BasePointMap.php
===================================================================
--- trunk/extensions/Maps/includes/features/Maps_BasePointMap.php
2010-09-29 00:56:58 UTC (rev 73931)
+++ trunk/extensions/Maps/includes/features/Maps_BasePointMap.php
2010-09-29 01:23:32 UTC (rev 73932)
@@ -181,7 +181,7 @@
// If centre is not set and there are multiple
markers, set the values to null,
// to be auto determined by the JS of the
mapping API.
$this->centreLat = 'null';
- $this->centreLon = 'null';
+ $this->centreLon = 'null';
}
else {
$this->setCentreToDefault();
Modified: trunk/extensions/Maps/includes/iMappingFeature.php
===================================================================
--- trunk/extensions/Maps/includes/iMappingFeature.php 2010-09-29 00:56:58 UTC
(rev 73931)
+++ trunk/extensions/Maps/includes/iMappingFeature.php 2010-09-29 01:23:32 UTC
(rev 73932)
@@ -9,6 +9,8 @@
* @ingroup Maps
*
* @author Jeroen De Dauw
+ *
+ * TODO: update to 0.7 architecture
*/
interface iMappingFeature {
Modified: trunk/extensions/Maps/includes/iMappingService.php
===================================================================
--- trunk/extensions/Maps/includes/iMappingService.php 2010-09-29 00:56:58 UTC
(rev 73931)
+++ trunk/extensions/Maps/includes/iMappingService.php 2010-09-29 01:23:32 UTC
(rev 73932)
@@ -31,14 +31,13 @@
function addDependencies( &$parserOrOut );
/**
- * Returns an array that specifies the parameters supported by this
service,
- * together with their meta-data. This is in a format usable by
Validator.
+ * Adds service-specific parameter definitions to the porvided
parameter list.
*
- * @since 0.6.3
+ * @since 0.7
*
* @return array
*/
- function getParameterInfo();
+ function addParameterInfo( array &$parameterInfo );
/**
* Adds a dependency that is needed for this service. It will be passed
along with the next
Modified: trunk/extensions/Maps/includes/manipulations/Maps_ParamService.php
===================================================================
--- trunk/extensions/Maps/includes/manipulations/Maps_ParamService.php
2010-09-29 00:56:58 UTC (rev 73931)
+++ trunk/extensions/Maps/includes/manipulations/Maps_ParamService.php
2010-09-29 01:23:32 UTC (rev 73932)
@@ -46,7 +46,7 @@
$serviceObject = MapsMappingServices::getServiceInstance(
$value );
// Add the service specific service parameters.
- $parameters = array_merge( $parameters,
$serviceObject->getParameterInfo() );
+ $serviceObject->addParameterInfo( $parameters );
}
}
\ No newline at end of file
Modified: trunk/extensions/Maps/includes/parserHooks/Maps_DisplayMap.php
===================================================================
--- trunk/extensions/Maps/includes/parserHooks/Maps_DisplayMap.php
2010-09-29 00:56:58 UTC (rev 73931)
+++ trunk/extensions/Maps/includes/parserHooks/Maps_DisplayMap.php
2010-09-29 01:23:32 UTC (rev 73932)
@@ -61,7 +61,7 @@
$params = MapsMapper::getCommonParameters();
- $params['mappingservice']->default =
$egMapsDefaultServices['display_map'];
+ $params['mappingservice']->setDefault(
$egMapsDefaultServices['display_map'] );
$params['mappingservice']->addManipulations( new
MapsParamService( 'display_map' ) );
$params['coordinates'] = new Parameter( 'coordinates' );
Modified: trunk/extensions/Maps/includes/parserHooks/Maps_DisplayPoint.php
===================================================================
--- trunk/extensions/Maps/includes/parserHooks/Maps_DisplayPoint.php
2010-09-29 00:56:58 UTC (rev 73931)
+++ trunk/extensions/Maps/includes/parserHooks/Maps_DisplayPoint.php
2010-09-29 01:23:32 UTC (rev 73932)
@@ -88,7 +88,7 @@
$params = MapsMapper::getCommonParameters();
- $params['mappingservice']->default =
$egMapsDefaultServices['display_point'];
+ $params['mappingservice']->setDefault(
$egMapsDefaultServices['display_point'] );
$params['mappingservice']->addManipulations( new
MapsParamService( 'display_point' ) );
$params['coordinates'] = new ListParameter( 'coordinates', ';'
);
Modified: trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMaps.php
===================================================================
--- trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMaps.php
2010-09-29 00:56:58 UTC (rev 73931)
+++ trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMaps.php
2010-09-29 01:23:32 UTC (rev 73932)
@@ -38,15 +38,15 @@
}
/**
- * @see MapsMappingService::initParameterInfo
+ * @see MapsMappingService::addParameterInfo
*
- * @since 0.5
+ * @since 0.7
*/
- protected function initParameterInfo( array &$params ) {
+ public function addParameterInfo( array &$params ) {
global $egMapsGoogleMapsType, $egMapsGoogleMapsTypes,
$egMapsGoogleAutozoom, $egMapsGMapControls, $egMapsGMapOverlays;
- //$params['zoom']->addCriteria( new CriterionInRange( 0, 20 ) );
- //$params['zoom']->setDefault( self::getDefaultZoom() );
+ $params['zoom']->addCriteria( new CriterionInRange( 0, 20 ) );
+ $params['zoom']->setDefault( self::getDefaultZoom() );
$params['controls'] = new ListParameter(
'controls',
Modified:
trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
===================================================================
--- trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
2010-09-29 00:56:58 UTC (rev 73931)
+++ trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
2010-09-29 01:23:32 UTC (rev 73932)
@@ -26,11 +26,11 @@
}
/**
- * @see MapsMappingService::initParameterInfo
+ * @see MapsMappingService::addParameterInfo
*
- * @since 0.5
+ * @since 0.7
*/
- protected function initParameterInfo( array &$params ) {
+ public function addParameterInfo( array &$params ) {
global $egMapsGMaps3Type;
$params['type'] = new Parameter(
Modified: trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayers.php
===================================================================
--- trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayers.php
2010-09-29 00:56:58 UTC (rev 73931)
+++ trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayers.php
2010-09-29 01:23:32 UTC (rev 73932)
@@ -36,15 +36,15 @@
}
/**
- * @see MapsMappingService::initParameterInfo
+ * @see MapsMappingService::addParameterInfo
*
- * @since 0.5
+ * @since 0.7
*/
- protected function initParameterInfo( array &$params ) {
+ public function addParameterInfo( array &$params ) {
global $egMapsOLLayers, $egMapsOLControls,
$egMapsOpenLayersZoom;
- //$params['zoom']->addCriteria( new CriterionInRange( 0, 19 ) );
- //$params['zoom']->setDefault( self::getDefaultZoom() );
+ $params['zoom']->addCriteria( new CriterionInRange( 0, 19 ) );
+ $params['zoom']->setDefault( self::getDefaultZoom() );
$params['controls'] = new ListParameter(
'controls',
Modified: trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMaps.php
===================================================================
--- trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMaps.php
2010-09-29 00:56:58 UTC (rev 73931)
+++ trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMaps.php
2010-09-29 01:23:32 UTC (rev 73932)
@@ -38,15 +38,15 @@
}
/**
- * @see MapsMappingService::initParameterInfo
+ * @see MapsMappingService::addParameterInfo
*
- * @since 0.5
+ * @since 0.7
*/
- protected function initParameterInfo( array &$params ) {
+ public function addParameterInfo( array &$params ) {
global $egMapsYahooAutozoom, $egMapsYahooMapsType,
$egMapsYahooMapsTypes, $egMapsYahooMapsZoom, $egMapsYMapControls;
- //$params['zoom']->addCriteria( new CriterionInRange( 1, 13 ) );
- //$params['zoom']->setDefault( self::getDefaultZoom() );
+ $params['zoom']->addCriteria( new CriterionInRange( 1, 13 ) );
+ $params['zoom']->setDefault( self::getDefaultZoom() );
$params['controls'] = new ListParameter(
'controls',
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
