diff options
| author | Aaron McCarthy <aaron.mccarthy@jollamobile.com> | 2014-02-21 13:05:56 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-26 11:45:52 +0100 |
| commit | 1ca75bd6bc109c6e5ad47fd5c236709d3f64c466 (patch) | |
| tree | c68475a815fdb8bf62717089d3934e7096d68c02 | |
| parent | b002670ba868b6e6a35687fe74c9137cfe0ac6f5 (diff) | |
| download | qtlocation-1ca75bd6bc109c6e5ad47fd5c236709d3f64c466.tar.gz | |
Use 512 pixel tiles from the Nokia/HERE service.
Task-number: QTBUG-36949
Change-Id: I80fe3762b7e8f4dc1b7d56a43d6ab22788c0b702
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| -rw-r--r-- | src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp index 4342d337..0968b0b3 100644 --- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp @@ -80,7 +80,7 @@ QGeoTiledMappingManagerEngineNokia::QGeoTiledMappingManagerEngineNokia( setCameraCapabilities(capabilities); - setTileSize(QSize(256, 256)); + setTileSize(QSize(512, 512)); QList<QGeoMapType> types; types << QGeoMapType(QGeoMapType::StreetMap, tr("Street Map"), tr("Normal map view in daylight mode"), false, 1); diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp index ddd55ec4..c7f16eeb 100644 --- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp @@ -64,21 +64,18 @@ #include <map> -#define LARGE_TILE_DIMENSION 256 - QT_BEGIN_NAMESPACE namespace { QString sizeToStr(const QSize &size) { - static const QString s256("256"); - static const QString s128("128"); - if (size.height() >= LARGE_TILE_DIMENSION || - size.width() >= LARGE_TILE_DIMENSION) - return s256; + if (size.height() >= 512 || size.width() >= 512) + return QStringLiteral("512"); + else if (size.height() >= 256 || size.width() >= 256) + return QStringLiteral("256"); else - return s128; + return QStringLiteral("128"); // 128 pixel tiles are deprecated. } bool isAerialType(const QString mapScheme) |