http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65446
Revision: 65446
Author: jeroendedauw
Date: 2010-04-22 21:47:02 +0000 (Thu, 22 Apr 2010)
Log Message:
-----------
Fixed parameter issue with the QP's
Modified Paths:
--------------
trunk/extensions/SemanticMaps/QueryPrinters/SM_MapPrinter.php
trunk/extensions/SemanticMaps/SemanticMaps.php
Modified: trunk/extensions/SemanticMaps/QueryPrinters/SM_MapPrinter.php
===================================================================
--- trunk/extensions/SemanticMaps/QueryPrinters/SM_MapPrinter.php
2010-04-22 21:35:41 UTC (rev 65445)
+++ trunk/extensions/SemanticMaps/QueryPrinters/SM_MapPrinter.php
2010-04-22 21:47:02 UTC (rev 65446)
@@ -54,11 +54,7 @@
protected $m_locations = array();
protected $defaultZoom;
- protected $elementNr;
- protected $elementNamePrefix;
- protected $mapName;
-
protected $centreLat;
protected $centreLon;
@@ -68,7 +64,7 @@
protected $mapFeature;
protected $featureParameters = array();
- protected $spesificParameters = array();
+ protected $spesificParameters = array();
/**
* Builds up and returns the HTML for the map, with the queried
coordinate data on it.
@@ -125,9 +121,9 @@
* again overidden by the service parameters (the ones spesific
to the service),
* and finally by the spesific parameters (the ones spesific to
a service-feature combination).
*/
- $parameterInfo = /* array_merge( MapsMapper::getMainParams(),
*/ $this->featureParameters /*)*/;
- $parameterInfo = array_merge( $parameterInfo,
$egMapsServices[$this->serviceName]['parameters'] );
- $parameterInfo = array_merge( $parameterInfo,
$this->spesificParameters );
+ $parameterInfo = array_merge_recursive(
MapsMapper::getCommonParameters(), $this->featureParameters );
+ $parameterInfo = array_merge_recursive( $parameterInfo,
$egMapsServices[$this->serviceName]['parameters'] );
+ $parameterInfo = array_merge_recursive( $parameterInfo,
$this->spesificParameters );
$manager = new ValidatorManager();
Modified: trunk/extensions/SemanticMaps/SemanticMaps.php
===================================================================
--- trunk/extensions/SemanticMaps/SemanticMaps.php 2010-04-22 21:35:41 UTC
(rev 65445)
+++ trunk/extensions/SemanticMaps/SemanticMaps.php 2010-04-22 21:47:02 UTC
(rev 65446)
@@ -35,7 +35,7 @@
// Only initialize the extension when all dependencies are present.
if ( defined( 'Maps_VERSION' ) && defined( 'SMW_VERSION' ) ) {
- define( 'SM_VERSION', '0.6 a15' );
+ define( 'SM_VERSION', '0.6 a17' );
$smgScriptPath = ( isset( $wgExtensionAssetsPath ) &&
$wgExtensionAssetsPath ? $wgExtensionAssetsPath : $wgScriptPath . '/extensions'
) . '/SemanticMaps';
$smgDir = dirname( __FILE__ ) . '/';
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
