Increased cache size to 100MB, some cleanup and error 404 robustness added

Author: Vladyslav Stelmakhovskyi

qgeomapreplygooglemaps.cpp

@@ -59,12 +59,12 @@ void QGeoMapReplyGooglemaps::networkFinished()
 
 void QGeoMapReplyGooglemaps::networkError(QNetworkReply::NetworkError error)
 {
+    Q_UNUSED(error);
     if (!m_reply)
         return;
 
-    if (error != QNetworkReply::OperationCanceledError)
-        setError(QGeoTiledMapReply::CommunicationError, m_reply->errorString());
     setFinished(true);
+    setCached(false);
     m_reply->deleteLater();
     m_reply = 0;
 }

qgeotiledmappingmanagerenginegooglemaps.cpp

@@ -45,12 +45,18 @@ QGeoTiledMappingManagerEngineGooglemaps::QGeoTiledMappingManagerEngineGooglemaps
     QGeoTileFetcherGooglemaps *fetcher = new QGeoTileFetcherGooglemaps(parameters, this, tileSize());
     setTileFetcher(fetcher);
 
-    m_cacheDirectory = QAbstractGeoTileCache::baseCacheDirectory() + QLatin1String("googlemaps");
+    if (parameters.contains(QStringLiteral("googlemaps.cachefolder")))
+        m_cacheDirectory = parameters.value(QStringLiteral("googlemaps.cachefolder")).toString().toLatin1();
+    else
+        m_cacheDirectory = QAbstractGeoTileCache::baseCacheDirectory() + QLatin1String("googlemaps");
 
     QAbstractGeoTileCache *tileCache = new QGeoFileTileCache(m_cacheDirectory);
+    tileCache->setMaxDiskUsage(100 * 1024 * 1024);
     setTileCache(tileCache);
 
     populateMapSchemes();
+    *error = QGeoServiceProvider::NoError;
+    errorString->clear();
 }
 
 QGeoTiledMappingManagerEngineGooglemaps::~QGeoTiledMappingManagerEngineGooglemaps()