http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73927
Revision: 73927
Author: jeroendedauw
Date: 2010-09-28 22:18:28 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
Changes for 0.7 - fixed default OL layers
Modified Paths:
--------------
trunk/extensions/Maps/Maps_Settings.php
trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayers.php
Modified: trunk/extensions/Maps/Maps_Settings.php
===================================================================
--- trunk/extensions/Maps/Maps_Settings.php 2010-09-28 20:58:53 UTC (rev
73926)
+++ trunk/extensions/Maps/Maps_Settings.php 2010-09-28 22:18:28 UTC (rev
73927)
@@ -376,9 +376,11 @@
# Array of String. The default layers for Open Layers. This
value will only be
# used when the user does not provide one.
- # Available values: google, bing, yahoo, openlayers, nasa
$egMapsOLLayers = array(
- 'openlayers-wms'
+ 'osmarender',
+ 'osm-cyclemap',
+ 'osm-mapnik'
+
);
# The difinitions for the layers that should be available for
the user.
@@ -395,9 +397,6 @@
'osm-mapnik' => array(
'OpenLayers.Layer.OSM.Mapnik("OSM Mapnik")', 'osm' ),
'osm-cyclemap' => array(
'OpenLayers.Layer.OSM.CycleMap("OSM Cycle Map")', 'osm' ),
- 'openlayers-wms' => array( 'OpenLayers.Layer.WMS(
"OpenLayers WMS", "http://labs.metacarta.com/wms/vmap0";,
- {layers: "basic", "sphericalMercator":true} )',
'ol-wms' ),
-
'nasa' => 'OpenLayers.Layer.WMS("NASA Global Mosaic",
"http://t1.hypercube.telascience.org/cgi-bin/landsat7";,
{layers: "landsat7", "sphericalMercator":true}
)',
Modified: trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayers.php
===================================================================
--- trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayers.php
2010-09-28 20:58:53 UTC (rev 73926)
+++ trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayers.php
2010-09-28 22:18:28 UTC (rev 73927)
@@ -69,6 +69,7 @@
)
);
$params['layers']->addManipulations( new MapsParamOLLayers() );
+ $params['layers']->setDoManipulationOfDefault( true );
}
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
