Merge pull request #6358 from mavlink/terrainCachedRequest

Separate terrain from tile maps within cached tile request system.

src/QtLocationPlugin/QGeoMapReplyQGC.cpp

@@ -123,23 +123,23 @@ QGeoTiledMapReplyQGC::networkReplyFinished()
     }
     QByteArray a = _reply->readAll();
     QString format = getQGCMapEngine()->urlFactory()->getImageFormat((UrlFactory::MapType)tileSpec().mapId(), a);
-
-    // convert "a" to binary in case we have elevation data
+    //-- Test for a specialized, elevation data (not map tile)
     if ((UrlFactory::MapType)tileSpec().mapId() == UrlFactory::MapType::AirmapElevation) {
-
         a = TerrainTile::serialize(a);
-        if (a.isEmpty()) {
-            emit aborted();
-            return;
-        }
-
+        //-- Cache it if valid
+        if(!a.isEmpty()) {
+            getQGCMapEngine()->cacheTile(UrlFactory::MapType::AirmapElevation, tileSpec().x(), tileSpec().y(), tileSpec().zoom(), a, format);
         }
+        emit terrainDone(a, QNetworkReply::NoError);
+    } else {
+        //-- This is a map tile. Process and cache it if valid.
         setMapImageData(a);
         if(!format.isEmpty()) {
             setMapImageFormat(format);
             getQGCMapEngine()->cacheTile((UrlFactory::MapType)tileSpec().mapId(), tileSpec().x(), tileSpec().y(), tileSpec().zoom(), a, format);
         }
         setFinished(true);
+    }
     _clearReply();
 }
 
@@ -151,11 +151,17 @@ QGeoTiledMapReplyQGC::networkReplyError(QNetworkReply::NetworkError error)
     if (!_reply) {
         return;
     }
+    //-- Test for a specialized, elevation data (not map tile)
+    if ((UrlFactory::MapType)tileSpec().mapId() == UrlFactory::MapType::AirmapElevation) {
+        emit terrainDone(QByteArray(), error);
+    } else {
+        //-- Regular map tile
         if (error != QNetworkReply::OperationCanceledError) {
             qWarning() << "Fetch tile error:" << _reply->errorString();
             setError(QGeoTiledMapReply::CommunicationError, _reply->errorString());
         }
         setFinished(true);
+    }
     _clearReply();
 }
 
