| Index: trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3.php |
| — | — | @@ -22,11 +22,11 @@ |
| 23 | 23 | |
| 24 | 24 | $egMapsServices['googlemaps3'] = array( |
| 25 | 25 | 'pf' => array( |
| 26 | | - 'display_point' => array('class' => 'MapsGoogleMaps3DispPoint', 'file' => 'GoogleMaps/Maps_GoogleMaps3DispPoint.php', 'local' => true), |
| 27 | | - 'display_map' => array('class' => 'MapsGoogleMaps3DispMap', 'file' => 'GoogleMaps/Maps_GoogleMaps3DispMap.php', 'local' => true), |
| | 26 | + 'display_point' => array('class' => 'MapsGoogleMaps3DispPoint', 'file' => 'GoogleMaps3/Maps_GoogleMaps3DispPoint.php', 'local' => true), |
| | 27 | + 'display_map' => array('class' => 'MapsGoogleMaps3DispMap', 'file' => 'GoogleMaps3/Maps_GoogleMaps3DispMap.php', 'local' => true), |
| 28 | 28 | ), |
| 29 | 29 | 'classes' => array( |
| 30 | | - array('class' => 'MapsGoogleMaps3', 'file' => 'GoogleMaps/Maps_GoogleMaps3.php', 'local' => true) |
| | 30 | + array('class' => 'MapsGoogleMaps3', 'file' => 'GoogleMaps3/Maps_GoogleMaps3.php', 'local' => true) |
| 31 | 31 | ), |
| 32 | 32 | 'aliases' => array('google3', 'googlemap3', 'gmap3', 'gmaps3'), |
| 33 | 33 | ); |
| — | — | @@ -38,7 +38,7 @@ |
| 39 | 39 | * |
| 40 | 40 | * @author Jeroen De Dauw |
| 41 | 41 | */ |
| 42 | | -class MapsGoogleMaps { |
| | 42 | +class MapsGoogleMaps3 { |
| 43 | 43 | |
| 44 | 44 | const SERVICE_NAME = 'googlemaps3'; |
| 45 | 45 | |
| Index: trunk/extensions/Maps/Maps_Settings.php |
| — | — | @@ -62,13 +62,14 @@ |
| 63 | 63 | # Include the mapping services that should be loaded into Maps. |
| 64 | 64 | # Commenting or removing a mapping service will cause Maps to completely ignore it, and so improve performance. |
| 65 | 65 | include_once $egMapsIP . '/GoogleMaps/Maps_GoogleMaps.php'; // Google Maps |
| | 66 | +include_once $egMapsIP . '/GoogleMaps3/Maps_GoogleMaps3.php'; // Google Maps v3 |
| 66 | 67 | include_once $egMapsIP . '/OpenLayers/Maps_OpenLayers.php'; // OpenLayers |
| 67 | 68 | include_once $egMapsIP . '/YahooMaps/Maps_YahooMaps.php'; // Yahoo! Maps |
| 68 | 69 | include_once $egMapsIP . '/OpenStreetMap/Maps_OSM.php'; // OpenLayers optimized for OSM |
| 69 | 70 | |
| 70 | 71 | # Array of String. Array containing all the mapping services that will be made available to the user. |
| 71 | 72 | # Currently Maps provides the following services: googlemaps, yahoomaps, openlayers |
| 72 | | -$egMapsAvailableServices = array('googlemaps', 'yahoomaps', 'openlayers', 'osm'); |
| | 73 | +$egMapsAvailableServices = array('googlemaps', 'googlemaps3', 'yahoomaps', 'openlayers', 'osm'); |
| 73 | 74 | |
| 74 | 75 | # String. The default mapping service, which will be used when no default service is present in the |
| 75 | 76 | # $egMapsDefaultServices array for a certain feature. A service that supports all features is recommended. |
| — | — | @@ -149,7 +150,7 @@ |
| 150 | 151 | |
| 151 | 152 | # Specific map properties configuration |
| 152 | 153 | |
| 153 | | -# Google maps |
| | 154 | +# Google Maps |
| 154 | 155 | |
| 155 | 156 | # Your Google Maps API key. Required for displaying Google Maps, and using the Google Geocoder services. |
| 156 | 157 | if (empty($egGoogleMapsKey)) $egGoogleMapsKey = ''; # http://code.google.com/apis/maps/signup.html |
| — | — | @@ -181,8 +182,18 @@ |
| 182 | 183 | |
| 183 | 184 | |
| 184 | 185 | |
| 185 | | -# Yahoo maps |
| | 186 | +# Google Maps v3 |
| 186 | 187 | |
| | 188 | +# String. The Google Maps v3 map name prefix. It can not be identical to the one of another mapping service. |
| | 189 | +$egMapsGoogleMaps3Prefix = 'map_google3'; |
| | 190 | + |
| | 191 | +# Integer. The default zoom of a map. This value will only be used when the user does not provide one. |
| | 192 | +$egMapsGoogleMaps3Zoom = 14; |
| | 193 | + |
| | 194 | + |
| | 195 | + |
| | 196 | +# Yahoo! Maps |
| | 197 | + |
| 187 | 198 | # Your Yahoo! Maps API key. Required for displaying Yahoo! Maps. |
| 188 | 199 | # Haven't got an API key yet? Get it here: https://developer.yahoo.com/wsregapp/ |
| 189 | 200 | if (empty($egYahooMapsKey)) $egYahooMapsKey = ''; |
| — | — | @@ -227,7 +238,7 @@ |
| 228 | 239 | |
| 229 | 240 | |
| 230 | 241 | |
| 231 | | -# OpenStreetMaps (OpenLayers optimized for OSM) |
| | 242 | +# OpenStreetMap (OpenLayers optimized for OSM) |
| 232 | 243 | |
| 233 | 244 | # String. The OSM map name prefix. It can not be identical to the one of another mapping service. |
| 234 | 245 | $egMapsOSMPrefix = 'map_osm'; |