| Index: trunk/extensions/Maps/OpenLayers/OpenLayerFunctions.js |
| — | — | @@ -28,13 +28,13 @@ |
| 29 | 29 | |
| 30 | 30 | // Add the controls |
| 31 | 31 | for (i in controls) { |
| 32 | | - |
| | 32 | + |
| 33 | 33 | // If a string is provided, find the correct name for the control, and use eval to create the object itself |
| 34 | 34 | if (typeof controls[i] == 'string') { |
| 35 | 35 | if (controls[i].toLowerCase() == 'autopanzoom') { |
| 36 | 36 | if (height > 140) controls[i] = height > 320 ? 'panzoombar' : 'panzoom'; |
| 37 | | - } |
| 38 | | - |
| | 37 | + } |
| | 38 | + |
| 39 | 39 | control = getValidControlName(controls[i]); |
| 40 | 40 | |
| 41 | 41 | if (control) { |
| Index: trunk/extensions/Maps/OpenLayers/Maps_OpenLayers.php |
| — | — | @@ -110,10 +110,10 @@ |
| 111 | 111 | public static function getLayerNames() { |
| 112 | 112 | return array( |
| 113 | 113 | 'google', 'google-normal', 'google-satellite', 'google-hybrid', 'google-hybrid', 'google-physical', |
| 114 | | - 'bing', 'bing-normal', 'bing-satellite', 'bing-hybrid', |
| | 114 | + 'bing', 'virtual-earth', 'bing-normal', 'bing-satellite', 'bing-hybrid', |
| 115 | 115 | 'yahoo', 'yahoo-normal', 'yahoo-satellite', 'yahoo-hybrid', |
| 116 | | - 'openlayers', 'nasa', |
| 117 | | - 'openstreetmap', 'osmarender', 'osm-nik', 'osm-cycle' |
| | 116 | + 'openlayers', 'open-layers', 'nasa', |
| | 117 | + 'openstreetmap', 'osm', 'osmarender', 'osm-nik', 'osm-mapnik', 'osm-cycle', 'osm-cyclemap' |
| 118 | 118 | ); |
| 119 | 119 | } |
| 120 | 120 | |
| — | — | @@ -122,7 +122,7 @@ |
| 123 | 123 | * |
| 124 | 124 | * @param string $output The output to which the html to load the dependencies needs to be added |
| 125 | 125 | * @param string $layer The layer to check (and load the dependencies for |
| 126 | | - */ |
| | 126 | + */ |
| 127 | 127 | public static function loadDependencyWhenNeeded(&$output, $layer) { |
| 128 | 128 | global $wgJsMimeType; |
| 129 | 129 | global $egGoogleMapsOnThisPage, $egMapsScriptPath, $egMapsStyleVersion; |