@@ -164,8 +170,12 @@ void
 QGeoTiledMapReplyQGC::cacheError(QGCMapTask::TaskType type, QString /*errorString*/)
 {
     if(!getQGCMapEngine()->isInternetActive()) {
+        if ((UrlFactory::MapType)tileSpec().mapId() == UrlFactory::MapType::AirmapElevation) {
+            emit terrainDone(QByteArray(), QNetworkReply::NetworkSessionFailedError);
+        } else {
             setError(QGeoTiledMapReply::CommunicationError, "Network not available");
             setFinished(true);
+        }
     } else {
         if(type != QGCMapTask::taskFetchTile) {
             qWarning() << "QGeoTiledMapReplyQGC::cacheError() for wrong task";
@@ -196,10 +206,16 @@ QGeoTiledMapReplyQGC::cacheError(QGCMapTask::TaskType type, QString /*errorStrin
 void
 QGeoTiledMapReplyQGC::cacheReply(QGCCacheTile* tile)
 {
+    //-- Test for a specialized, elevation data (not map tile)
+    if ((UrlFactory::MapType)tileSpec().mapId() == UrlFactory::MapType::AirmapElevation) {
+        emit terrainDone(tile->img(), QNetworkReply::NoError);
+    } else {
+        //-- Regular map tile
         setMapImageData(tile->img());
         setMapImageFormat(tile->format());
         setFinished(true);
         setCached(true);
+    }
     tile->deleteLater();
 }
 

src/QtLocationPlugin/QGeoMapReplyQGC.h

@@ -61,6 +61,9 @@ public:
     ~QGeoTiledMapReplyQGC();
     void abort();
 
+signals:
+    void terrainDone            (QByteArray responseBytes, QNetworkReply::NetworkError error);
+
 private slots:
     void networkReplyFinished   ();
     void networkReplyError      (QNetworkReply::NetworkError error);

src/Terrain/TerrainQuery.cc

@@ -374,8 +374,7 @@ bool TerrainTileManager::_getAltitudesForCoordinates(const QList<QGeoCoordinate>
                 spec.setZoom(1);
                 spec.setMapId(UrlFactory::AirmapElevation);
                 QGeoTiledMapReplyQGC* reply = new QGeoTiledMapReplyQGC(&_networkManager, request, spec);
-                connect(reply, &QGeoTiledMapReplyQGC::finished, this, &TerrainTileManager::_fetchedTile);
-                connect(reply, &QGeoTiledMapReplyQGC::aborted, this, &TerrainTileManager::_fetchedTile);
+                connect(reply, &QGeoTiledMapReplyQGC::terrainDone, this, &TerrainTileManager::_terrainDone);
                 _state = State::Downloading;
             }
             _tilesMutex.unlock();
@@ -406,7 +405,7 @@ void TerrainTileManager::_tileFailed(void)
     _requestQueue.clear();
 }
 
-void TerrainTileManager::_fetchedTile()
+void TerrainTileManager::_terrainDone(QByteArray responseBytes, QNetworkReply::NetworkError error)
 {
     QGeoTiledMapReplyQGC* reply = qobject_cast<QGeoTiledMapReplyQGC*>(QObject::sender());
     _state = State::Idle;
@@ -421,26 +420,19 @@ void TerrainTileManager::_fetchedTile()
     QString hash = QGCMapEngine::getTileHash(UrlFactory::AirmapElevation, spec.x(), spec.y(), spec.zoom());
 
     // handle potential errors
-    if (reply->error() != QGeoTiledMapReply::NoError) {
-        if (reply->error() == QGeoTiledMapReply::CommunicationError) {
-            qCDebug(TerrainQueryLog) << "Elevation tile fetching returned communication error. " << reply->errorString();
-        } else {
-            qCDebug(TerrainQueryLog) << "Elevation tile fetching returned error. " << reply->errorString();
-        }
+    if (error != QNetworkReply::NoError) {
+        qCDebug(TerrainQueryLog) << "Elevation tile fetching returned error (" << error << ")";
         _tileFailed();
         reply->deleteLater();
         return;
     }
-    if (!reply->isFinished()) {
-        qCDebug(TerrainQueryLog) << "Error in fetching elevation tile. Not finished. " << reply->errorString();
+    if (responseBytes.isEmpty()) {
+        qCDebug(TerrainQueryLog) << "Error in fetching elevation tile. Empty response.";
         _tileFailed();
         reply->deleteLater();
         return;
     }
 
-    // parse received data and insert into hash table
-    QByteArray responseBytes = reply->mapImageData();
-
     qWarning() << "Received some bytes of terrain data: " << responseBytes.size();
 
     TerrainTile* terrainTile = new TerrainTile(responseBytes);

src/Terrain/TerrainQuery.h

@@ -62,13 +62,13 @@ public:
     TerrainAirMapQuery(QObject* parent = NULL);
 
     // Overrides from TerrainQueryInterface
-    void requestCoordinateHeights(const QList<QGeoCoordinate>& coordinates) final;
-    void requestPathHeights(const QGeoCoordinate& fromCoord, const QGeoCoordinate& toCoord) final;
-    void requestCarpetHeights(const QGeoCoordinate& swCoord, const QGeoCoordinate& neCoord, bool statsOnly) final;
+    void requestCoordinateHeights   (const QList<QGeoCoordinate>& coordinates) final;
+    void requestPathHeights         (const QGeoCoordinate& fromCoord, const QGeoCoordinate& toCoord) final;
+    void requestCarpetHeights       (const QGeoCoordinate& swCoord, const QGeoCoordinate& neCoord, bool statsOnly) final;
 
 private slots:
-    void _requestError(QNetworkReply::NetworkError code);
-    void _requestFinished(void);
+    void _requestError              (QNetworkReply::NetworkError code);
+    void _requestFinished           ();
 
 private:
     void _sendQuery                 (const QString& path, const QUrlQuery& urlQuery);
@@ -117,7 +117,7 @@ public:
     void addPathQuery       (TerrainOfflineAirMapQuery* terrainQueryInterface, const QGeoCoordinate& startPoint, const QGeoCoordinate& endPoint);
 
 private slots:
-    void _fetchedTile       (void);                             /// slot to handle fetched elevation tiles
+    void _terrainDone       (QByteArray responseBytes, QNetworkReply::NetworkError error);
 
 private:
     enum class State {