diff options
| author | Timo Ojala <timo.ojala@digia.com> | 2011-11-03 14:24:58 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-18 01:59:13 +0100 |
| commit | 2e5a8232a5374e748d55cf7b2e0dc2fa673a0194 (patch) | |
| tree | 63d6ec5f7b46fc56bc33ce9422f8592da4541a78 /src/location/maps/qgeomappingmanager.cpp | |
| parent | 9e26f85d22efff69462c8ad7e769b7044d5548ed (diff) | |
| download | qtlocation-2e5a8232a5374e748d55cf7b2e0dc2fa673a0194.tar.gz | |
Maptype support, basic China support, new maptile server
- Added activeMapType to QDeclarativeGeoMap.
- Supported maptypes can be set by the plugin, and they are visible
from QML.
- Now using the new maptile server.
- Preliminary China maptile server support added.
- For testing purposes china maptile server can be enabled by
having file: /.enable_china_maptile_server in the system.
- Added maptile cache
Change-Id: I2bb6dc53e149096212c22914ccc8b0a300da53b7
Reviewed-by: David Laing <david.laing@nokia.com>
Diffstat (limited to 'src/location/maps/qgeomappingmanager.cpp')
| -rw-r--r-- | src/location/maps/qgeomappingmanager.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/location/maps/qgeomappingmanager.cpp b/src/location/maps/qgeomappingmanager.cpp index b9caf94f..2c622b1d 100644 --- a/src/location/maps/qgeomappingmanager.cpp +++ b/src/location/maps/qgeomappingmanager.cpp @@ -177,6 +177,11 @@ void QGeoMappingManager::requestTiles(const QList<TileSpec> &tiles) Q_ARG(QList<TileSpec>, tiles)); } +QList<MapType> QGeoMappingManager::supportedMapTypes() const +{ + return d_ptr->engine->supportedMapTypes(); +} + //QGeoTiledMapReply* QGeoMappingManager::getTileImage(const TileSpec &spec) //{ // qWarning() << d_ptr->engine->minimumZoomLevel() << d_ptr->engine->maximumZoomLevel(); @@ -197,14 +202,6 @@ void QGeoMappingManager::requestTiles(const QList<TileSpec> &tiles) //} ///*! -// Returns a list of the map types supported by this manager. -//*/ -//QList<QGraphicsGeoMap::MapType> QGeoMappingManager::supportedMapTypes() const -//{ -// return d_ptr->engine->supportedMapTypes(); -//} - -///*! // Returns a list of the connectivity modes supported by this manager. //*/ //QList<QGraphicsGeoMap::ConnectivityMode> QGeoMappingManager::supportedConnectivityModes() const |