http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73767
Revision: 73767
Author: jeroendedauw
Date: 2010-09-26 04:51:01 +0000 (Sun, 26 Sep 2010)
Log Message:
-----------
Changes for 0.7 - Follow up to r73766
Modified Paths:
--------------
trunk/extensions/Maps/Maps.php
trunk/extensions/Maps/includes/Maps_CoordinateParser.php
trunk/extensions/Maps/includes/Maps_DistanceParser.php
trunk/extensions/Maps/includes/features/Maps_BaseMap.php
trunk/extensions/Maps/includes/iMappingService.php
trunk/extensions/Maps/includes/parserHooks/Maps_DisplayMap.php
trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMaps.php
trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMapsDispMap.php
trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3DispMap.php
trunk/extensions/Maps/includes/services/OSM/Maps_OSMDispMap.php
trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayers.php
trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayersDispMap.php
trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMaps.php
trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMapsDispMap.php
Modified: trunk/extensions/Maps/Maps.php
===================================================================
--- trunk/extensions/Maps/Maps.php 2010-09-26 04:50:36 UTC (rev 73766)
+++ trunk/extensions/Maps/Maps.php 2010-09-26 04:51:01 UTC (rev 73767)
@@ -36,7 +36,7 @@
echo '<b>Warning:</b> You need to have <a
href="http://www.mediawiki.org/wiki/Extension:Validator";>Validator</a>
installed in order to use <a
href="http://www.mediawiki.org/wiki/Extension:Maps";>Maps</a>.';
}
else {
- define( 'Maps_VERSION', '0.7 alpha-4' );
+ define( 'Maps_VERSION', '0.7 alpha-5' );
// The different coordinate notations.
define( 'Maps_COORDS_FLOAT', 'float' );
Modified: trunk/extensions/Maps/includes/Maps_CoordinateParser.php
===================================================================
--- trunk/extensions/Maps/includes/Maps_CoordinateParser.php 2010-09-26
04:50:36 UTC (rev 73766)
+++ trunk/extensions/Maps/includes/Maps_CoordinateParser.php 2010-09-26
04:51:01 UTC (rev 73767)
@@ -13,9 +13,10 @@
* regex to also accept dm and dd, which can give unexpected results in certain
* usecases. The different seperator support could also be made nice.
*
+ * @since 0.6
+ *
* @file Maps_CoordinateParser.php
* @ingroup Maps
- * @since 0.6
*
* @author Jeroen De Dauw
*/
Modified: trunk/extensions/Maps/includes/Maps_DistanceParser.php
===================================================================
--- trunk/extensions/Maps/includes/Maps_DistanceParser.php 2010-09-26
04:50:36 UTC (rev 73766)
+++ trunk/extensions/Maps/includes/Maps_DistanceParser.php 2010-09-26
04:51:01 UTC (rev 73767)
@@ -1,21 +1,9 @@
<?php
/**
- * File holding class MapsDistanceParser.
- *
- * @file Maps_DistanceParser.php
- * @ingroup Maps
- *
- * @author Jeroen De Dauw
- */
-
-if ( !defined( 'MEDIAWIKI' ) ) {
- die( 'Not an entry point.' );
-}
-
-/**
* Static class for distance validation and parsing. Internal
representatations are in meters.
*
+ * @file Maps_DistanceParser.php
* @ingroup Maps
*
* @since 0.6
Modified: trunk/extensions/Maps/includes/features/Maps_BaseMap.php
===================================================================
--- trunk/extensions/Maps/includes/features/Maps_BaseMap.php 2010-09-26
04:50:36 UTC (rev 73766)
+++ trunk/extensions/Maps/includes/features/Maps_BaseMap.php 2010-09-26
04:51:01 UTC (rev 73767)
@@ -79,10 +79,11 @@
* mapping services, calling the specific methods and finally returning
the resulting output.
*
* @param array $params
+ * @param Parser $parser
*
* @return html
*/
- public final function getMapHtml( array $params ) {
+ public final function getMapHtml( array $params, Parser $parser ) {
$this->setMapProperties( $params );
$this->setCentre();
@@ -91,9 +92,9 @@
$this->zoom = $this->service->getDefaultZoom();
}
- $this->addSpecificMapHTML();
+ $this->addSpecificMapHTML( $parser );
- $this->service->addDependencies( $this->parser );
+ $this->service->addDependencies( $parser );
return $this->output;
}
Modified: trunk/extensions/Maps/includes/iMappingService.php
===================================================================
--- trunk/extensions/Maps/includes/iMappingService.php 2010-09-26 04:50:36 UTC
(rev 73766)
+++ trunk/extensions/Maps/includes/iMappingService.php 2010-09-26 04:51:01 UTC
(rev 73767)
@@ -1,25 +1,15 @@
<?php
/**
- * File holding interface iMapParserFunction.
+ * Interface that should be implemented by all mapping feature classes.
*
+ * @since 0.6.3
+ *
* @file iMappingService.php
* @ingroup Maps
*
* @author Jeroen De Dauw
*/
-
-if ( !defined( 'MEDIAWIKI' ) ) {
- die( 'Not an entry point.' );
-}
-
-/**
- * Interface that should be implemented by all mapping feature classes.
- *
- * @since 0.6.3
- *
- * @author Jeroen De Dauw
- */
interface iMappingService {
/**
Modified: trunk/extensions/Maps/includes/parserHooks/Maps_DisplayMap.php
===================================================================
--- trunk/extensions/Maps/includes/parserHooks/Maps_DisplayMap.php
2010-09-26 04:50:36 UTC (rev 73766)
+++ trunk/extensions/Maps/includes/parserHooks/Maps_DisplayMap.php
2010-09-26 04:51:01 UTC (rev 73767)
@@ -97,18 +97,12 @@
*/
public function render( array $parameters ) {
// Get the instance of the service class.
- $service = MapsMappingServices::getValidServiceInstance(
$parameters['mappingservice'], $this->getName() );
+ $service = MapsMappingServices::getServiceInstance(
$parameters['mappingservice'], $this->getName() );
// Get an instance of the class handling the current parser
hook and service.
$mapClass = $service->getFeatureInstance( $this->getName() );
- if ( $mapClass === false ) {
- return ''; // TODO
- }
- else {
- return ''; // TODO
- //return $mapClass->getMapHtml( $parameters );
- }
+ return $mapClass->getMapHtml( $parameters, $this->parser );
}
}
\ No newline at end of file
Modified: trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMaps.php
===================================================================
--- trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMaps.php
2010-09-26 04:50:36 UTC (rev 73766)
+++ trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMaps.php
2010-09-26 04:51:01 UTC (rev 73767)
@@ -45,7 +45,7 @@
protected function initParameterInfo( array &$params ) {
global $egMapsGoogleMapsType, $egMapsGoogleMapsTypes,
$egMapsGoogleAutozoom, $egMapsGMapControls, $egMapsGMapOverlays;
- //$params['zoom']->addCriterion( new CriterionInRange( 0, 20 )
);
+ //$params['zoom']->addCriteria( new CriterionInRange( 0, 20 ) );
//$params['zoom']->setDefault( self::getDefaultZoom() );
$params['controls'] = new ListParameter(
@@ -104,6 +104,7 @@
ListParameter::DEFAULT_DELIMITER,
Parameter::TYPE_STRING,
$egMapsGMapOverlays,
+ array(),
array(
new CriterionGoogleOverlay( self::$overlayData )
)
Modified:
trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMapsDispMap.php
===================================================================
---
trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMapsDispMap.php
2010-09-26 04:50:36 UTC (rev 73766)
+++
trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMapsDispMap.php
2010-09-26 04:51:01 UTC (rev 73767)
@@ -28,7 +28,7 @@
/**
* @see MapsBaseMap::addSpecificMapHTML()
*/
- public function addSpecificMapHTML() {
+ public function addSpecificMapHTML( Parser $parser ) {
$mapName = $this->service->getMapId();
$this->service->addOverlayOutput( $this->output, $mapName,
$this->overlays, $this->controls );
@@ -42,7 +42,7 @@
wfMsg( 'maps-loading-map' )
);
- $this->parser->getOutput()->addHeadItem(
+ $parser->getOutput()->addHeadItem(
Html::inlineScript( <<<EOT
addOnloadHook(
function() {
Modified:
trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3DispMap.php
===================================================================
---
trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3DispMap.php
2010-09-26 04:50:36 UTC (rev 73766)
+++
trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3DispMap.php
2010-09-26 04:51:01 UTC (rev 73767)
@@ -25,7 +25,7 @@
/**
* @see MapsBaseMap::addSpecificMapHTML()
*/
- public function addSpecificMapHTML() {
+ public function addSpecificMapHTML( Parser $parser ) {
$mapName = $this->service->getMapId();
$this->output .= Html::element(
@@ -37,7 +37,7 @@
null
);
- $this->parser->getOutput()->addHeadItem(
+ $parser->getOutput()->addHeadItem(
Html::inlineScript( <<<EOT
addOnloadHook(
function() {
Modified: trunk/extensions/Maps/includes/services/OSM/Maps_OSMDispMap.php
===================================================================
--- trunk/extensions/Maps/includes/services/OSM/Maps_OSMDispMap.php
2010-09-26 04:50:36 UTC (rev 73766)
+++ trunk/extensions/Maps/includes/services/OSM/Maps_OSMDispMap.php
2010-09-26 04:51:01 UTC (rev 73767)
@@ -29,7 +29,7 @@
*
* @since 0.6.4
*/
- public function addSpecificMapHTML() {
+ public function addSpecificMapHTML( Parser $parser ) {
$this->output .= Html::element(
'iframe',
array(
Modified: trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayers.php
===================================================================
--- trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayers.php
2010-09-26 04:50:36 UTC (rev 73766)
+++ trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayers.php
2010-09-26 04:51:01 UTC (rev 73767)
@@ -43,7 +43,7 @@
protected function initParameterInfo( array &$params ) {
global $egMapsOLLayers, $egMapsOLControls,
$egMapsOpenLayersZoom;
- //$params['zoom']->addCriterion( new CriterionInRange( 0, 19 )
);
+ //$params['zoom']->addCriteria( new CriterionInRange( 0, 19 ) );
//$params['zoom']->setDefault( self::getDefaultZoom() );
$params['controls'] = new ListParameter(
Modified:
trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayersDispMap.php
===================================================================
---
trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayersDispMap.php
2010-09-26 04:50:36 UTC (rev 73766)
+++
trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayersDispMap.php
2010-09-26 04:51:01 UTC (rev 73767)
@@ -18,7 +18,7 @@
/**
* @see MapsBaseMap::addSpecificMapHTML()
*/
- public function addSpecificMapHTML() {
+ public function addSpecificMapHTML( Parser $parser ) {
global $wgLang;
$layerItems =
$this->service->createLayersStringAndLoadDependencies( $this->layers );
@@ -36,7 +36,7 @@
$langCode = $wgLang->getCode();
- $this->parser->getOutput()->addHeadItem(
+ $parser->getOutput()->addHeadItem(
Html::inlineScript( <<<EOT
addOnloadHook(
function() {
Modified: trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMaps.php
===================================================================
--- trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMaps.php
2010-09-26 04:50:36 UTC (rev 73766)
+++ trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMaps.php
2010-09-26 04:51:01 UTC (rev 73767)
@@ -45,7 +45,7 @@
protected function initParameterInfo( array &$params ) {
global $egMapsYahooAutozoom, $egMapsYahooMapsType,
$egMapsYahooMapsTypes, $egMapsYahooMapsZoom, $egMapsYMapControls;
- //$params['zoom']->addCriterion( new CriterionInRange( 1, 13 )
);
+ //$params['zoom']->addCriteria( new CriterionInRange( 1, 13 ) );
//$params['zoom']->setDefault( self::getDefaultZoom() );
$params['controls'] = new ListParameter(
Modified:
trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMapsDispMap.php
===================================================================
--- trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMapsDispMap.php
2010-09-26 04:50:36 UTC (rev 73766)
+++ trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMapsDispMap.php
2010-09-26 04:51:01 UTC (rev 73767)
@@ -18,7 +18,7 @@
/**
* @see MapsBaseMap::addSpecificMapHTML()
*/
- public function addSpecificMapHTML() {
+ public function addSpecificMapHTML( Parser $parser ) {
$mapName = $this->service->getMapId();
$this->output .= Html::element(
@@ -30,7 +30,7 @@
wfMsg( 'maps-loading-map' )
);
- $this->parser->getOutput()->addHeadItem(
+ $parser->getOutput()->addHeadItem(
Html::inlineScript( <<<EOT
addOnloadHook(
function() {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
