Merge pull request #25 from mfbernardes/highdpi

Enable downloading tiles for High DPI displays
vladest · Jun 2, 2018 · 54a357f · 54a357f
2 parents 7ce7124 + 46e00c6
commit 54a357f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/qgeotilefetchergooglemaps.cpp b/qgeotilefetchergooglemaps.cpp
@@ -27,7 +27,8 @@ QGeoTileFetcherGooglemaps::QGeoTileFetcherGooglemaps(const QVariantMap &paramete
   m_networkManager(new QNetworkAccessManager(this)),
   m_engineGooglemaps(engine),
   m_tileSize(tileSize),
-  _googleVersionRetrieved(false)
+  _googleVersionRetrieved(false),
+  _scale(1)
 {
     if(parameters.contains(QStringLiteral("googlemaps.maps.apikey")))
         m_apiKey = parameters.value(QStringLiteral("googlemaps.maps.apikey")).toString();
@@ -49,6 +50,9 @@ QGeoTileFetcherGooglemaps::QGeoTileFetcherGooglemaps(const QVariantMap &paramete
         _language = (langs.length() > 0) ? langs[0] : "en-US";
     }
 
+    if (parameters.contains(QStringLiteral("googlemaps.maps.highdpi")))
+        _scale = (parameters.value(QStringLiteral("googlemaps.maps.highdpi")).toBool()) ? 2 : 1;
+
     // Google version strings
     _secGoogleWord               = "Galileo";
 }
@@ -118,31 +122,31 @@ QString QGeoTileFetcherGooglemaps::_getURL(int type, int x, int y, int zoom)
         QString sec1    = ""; // after &x=...
         QString sec2    = ""; // after &zoom=...
         _getSecGoogleWords(x, y, sec1, sec2);
-        return QString("http://mt.google.com/vt/lyrs=m&hl=%1&x=%2%3&y=%4&z=%5&s=%6").arg(_language).arg(x).arg(sec1).arg(y).arg(zoom).arg(sec2);
+        return QString("http://mt.google.com/vt/lyrs=m&hl=%1&x=%2%3&y=%4&z=%5&s=%6&scale=%7").arg(_language).arg(x).arg(sec1).arg(y).arg(zoom).arg(sec2).arg(_scale);
     }
     break;
     case 2: //Satallite Map
     {
         QString sec1    = ""; // after &x=...
         QString sec2    = ""; // after &zoom=...
         _getSecGoogleWords(x, y, sec1, sec2);
-        return QString("http://mt.google.com/vt/lyrs=s&hl=%1&x=%2%3&y=%4&z=%5&s=%6").arg(_language).arg(x).arg(sec1).arg(y).arg(zoom).arg(sec2);
+        return QString("http://mt.google.com/vt/lyrs=s&hl=%1&x=%2%3&y=%4&z=%5&s=%6&scale=%7").arg(_language).arg(x).arg(sec1).arg(y).arg(zoom).arg(sec2).arg(_scale);
     }
     break;
     case 3: //Terrain Map
     {
         QString sec1    = ""; // after &x=...
         QString sec2    = ""; // after &zoom=...
         _getSecGoogleWords(x, y, sec1, sec2);
-        return QString("http://mt.google.com/vt/lyrs=p&hl=%5&x=%6%7&y=%8&z=%9&s=%10").arg(_language).arg(x).arg(sec1).arg(y).arg(zoom).arg(sec2);
+        return QString("http://mt.google.com/vt/lyrs=p&hl=%1&x=%2%3&y=%4&z=%5&s=%6&scale=%7").arg(_language).arg(x).arg(sec1).arg(y).arg(zoom).arg(sec2).arg(_scale);
     }
     break;
     case 4: //Hybrid Map
     {
         QString sec1    = ""; // after &x=...
         QString sec2    = ""; // after &zoom=...
         _getSecGoogleWords(x, y, sec1, sec2);
-        return QString("http://mt.google.com/vt/lyrs=y&hl=%5&x=%6%7&y=%8&z=%9&s=%10").arg(_language).arg(x).arg(sec1).arg(y).arg(zoom).arg(sec2);
+        return QString("http://mt.google.com/vt/lyrs=y&hl=%1&x=%2%3&y=%4&z=%5&s=%6&scale=%7").arg(_language).arg(x).arg(sec1).arg(y).arg(zoom).arg(sec2).arg(_scale);
     }
     break;
     }

diff --git a/qgeotilefetchergooglemaps.h b/qgeotilefetchergooglemaps.h
@@ -54,6 +54,7 @@ private slots:
     QMutex          _googleVersionMutex;
     QByteArray      _userAgent;
     QString         _language;
+    int             _scale;
 
     // Google version strings
     QString         _secGoogleWord;