summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@jollamobile.com>2014-02-21 13:05:56 +1000
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-26 11:45:52 +0100
commit1ca75bd6bc109c6e5ad47fd5c236709d3f64c466 (patch)
treec68475a815fdb8bf62717089d3934e7096d68c02 /src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
parentb002670ba868b6e6a35687fe74c9137cfe0ac6f5 (diff)
downloadqtlocation-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>
Diffstat (limited to 'src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp')
-rw-r--r--src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp13
1 files changed, 5 insertions, 8 deletions
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)