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>

1 files changed, 17 insertions, 20 deletions

diff --git a/src/location/maps/qgeomappingmanagerengine.cpp b/src/location/maps/qgeomappingmanagerengine.cpp
index b6a36b9e..bca07154 100644
--- a/src/location/maps/qgeomappingmanagerengine.cpp
+++ b/src/location/maps/qgeomappingmanagerengine.cpp
@@ -274,14 +274,23 @@ int QGeoMappingManagerEngine::managerVersion() const
     return d_ptr->managerVersion;
 }
 
-///*!
-//    Returns a list of the map types supported by this engine.
-//*/
-//QList<QGraphicsGeoMap::MapType> QGeoMappingManagerEngine::supportedMapTypes() const
-//{
-//    Q_D(const QGeoMappingManagerEngine);
-//    return d->supportedMapTypes;
-//}
+QList<MapType> QGeoMappingManagerEngine::supportedMapTypes() const
+{
+    Q_D(const QGeoMappingManagerEngine);
+    return d->supportedMapTypes;
+}
+
+/*!
+    Sets the list of map types supported by this engine to \a mapTypes.
+
+    Subclasses of QGeoMappingManagerEngine should use this function to ensure
+    that supportedMapTypes() provides accurate information.
+*/
+void QGeoMappingManagerEngine::setSupportedMapTypes(const QList<MapType> &supportedMapTypes)
+{
+    Q_D(QGeoMappingManagerEngine);
+    d->supportedMapTypes = supportedMapTypes;
+}
 
 ///*!
 //    Returns a list of the connectivity modes supported by this engine.
@@ -318,18 +327,6 @@ qreal QGeoMappingManagerEngine::maximumZoomLevel() const
 }
 
 ///*!
-//    Sets the list of map types supported by this engine to \a mapTypes.
-
-//    Subclasses of QGeoMappingManagerEngine should use this function to ensure
-//    that supportedMapTypes() provides accurate information.
-//*/
-//void QGeoMappingManagerEngine::setSupportedMapTypes(const QList<QGraphicsGeoMap::MapType> &mapTypes)
-//{
-//    Q_D(QGeoMappingManagerEngine);
-//    d->supportedMapTypes = mapTypes;
-//}
-
-///*!
 //    Sets the list of connectivity modes supported by this engine to \a connectivityModes.
 
 //    Subclasses of QGeoMappingManagerEngine should use this function to ensure