http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94175
Revision: 94175
Author: jeroendedauw
Date: 2011-08-10 17:59:20 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
fu r94168
Modified Paths:
--------------
trunk/extensions/Maps/Maps.i18n.php
trunk/extensions/Maps/Maps_Settings.php
trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
Modified: trunk/extensions/Maps/Maps.i18n.php
===================================================================
--- trunk/extensions/Maps/Maps.i18n.php 2011-08-10 17:46:44 UTC (rev 94174)
+++ trunk/extensions/Maps/Maps.i18n.php 2011-08-10 17:59:20 UTC (rev 94175)
@@ -186,6 +186,7 @@
'maps-googlemaps3-par-kml' => 'KML files to load onto the map.',
'maps-googlemaps3-par-gkml' => 'KML files hosted by Google to load onto
the map.',
'maps-googlemaps3-par-fusiontables' => 'IDs of Google Fusion Tables
which should be loaded onto the map.',
+ 'maps-googlemaps3-par-tilt' => 'Tilt for the Map when using Google
Maps.',
// OpenLayers
'maps-openlayers-par-controls' => 'The controls to place on the map.',
Modified: trunk/extensions/Maps/Maps_Settings.php
===================================================================
--- trunk/extensions/Maps/Maps_Settings.php 2011-08-10 17:46:44 UTC (rev
94174)
+++ trunk/extensions/Maps/Maps_Settings.php 2011-08-10 17:59:20 UTC (rev
94175)
@@ -215,6 +215,8 @@
$egMapsGMaps3Layers = array();
+ $egMapsGMaps3DefaultTilt = 0;
+
$egGoogleJsApiKey = '';
Modified:
trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
===================================================================
--- trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
2011-08-10 17:46:44 UTC (rev 94174)
+++ trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
2011-08-10 17:59:20 UTC (rev 94175)
@@ -84,7 +84,7 @@
public function addParameterInfo( array &$params ) {
global $egMapsGMaps3Type, $egMapsGMaps3Types,
$egMapsGMaps3Controls, $egMapsGMaps3Layers;
global $egMapsGMaps3DefTypeStyle, $egMapsGMaps3DefZoomStyle,
$egMapsGMaps3AutoInfoWindows;
- global $egMapsResizableByDefault;
+ global $egMapsResizableByDefault, $egMapsGMaps3DefaultTilt;
$params['zoom']->addCriteria( new CriterionInRange( 0, 20 ) );
$params['zoom']->setDefault( self::getDefaultZoom() );
@@ -145,10 +145,9 @@
$params['resizable']->setDefault( $egMapsResizableByDefault,
false );
$params['resizable']->setMessage( 'maps-par-resizable' );
- $egMapsGMaps3DefaultTilt = 15; // TODO
$params['tilt'] = new Parameter( 'tilt',
Parameter::TYPE_INTEGER );
$params['tilt']->setDefault( $egMapsGMaps3DefaultTilt, false );
- $params['tilt']->setMessage( 'maps-par-tilt' );
+ $params['tilt']->setMessage( 'maps-googlemaps3-par-tilt' );
}
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
