http://www.mediawiki.org/wiki/Special:Code/MediaWiki/69024
Revision: 69024
Author: jeroendedauw
Date: 2010-07-04 22:10:42 +0000 (Sun, 04 Jul 2010)
Log Message:
-----------
Changes for 0.6.4 - follow up to moving service specific behavior and data to
service classes done in 0.6.3.
Modified Paths:
--------------
trunk/extensions/Maps/Features/DisplayMap/Maps_BaseMap.php
trunk/extensions/Maps/Features/DisplayPoint/Maps_BasePointMap.php
trunk/extensions/Maps/Features/Maps_iMapParserFunction.php
trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispMap.php
trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispPoint.php
trunk/extensions/Maps/Services/GoogleMaps3/Maps_GoogleMaps3DispMap.php
trunk/extensions/Maps/Services/GoogleMaps3/Maps_GoogleMaps3DispPoint.php
trunk/extensions/Maps/Services/OpenLayers/Maps_OpenLayersDispMap.php
trunk/extensions/Maps/Services/OpenLayers/Maps_OpenLayersDispPoint.php
trunk/extensions/Maps/Services/YahooMaps/Maps_YahooMapsDispMap.php
trunk/extensions/Maps/Services/YahooMaps/Maps_YahooMapsDispPoint.php
Modified: trunk/extensions/Maps/Features/DisplayMap/Maps_BaseMap.php
===================================================================
--- trunk/extensions/Maps/Features/DisplayMap/Maps_BaseMap.php 2010-07-04
21:55:34 UTC (rev 69023)
+++ trunk/extensions/Maps/Features/DisplayMap/Maps_BaseMap.php 2010-07-04
22:10:42 UTC (rev 69024)
@@ -35,7 +35,7 @@
private $specificParameters = false;
protected $featureParameters = false;
- protected abstract function getDefaultZoom();
+ protected abstract function getDefaultZoom();
public function __construct( MapsMappingService $service ) {
$this->mService = $service;
@@ -122,8 +122,6 @@
$this->parser = $parser;
$this->featureParameters = MapsDisplayMap::$parameters;
-
- $this->doMapServiceLoad();
$this->setMapProperties( $params );
@@ -141,12 +139,6 @@
}
/**
- * Optionally override.
- */
- public function doMapServiceLoad() {
- }
-
- /**
* Sets the $centreLat and $centreLon fields.
*/
private function setCentre() {
Modified: trunk/extensions/Maps/Features/DisplayPoint/Maps_BasePointMap.php
===================================================================
--- trunk/extensions/Maps/Features/DisplayPoint/Maps_BasePointMap.php
2010-07-04 21:55:34 UTC (rev 69023)
+++ trunk/extensions/Maps/Features/DisplayPoint/Maps_BasePointMap.php
2010-07-04 22:10:42 UTC (rev 69024)
@@ -39,6 +39,8 @@
private $specificParameters = false;
private $markerData = array();
+ protected abstract function getDefaultZoom();
+
public function __construct( MapsMappingService $service ) {
$this->mService = $service;
}
@@ -139,8 +141,6 @@
$this->parser = $parser;
$this->featureParameters = MapsDisplayPoint::$parameters;
-
- $this->doMapServiceLoad();
$this->setMapProperties( $params );
Modified: trunk/extensions/Maps/Features/Maps_iMapParserFunction.php
===================================================================
--- trunk/extensions/Maps/Features/Maps_iMapParserFunction.php 2010-07-04
21:55:34 UTC (rev 69023)
+++ trunk/extensions/Maps/Features/Maps_iMapParserFunction.php 2010-07-04
22:10:42 UTC (rev 69024)
@@ -26,11 +26,6 @@
function getMapHtml( Parser &$parser, array $params );
/**
- * Map service specific map count and loading of dependencies.
- */
- function doMapServiceLoad();
-
- /**
* Adds the HTML specific to the mapping service to the output.
*/
function addSpecificMapHTML();
Modified: trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispMap.php
===================================================================
--- trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispMap.php
2010-07-04 21:55:34 UTC (rev 69023)
+++ trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispMap.php
2010-07-04 22:10:42 UTC (rev 69024)
@@ -42,22 +42,12 @@
}
/**
- * @see MapsBaseMap::doMapServiceLoad()
- */
- public function doMapServiceLoad() {
- global $egGoogleMapsOnThisPage;
-
- $egGoogleMapsOnThisPage++;
-
- $this->elementNr = $egGoogleMapsOnThisPage;
- }
-
- /**
* @see MapsBaseMap::addSpecificMapHTML()
*/
public function addSpecificMapHTML() {
global $egMapsGoogleMapsPrefix, $egGoogleMapsOnThisPage;
+ $egGoogleMapsOnThisPage++;
$mapName = $egMapsGoogleMapsPrefix . '_' .
$egGoogleMapsOnThisPage;
$this->mService->addOverlayOutput( $this->output, $mapName,
$this->overlays, $this->controls );
Modified: trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispPoint.php
===================================================================
--- trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispPoint.php
2010-07-04 21:55:34 UTC (rev 69023)
+++ trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMapsDispPoint.php
2010-07-04 22:10:42 UTC (rev 69024)
@@ -42,17 +42,6 @@
),
);
}
-
- /**
- * @see MapsBaseMap::doMapServiceLoad()
- */
- public function doMapServiceLoad() {
- global $egGoogleMapsOnThisPage;
-
- $egGoogleMapsOnThisPage++;
-
- $this->elementNr = $egGoogleMapsOnThisPage;
- }
/**
* @see MapsBaseMap::addSpecificMapHTML()
@@ -60,6 +49,7 @@
public function addSpecificMapHTML() {
global $egMapsGoogleMapsPrefix, $egGoogleMapsOnThisPage;
+ $egGoogleMapsOnThisPage++;
$mapName = $egMapsGoogleMapsPrefix . '_' .
$egGoogleMapsOnThisPage;
$this->mService->addOverlayOutput( $this->output, $mapName,
$this->overlays, $this->controls );
Modified: trunk/extensions/Maps/Services/GoogleMaps3/Maps_GoogleMaps3DispMap.php
===================================================================
--- trunk/extensions/Maps/Services/GoogleMaps3/Maps_GoogleMaps3DispMap.php
2010-07-04 21:55:34 UTC (rev 69023)
+++ trunk/extensions/Maps/Services/GoogleMaps3/Maps_GoogleMaps3DispMap.php
2010-07-04 22:10:42 UTC (rev 69024)
@@ -28,24 +28,13 @@
}
/**
- * @see MapsBaseMap::doMapServiceLoad()
- *
- */
- public function doMapServiceLoad() {
- global $egGMaps3OnThisPage;
-
- $egGMaps3OnThisPage++;
-
- $this->elementNr = $egGMaps3OnThisPage;
- }
-
- /**
* @see MapsBaseMap::addSpecificMapHTML()
*
*/
public function addSpecificMapHTML() {
global $egMapsGMaps3Prefix, $egGMaps3OnThisPage;
+ $egGMaps3OnThisPage++;
$mapName = $egMapsGMaps3Prefix . '_' . $egGMaps3OnThisPage;
$this->output .= Html::element(
Modified:
trunk/extensions/Maps/Services/GoogleMaps3/Maps_GoogleMaps3DispPoint.php
===================================================================
--- trunk/extensions/Maps/Services/GoogleMaps3/Maps_GoogleMaps3DispPoint.php
2010-07-04 21:55:34 UTC (rev 69023)
+++ trunk/extensions/Maps/Services/GoogleMaps3/Maps_GoogleMaps3DispPoint.php
2010-07-04 22:10:42 UTC (rev 69024)
@@ -30,24 +30,13 @@
}
/**
- * @see MapsBaseMap::doMapServiceLoad()
- *
- */
- public function doMapServiceLoad() {
- global $egGMaps3OnThisPage;
-
- $egGMaps3OnThisPage++;
-
- $this->elementNr = $egGMaps3OnThisPage;
- }
-
- /**
* @see MapsBaseMap::addSpecificMapHTML()
*
*/
public function addSpecificMapHTML() {
global $egMapsGMaps3Prefix, $egGMaps3OnThisPage;
+ $egGMaps3OnThisPage++;
$mapName = $egMapsGMaps3Prefix . '_' . $egGMaps3OnThisPage;
$this->output .= Html::element(
Modified: trunk/extensions/Maps/Services/OpenLayers/Maps_OpenLayersDispMap.php
===================================================================
--- trunk/extensions/Maps/Services/OpenLayers/Maps_OpenLayersDispMap.php
2010-07-04 21:55:34 UTC (rev 69023)
+++ trunk/extensions/Maps/Services/OpenLayers/Maps_OpenLayersDispMap.php
2010-07-04 22:10:42 UTC (rev 69024)
@@ -21,17 +21,6 @@
}
/**
- * @see MapsBaseMap::doMapServiceLoad()
- */
- public function doMapServiceLoad() {
- global $egOpenLayersOnThisPage;
-
- $egOpenLayersOnThisPage++;
-
- $this->elementNr = $egOpenLayersOnThisPage;
- }
-
- /**
* @see MapsBaseMap::addSpecificMapHTML()
*/
public function addSpecificMapHTML() {
@@ -39,6 +28,7 @@
$layerItems =
$this->mService->createLayersStringAndLoadDependencies( $this->layers );
+ $egOpenLayersOnThisPage++;
$mapName = $egMapsOpenLayersPrefix . '_' .
$egOpenLayersOnThisPage;
$this->output .= Html::element(
Modified: trunk/extensions/Maps/Services/OpenLayers/Maps_OpenLayersDispPoint.php
===================================================================
--- trunk/extensions/Maps/Services/OpenLayers/Maps_OpenLayersDispPoint.php
2010-07-04 21:55:34 UTC (rev 69023)
+++ trunk/extensions/Maps/Services/OpenLayers/Maps_OpenLayersDispPoint.php
2010-07-04 22:10:42 UTC (rev 69024)
@@ -28,17 +28,6 @@
}
/**
- * @see MapsBaseMap::doMapServiceLoad()
- */
- public function doMapServiceLoad() {
- global $egOpenLayersOnThisPage;
-
- $egOpenLayersOnThisPage++;
-
- $this->elementNr = $egOpenLayersOnThisPage;
- }
-
- /**
* @see MapsBaseMap::addSpecificMapHTML()
*/
public function addSpecificMapHTML() {
@@ -46,6 +35,7 @@
$layerItems =
$this->mService->createLayersStringAndLoadDependencies( $this->layers );
+ $egOpenLayersOnThisPage++;
$mapName = $egMapsOpenLayersPrefix . '_' .
$egOpenLayersOnThisPage;
$this->output .= Html::element(
Modified: trunk/extensions/Maps/Services/YahooMaps/Maps_YahooMapsDispMap.php
===================================================================
--- trunk/extensions/Maps/Services/YahooMaps/Maps_YahooMapsDispMap.php
2010-07-04 21:55:34 UTC (rev 69023)
+++ trunk/extensions/Maps/Services/YahooMaps/Maps_YahooMapsDispMap.php
2010-07-04 22:10:42 UTC (rev 69024)
@@ -21,22 +21,12 @@
}
/**
- * @see MapsBaseMap::doMapServiceLoad()
- */
- public function doMapServiceLoad() {
- global $egYahooMapsOnThisPage;
-
- $egYahooMapsOnThisPage++;
-
- $this->elementNr = $egYahooMapsOnThisPage;
- }
-
- /**
* @see MapsBaseMap::addSpecificMapHTML()
*/
public function addSpecificMapHTML() {
global $egMapsYahooMapsPrefix, $egYahooMapsOnThisPage;
+ $egYahooMapsOnThisPage++;
$mapName = $egMapsYahooMapsPrefix . '_' .
$egYahooMapsOnThisPage;
$this->output .= Html::element(
@@ -69,4 +59,4 @@
) );
}
-}
+}
\ No newline at end of file
Modified: trunk/extensions/Maps/Services/YahooMaps/Maps_YahooMapsDispPoint.php
===================================================================
--- trunk/extensions/Maps/Services/YahooMaps/Maps_YahooMapsDispPoint.php
2010-07-04 21:55:34 UTC (rev 69023)
+++ trunk/extensions/Maps/Services/YahooMaps/Maps_YahooMapsDispPoint.php
2010-07-04 22:10:42 UTC (rev 69024)
@@ -28,24 +28,13 @@
}
/**
- * @see MapsBaseMap::doMapServiceLoad()
- *
- */
- public function doMapServiceLoad() {
- global $egYahooMapsOnThisPage;
-
- $egYahooMapsOnThisPage++;
-
- $this->elementNr = $egYahooMapsOnThisPage;
- }
-
- /**
* @see MapsBaseMap::addSpecificMapHTML()
*
*/
public function addSpecificMapHTML() {
global $egMapsYahooMapsPrefix, $egYahooMapsOnThisPage;
+ $egYahooMapsOnThisPage++;
$mapName = $egMapsYahooMapsPrefix . '_' .
$egYahooMapsOnThisPage;
$this->output .= Html::element(
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
