From 6f474c991d36279c095b18890f43a77a616f11e9 Mon Sep 17 00:00:00 2001
From: Andreas Bircher <bircher@gmx.ch>
Date: Thu, 15 Mar 2018 08:16:04 +0100
Subject: [PATCH] compile fix

---
 src/Terrain.cc | 13 +++++++++++--
 src/Terrain.h  |  1 -
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Terrain.cc b/src/Terrain.cc
index 8a30ef622..453342426 100644
--- a/src/Terrain.cc
+++ b/src/Terrain.cc
@@ -41,7 +41,7 @@ void TerrainBatchManager::addQuery(ElevationProvider* elevationProvider, const Q
         }
 
         qCDebug(ElevationProviderLog) << "All altitudes taken from cached data";
-        elevationProvider->_signalTerrainData(true, altitudes);
+        elevationProvider->_signalTerrainData(coordinates.count() == altitudes.count(), altitudes);
     }
 }
 
@@ -71,6 +71,7 @@ bool TerrainBatchManager::_getAltitudesForCoordinates(const QList<QGeoCoordinate
 
                 _tileDownloadQueue.append(tileHash);
             }
+            _tilesMutex.unlock();
 
             return false;
         } else {
@@ -123,11 +124,13 @@ void TerrainBatchManager::_fetchedTile()
         } else {
             qCDebug(ElevationProviderLog) << "Elevation tile fetching returned error. " << reply->errorString();
         }
+        _tileFailed();
         reply->deleteLater();
         return;
     }
     if (!reply->isFinished()) {
         qCDebug(ElevationProviderLog) << "Error in fetching elevation tile. Not finished. " << reply->errorString();
+        _tileFailed();
         reply->deleteLater();
         return;
     }
@@ -140,6 +143,7 @@ void TerrainBatchManager::_fetchedTile()
     if (parseError.error != QJsonParseError::NoError) {
         qCDebug(ElevationProviderLog) << "Could not parse terrain tile " << parseError.errorString();
         qCDebug(ElevationProviderLog) << responseBytes;
+        _tileFailed();
         reply->deleteLater();
         return;
     }
@@ -162,7 +166,7 @@ void TerrainBatchManager::_fetchedTile()
     for (int i = _requestQueue.count() - 1; i >= 0; i--) {
         QList<float> altitudes;
         if (_getAltitudesForCoordinates(_requestQueue[i].coordinates, altitudes)) {
-            _requestQueue[i].elevationProvider->_signalTerrainData(true, altitudes);
+            _requestQueue[i].elevationProvider->_signalTerrainData(_requestQueue[i].coordinates.count() == altitudes.count(), altitudes);
             _requestQueue.removeAt(i);
         }
     }
@@ -192,3 +196,8 @@ bool ElevationProvider::queryTerrainData(const QList<QGeoCoordinate>& coordinate
 
     return false;
 }
+
+void ElevationProvider::_signalTerrainData(bool success, QList<float>& altitudes)
+{
+    emit terrainData(success, altitudes);
+}
diff --git a/src/Terrain.h b/src/Terrain.h
index f6ec9d501..36f642cb2 100644
--- a/src/Terrain.h
+++ b/src/Terrain.h
@@ -34,7 +34,6 @@ public:
     void addQuery(ElevationProvider* elevationProvider, const QList<QGeoCoordinate>& coordinates);
 
 private slots:
-    void _requestFinished   (void);
     void _fetchedTile       (void);                             /// slot to handle fetched elevation tiles
 
 private:
-- 
2.22.0