| Index: branches/Maps0.8/Maps.php |
| — | — | @@ -10,6 +10,7 @@ |
| 11 | 11 | * @file Maps.php |
| 12 | 12 | * @ingroup Maps |
| 13 | 13 | * |
| | 14 | + * @licence GNU GPL v3 |
| 14 | 15 | * @author Jeroen De Dauw < jeroendedauw@gmail.com > |
| 15 | 16 | */ |
| 16 | 17 | |
| Index: branches/Maps0.8/Maps_Settings.php |
| — | — | @@ -83,7 +83,7 @@ |
| 84 | 84 | # Commenting or removing a mapping service will make Maps completely ignore it, and so improve performance. |
| 85 | 85 | |
| 86 | 86 | # Google Maps API v2 |
| 87 | | - include_once $egMapsDir . 'includes/services/GoogleMaps/GoogleMaps.php'; |
| | 87 | + // include_once $egMapsDir . 'includes/services/GoogleMaps/GoogleMaps.php'; |
| 88 | 88 | |
| 89 | 89 | # Google Maps API v3 |
| 90 | 90 | include_once $egMapsDir . 'includes/services/GoogleMaps3/GoogleMaps3.php'; |
| — | — | @@ -99,7 +99,7 @@ |
| 100 | 100 | |
| 101 | 101 | # Array of String. Array containing all the mapping services that will be made available to the user. |
| 102 | 102 | $egMapsAvailableServices = array( |
| 103 | | - 'googlemaps2', |
| | 103 | + //'googlemaps2', |
| 104 | 104 | 'googlemaps3', |
| 105 | 105 | //'yahoomaps', |
| 106 | 106 | 'openlayers', |
| Index: branches/Maps0.8/includes/services/GoogleMaps3/jquery.googlemap.js |
| — | — | @@ -43,7 +43,7 @@ |
| 44 | 44 | title: location.title |
| 45 | 45 | } ); |
| 46 | 46 | |
| 47 | | - this.openWindow = false; |
| | 47 | + marker.openWindow = false; |
| 48 | 48 | |
| 49 | 49 | if ( location.text != '' ) { |
| 50 | 50 | marker.text = location.text; |
| — | — | @@ -64,9 +64,9 @@ |
| 65 | 65 | |
| 66 | 66 | var bounds; |
| 67 | 67 | |
| 68 | | - if ( ( options.centre === false || options.zoom === false ) && options.locations.lentgh > 1 ) { |
| | 68 | + if ( ( options.centre === false || options.zoom === false ) && options.locations.length > 1 ) { |
| 69 | 69 | bounds = new google.maps.LatLngBounds(); |
| 70 | | - |
| | 70 | + |
| 71 | 71 | for ( var i = markers.length - 1; i >= 0; i-- ) { |
| 72 | 72 | bounds.extend( markers[i].getPosition() ); |
| 73 | 73 | } |
| Index: branches/Maps0.8/includes/parserHooks/Maps_DisplayPoint.php |
| — | — | @@ -72,15 +72,10 @@ |
| 73 | 73 | $params['coordinates']->addDependencies( 'mappingservice', 'geoservice' ); |
| 74 | 74 | $params['coordinates']->setDescription( wfMsg( 'maps-displaypoints-par-coordinates' ) ); |
| 75 | 75 | |
| 76 | | - $params['centre'] = new Parameter( |
| 77 | | - 'centre', |
| 78 | | - Parameter::TYPE_STRING, |
| 79 | | - false, |
| 80 | | - array( 'center' ), |
| 81 | | - array( |
| 82 | | - new CriterionIsLocation(), |
| 83 | | - ) |
| 84 | | - ); |
| | 76 | + $params['centre'] = new Parameter( 'centre' ); |
| | 77 | + $params['centre']->setDefault( false ); |
| | 78 | + $params['centre']->addAliases( 'center' ); |
| | 79 | + $params['centre']->addCriteria( new CriterionIsLocation() ); |
| 85 | 80 | $params['centre']->setDescription( wfMsg( 'maps-displaypoints-par-centre' ) ); |
| 86 | 81 | $params['centre']->setDoManipulationOfDefault( false ); |
| 87 | 82 | $manipulation = new MapsParamLocation(); |