remove artefact

src/Terrain.cc.orig

-/****************************************************************************
- *
- *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
- *
- * QGroundControl is licensed according to the terms in the file
- * COPYING.md in the root of the source code directory.
- *
- ****************************************************************************/
-
-#include "Terrain.h"
-#include "QGCMapEngine.h"
-#include "QGeoMapReplyQGC.h"
-
-#include <QUrl>
-#include <QUrlQuery>
-#include <QNetworkRequest>
-#include <QNetworkProxy>
-#include <QNetworkReply>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-<<<<<<< HEAD
-#include <QtLocation/private/qgeotilespec_p.h>
-
-QGC_LOGGING_CATEGORY(TerrainLog, "TerrainLog")
-
-QMutex                          ElevationProvider::_tilesMutex;
-QHash<QString, TerrainTile>     ElevationProvider::_tiles;
-QStringList                     ElevationProvider::_downloadQueue;
-=======
-#include <QTimer>
->>>>>>> pull_upstream
-
-QGC_LOGGING_CATEGORY(ElevationProviderLog, "ElevationProviderLog")
-
-Q_GLOBAL_STATIC(TerrainBatchManager, _terrainBatchManager)
-
-TerrainBatchManager::TerrainBatchManager(void)
-{
-    _batchTimer.setSingleShot(true);
-    _batchTimer.setInterval(_batchTimeout);
-    connect(&_batchTimer, &QTimer::timeout, this, &TerrainBatchManager::_sendNextBatch);
-}
-
-void TerrainBatchManager::addQuery(ElevationProvider* elevationProvider, const QList<QGeoCoordinate>& coordinates)
-{
-    if (coordinates.length() > 0) {
-        qCDebug(ElevationProviderLog) << "addQuery: elevationProvider:coordinates.count" << elevationProvider << coordinates.count();
-        connect(elevationProvider, &ElevationProvider::destroyed, this, &TerrainBatchManager::_elevationProviderDestroyed);
-        QueuedRequestInfo_t queuedRequestInfo = { elevationProvider, coordinates };
-        _requestQueue.append(queuedRequestInfo);
-        if (!_batchTimer.isActive()) {
-            _batchTimer.start();
-        }
-    }
-}
-
-<<<<<<< HEAD
-bool ElevationProvider::queryTerrainDataPoints(const QList<QGeoCoordinate>& coordinates)
-=======
-void TerrainBatchManager::_sendNextBatch(void)
->>>>>>> pull_upstream
-{
-    qCDebug(ElevationProviderLog) << "_sendNextBatch _state:_requestQueue.count:_sentRequests.count" << _stateToString(_state) << _requestQueue.count() << _sentRequests.count();
-
-    if (_state != State::Idle) {
-        // Waiting for last download the complete, wait some more
-        _batchTimer.start();
-        return;
-    }
-
-    if (_requestQueue.count() == 0) {
-        return;
-    }
-
-    _sentRequests.clear();
-
-    // Convert coordinates to point strings for json query
-    QString points;
-    foreach (const QueuedRequestInfo_t& requestInfo, _requestQueue) {
-        SentRequestInfo_t sentRequestInfo = { requestInfo.elevationProvider, false, requestInfo.coordinates.count() };
-        qCDebug(ElevationProviderLog) << "Building request: coordinate count" << requestInfo.coordinates.count();
-        _sentRequests.append(sentRequestInfo);
-
-        foreach (const QGeoCoordinate& coord, requestInfo.coordinates) {
-            points += QString::number(coord.latitude(), 'f', 10) + ","
-                    + QString::number(coord.longitude(), 'f', 10) + ",";
-        }
-
-    }
-    points = points.mid(0, points.length() - 1); // remove the last ',' from string
-    _requestQueue.clear();
-
-    QUrlQuery query;
-    query.addQueryItem(QStringLiteral("points"), points);
-    QUrl url(QStringLiteral("https://api.airmap.com/elevation/stage/srtm1/ele"));
-    url.setQuery(query);
-
-    QNetworkRequest request(url);
-
-    QNetworkProxy tProxy;
-    tProxy.setType(QNetworkProxy::DefaultProxy);
-    _networkManager.setProxy(tProxy);
-
-    QNetworkReply* networkReply = _networkManager.get(request);
-    if (!networkReply) {
-        _batchFailed();
-        return;
-    }
-
-    connect(networkReply, &QNetworkReply::finished, this, &TerrainBatchManager::_requestFinished);
-
-    _state = State::Downloading;
-}
-
-<<<<<<< HEAD
-bool ElevationProvider::queryTerrainData(const QList<QGeoCoordinate>& coordinates)
-{
-    if (_state != State::Idle || coordinates.length() == 0) {
-        return false;
-    }
-
-    QList<float> altitudes;
-    bool needToDownload = false;
-    foreach (QGeoCoordinate coordinate, coordinates) {
-        QString tileHash = _getTileHash(coordinate);
-        _tilesMutex.lock();
-        if (!_tiles.contains(tileHash)) {
-            qCDebug(TerrainLog) << "Need to download tile " << tileHash;
-
-            if (!_downloadQueue.contains(tileHash)) {
-                // Schedule the fetch task
-
-                QNetworkRequest request = getQGCMapEngine()->urlFactory()->getTileURL(UrlFactory::AirmapElevation, QGCMapEngine::long2elevationTileX(coordinate.longitude(), 1), QGCMapEngine::lat2elevationTileY(coordinate.latitude(), 1), 1, &_networkManager);
-                QGeoTileSpec spec;
-                spec.setX(QGCMapEngine::long2elevationTileX(coordinate.longitude(), 1));
-                spec.setY(QGCMapEngine::lat2elevationTileY(coordinate.latitude(), 1));
-                spec.setZoom(1);
-                spec.setMapId(UrlFactory::AirmapElevation);
-                QGeoTiledMapReplyQGC* reply = new QGeoTiledMapReplyQGC(&_networkManager, request, spec);
-                connect(reply, &QGeoTiledMapReplyQGC::finished, this, &ElevationProvider::_fetchedTile);
-                connect(reply, &QGeoTiledMapReplyQGC::aborted, this, &ElevationProvider::_fetchedTile);
-
-                _downloadQueue.append(tileHash);
-            }
-            needToDownload = true;
-        } else {
-            if (!needToDownload) {
-                if (_tiles[tileHash].isIn(coordinate)) {
-                    altitudes.push_back(_tiles[tileHash].elevation(coordinate));
-                } else {
-                    qCDebug(TerrainLog) << "Error: coordinate not in tile region";
-                    altitudes.push_back(-1.0);
-                }
-            }
-        }
-        _tilesMutex.unlock();
-    }
-
-    if (!needToDownload) {
-        qCDebug(TerrainLog) << "All altitudes taken from cached data";
-        emit terrainData(true, altitudes);
-        _coordinates.clear();
-        return true;
-    }
-
-    _coordinates = coordinates;
-
-    return false;
-}
-
-void ElevationProvider::_requestFinished()
-=======
-void TerrainBatchManager::_batchFailed(void)
-{
-    QList<float>    noAltitudes;
-
-    foreach (const SentRequestInfo_t& sentRequestInfo, _sentRequests) {
-        if (!sentRequestInfo.providerDestroyed) {
-            disconnect(sentRequestInfo.elevationProvider, &ElevationProvider::destroyed, this, &TerrainBatchManager::_elevationProviderDestroyed);
-            sentRequestInfo.elevationProvider->_signalTerrainData(false, noAltitudes);
-        }
-    }
-    _sentRequests.clear();
-}
-
-void TerrainBatchManager::_requestFinished()
->>>>>>> pull_upstream
-{
-    QNetworkReply* reply = qobject_cast<QNetworkReply*>(QObject::sender());
-
-    _state = State::Idle;
-
-    // When an error occurs we still end up here
-    if (reply->error() != QNetworkReply::NoError) {
-<<<<<<< HEAD
-        QByteArray responseBytes = reply->readAll();
-
-        QJsonParseError parseError;
-        QJsonDocument responseJson = QJsonDocument::fromJson(responseBytes, &parseError);
-        qCDebug(TerrainLog) << "Received " <<  responseJson;
-        emit terrainData(false, altitudes);
-=======
-        qCDebug(ElevationProviderLog) << "_requestFinished error:" << reply->error();
-        _batchFailed();
-        reply->deleteLater();
->>>>>>> pull_upstream
-        return;
-    }
-
-    QByteArray responseBytes = reply->readAll();
-
-    QJsonParseError parseError;
-    QJsonDocument responseJson = QJsonDocument::fromJson(responseBytes, &parseError);
-    if (parseError.error != QJsonParseError::NoError) {
-        qCDebug(ElevationProviderLog) << "_requestFinished unable to parse json:" << parseError.errorString();
-        _batchFailed();
-        reply->deleteLater();
-        return;
-    }
-
-    QJsonObject rootObject = responseJson.object();
-    QString status = rootObject["status"].toString();
-    if (status != "success") {
-        qCDebug(ElevationProviderLog) << "_requestFinished status != success:" << status;
-        _batchFailed();
-        reply->deleteLater();
-        return;
-    }
-
-    QList<float> altitudes;
-    const QJsonArray& dataArray = rootObject["data"].toArray();
-    for (int i = 0; i < dataArray.count(); i++) {
-        altitudes.push_back(dataArray[i].toDouble());
-    }
-
-    int currentIndex = 0;
-    foreach (const SentRequestInfo_t& sentRequestInfo, _sentRequests) {
-        if (!sentRequestInfo.providerDestroyed) {
-            disconnect(sentRequestInfo.elevationProvider, &ElevationProvider::destroyed, this, &TerrainBatchManager::_elevationProviderDestroyed);
-            QList<float> requestAltitudes = altitudes.mid(currentIndex, sentRequestInfo.cCoord);
-            sentRequestInfo.elevationProvider->_signalTerrainData(true, requestAltitudes);
-            currentIndex += sentRequestInfo.cCoord;
-        }
-    }
-    _sentRequests.clear();
-
-    reply->deleteLater();
-}
-
-void TerrainBatchManager::_elevationProviderDestroyed(QObject* elevationProvider)
-{
-    // Remove/Mark deleted objects queries from queues
-
-    qCDebug(ElevationProviderLog) << "_elevationProviderDestroyed elevationProvider" << elevationProvider;
-
-    int i = 0;
-    while (i < _requestQueue.count()) {
-        const QueuedRequestInfo_t& requestInfo = _requestQueue[i];
-        if (requestInfo.elevationProvider == elevationProvider) {
-            qCDebug(ElevationProviderLog) << "Removing deleted provider from _requestQueue index:elevationProvider" << i << requestInfo.elevationProvider;
-            _requestQueue.removeAt(i);
-        } else {
-            i++;
-        }
-    }
-
-    for (int i=0; i<_sentRequests.count(); i++) {
-        SentRequestInfo_t& sentRequestInfo = _sentRequests[i];
-        if (sentRequestInfo.elevationProvider == elevationProvider) {
-            qCDebug(ElevationProviderLog) << "Zombieing deleted provider from _sentRequests index:elevatationProvider" << sentRequestInfo.elevationProvider;
-            sentRequestInfo.providerDestroyed = true;
-        }
-    }
-}
-
-QString TerrainBatchManager::_stateToString(State state)
-{
-    switch (state) {
-    case State::Idle:
-        return QStringLiteral("Idle");
-    case State::Downloading:
-        return QStringLiteral("Downloading");
-    }
-
-    return QStringLiteral("State unknown");
-}
-
-ElevationProvider::ElevationProvider(QObject* parent)
-    : QObject(parent)
-{
-
-}
-void ElevationProvider::queryTerrainData(const QList<QGeoCoordinate>& coordinates)
-{
-    if (coordinates.length() == 0) {
-        return;
-    }
-
-    _terrainBatchManager->addQuery(this, coordinates);
-}
-
-void ElevationProvider::_signalTerrainData(bool success, QList<float>& altitudes)
-{
-    emit terrainData(success, altitudes);
-}
-
-void ElevationProvider::_fetchedTile()
-{
-    QGeoTiledMapReplyQGC* reply = qobject_cast<QGeoTiledMapReplyQGC*>(QObject::sender());
-
-    if (!reply) {
-        qCDebug(TerrainLog) << "Elevation tile fetched but invalid reply data type.";
-        return;
-    }
-
-    // remove from download queue
-    QGeoTileSpec spec = reply->tileSpec();
-    QString hash = QGCMapEngine::getTileHash(UrlFactory::AirmapElevation, spec.x(), spec.y(), spec.zoom());
-    _tilesMutex.lock();
-    if (_downloadQueue.contains(hash)) {
-        _downloadQueue.removeOne(hash);
-    }
-    _tilesMutex.unlock();
-
-    // handle potential errors
-    if (reply->error() != QGeoTiledMapReply::NoError) {
-        if (reply->error() == QGeoTiledMapReply::CommunicationError) {
-            qCDebug(TerrainLog) << "Elevation tile fetching returned communication error. " << reply->errorString();
-        } else {
-            qCDebug(TerrainLog) << "Elevation tile fetching returned error. " << reply->errorString();
-        }
-        reply->deleteLater();
-        return;
-    }
-    if (!reply->isFinished()) {
-        qCDebug(TerrainLog) << "Error in fetching elevation tile. Not finished. " << reply->errorString();
-        reply->deleteLater();
-        return;
-    }
-
-    // parse received data and insert into hash table
-    QByteArray responseBytes = reply->mapImageData();
-
-    QJsonParseError parseError;
-    QJsonDocument responseJson = QJsonDocument::fromJson(responseBytes, &parseError);
-    if (parseError.error != QJsonParseError::NoError) {
-        qCDebug(TerrainLog) << "Could not parse terrain tile " << parseError.errorString();
-        qCDebug(TerrainLog) << responseBytes;
-        reply->deleteLater();
-        return;
-    }
-
-    TerrainTile* terrainTile = new TerrainTile(responseJson);
-    if (terrainTile->isValid()) {
-        _tilesMutex.lock();
-        if (!_tiles.contains(hash)) {
-            _tiles.insert(hash, *terrainTile);
-        } else {
-            delete terrainTile;
-        }
-        _tilesMutex.unlock();
-    } else {
-        qCDebug(TerrainLog) << "Received invalid tile";
-    }
-    reply->deleteLater();
-
-    // now try to query the data again
-    queryTerrainData(_coordinates);
-}
-
-QString ElevationProvider::_getTileHash(const QGeoCoordinate& coordinate)
-{
-    QString ret = QGCMapEngine::getTileHash(UrlFactory::AirmapElevation, QGCMapEngine::long2elevationTileX(coordinate.longitude(), 1), QGCMapEngine::lat2elevationTileY(coordinate.latitude(), 1), 1);
-    qCDebug(TerrainLog) << "Computing unique tile hash for " << coordinate << ret;
-
-    return ret;
-}

src/Terrain.h

@@ -20,16 +20,6 @@
 #include <QMutex>
 #include <QtLocation/private/qgeotiledmapreply_p.h>
 
-/* usage example:
-    ElevationProvider *p = new ElevationProvider();
-    QList<QGeoCoordinate> coordinates;
-    QGeoCoordinate c(47.379243, 8.548265);
-    coordinates.push_back(c);
-    c.setLatitude(c.latitude()+0.01);
-    coordinates.push_back(c);
-    p->queryTerrainData(coordinates);
- */
-
 Q_DECLARE_LOGGING_CATEGORY(ElevationProviderLog)
 
 class ElevationProvider;