http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72822
Revision: 72822
Author: jeroendedauw
Date: 2010-09-11 18:07:15 +0000 (Sat, 11 Sep 2010)
Log Message:
-----------
Fixed several small issues
Modified Paths:
--------------
trunk/extensions/Maps/includes/Maps_Mapper.php
trunk/extensions/Maps/includes/parserHooks/Maps_DisplayMap.php
trunk/extensions/Maps/includes/parserHooks/Maps_DisplayPoint.php
Modified: trunk/extensions/Maps/includes/Maps_Mapper.php
===================================================================
--- trunk/extensions/Maps/includes/Maps_Mapper.php 2010-09-11 17:34:58 UTC
(rev 72821)
+++ trunk/extensions/Maps/includes/Maps_Mapper.php 2010-09-11 18:07:15 UTC
(rev 72822)
@@ -170,8 +170,8 @@
$params['geoservice'] = new Parameter(
'geoservice',
Parameter::TYPE_STRING,
- null,
- array( 'service' ),
+ $egMapsDefaultGeoService,
+ array(),
array(
new CriterionInArray(
$egMapsAvailableGeoServices ),
),
@@ -181,33 +181,35 @@
$params['zoom'] = new Parameter(
'zoom',
Parameter::TYPE_INTEGER,
- null,
+ 10, // TODO
array( 'service' )
);
$params['width'] = new Parameter(
'width',
Parameter::TYPE_STRING,
- null,
+ $egMapsMapWidth,
array(),
array(
new CriterionMapDimension( 'width' ),
)
);
- $params['width']->outputTypes = array( 'mapdimension', 'width',
$egMapsMapWidth );
-
+ // TODO
+ $params['width']->outputTypes = array( 'mapdimension' => array(
'mapdimension', 'width', $egMapsMapWidth ) );
+
$params['height'] = new Parameter(
'height',
Parameter::TYPE_STRING,
- null,
+ $egMapsMapHeight,
array(),
array(
new CriterionMapDimension( 'height' ),
)
);
- $params['width']->outputTypes = array( 'mapdimension',
'height', $egMapsMapHeight );
+ // TODO
+ $params['height']->outputTypes = array( 'mapdimension' =>
array( 'mapdimension', 'height', $egMapsMapWidth ) );
return $params;
}
Modified: trunk/extensions/Maps/includes/parserHooks/Maps_DisplayMap.php
===================================================================
--- trunk/extensions/Maps/includes/parserHooks/Maps_DisplayMap.php
2010-09-11 17:34:58 UTC (rev 72821)
+++ trunk/extensions/Maps/includes/parserHooks/Maps_DisplayMap.php
2010-09-11 18:07:15 UTC (rev 72822)
@@ -61,12 +61,6 @@
return array_merge( MapsMapper::getCommonParameters(), array(
// TODO
- 'width' => array(
- 'default' => $egMapsMapWidth
- ),
- 'height' => array(
- 'default' => $egMapsMapHeight
- ),
'mappingservice' => array(
'default' =>
$egMapsDefaultServices['display_map']
),
Modified: trunk/extensions/Maps/includes/parserHooks/Maps_DisplayPoint.php
===================================================================
--- trunk/extensions/Maps/includes/parserHooks/Maps_DisplayPoint.php
2010-09-11 17:34:58 UTC (rev 72821)
+++ trunk/extensions/Maps/includes/parserHooks/Maps_DisplayPoint.php
2010-09-11 18:07:15 UTC (rev 72822)
@@ -90,12 +90,6 @@
return array_merge( MapsMapper::getCommonParameters(), array(
// TODO
- 'width' => array(
- 'default' => $egMapsMapWidth
- ),
- 'height' => array(
- 'default' => $egMapsMapHeight
- ),
'mappingservice' => array(
'default' =>
$egMapsDefaultServices['display_point']
),
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
