Commit e311465d authored by Andreas Bircher's avatar Andreas Bircher

minor fixes

parent 753bafa7
......@@ -404,10 +404,10 @@ UrlFactory::_getURL(MapType type, int x, int y, int zoom, QNetworkAccessManager*
break;
case AirmapElevation:
{
return QString("https://api.airmap.com/elevation/stage/srtm1/ele/carpet?points=%1,%2,%3,%4").arg(static_cast<double>(x)*QGCMapEngine::srtm1TileSize - 180.0).arg(
static_cast<double>(y)*QGCMapEngine::srtm1TileSize - 90.0).arg(
static_cast<double>(x + 1)*QGCMapEngine::srtm1TileSize - 180.0).arg(
static_cast<double>(y + 1)*QGCMapEngine::srtm1TileSize - 90.0);
return QString("https://api.airmap.com/elevation/stage/srtm1/ele/carpet?points=%1,%2,%3,%4").arg(static_cast<double>(y)*QGCMapEngine::srtm1TileSize - 90.0).arg(
static_cast<double>(x)*QGCMapEngine::srtm1TileSize - 180.0).arg(
static_cast<double>(y + 1)*QGCMapEngine::srtm1TileSize - 90.0).arg(
static_cast<double>(x + 1)*QGCMapEngine::srtm1TileSize - 180.0);
}
break;
......
......@@ -210,12 +210,14 @@ void ElevationProvider::_fetchedTile()
TerrainTile* terrainTile = new TerrainTile(responseJson);
if (terrainTile->isValid()) {
_tilesMutex.lock();
if (!_tiles.contains(_getTileHash(terrainTile->centerCoordinate()))) {
_tiles.insert(_getTileHash(terrainTile->centerCoordinate()), *terrainTile);
if (!_tiles.contains(hash)) {
_tiles.insert(hash), *terrainTile);
} else {
delete terrainTile;
}
_tilesMutex.unlock();
} else {
qCDebug(TerrainLog) << "Received invalid tile";
}
reply->deleteLater();
......
......@@ -85,10 +85,10 @@ TerrainTile::TerrainTile(QJsonDocument document)
qCDebug(TerrainTileLog) << "Incomplete bounding location";
return;
}
_southWest.setLatitude(swArray[1].toDouble());
_southWest.setLongitude(swArray[0].toDouble());
_northEast.setLatitude(neArray[1].toDouble());
_northEast.setLongitude(neArray[0].toDouble());
_southWest.setLatitude(swArray[0].toDouble());
_southWest.setLongitude(swArray[1].toDouble());
_northEast.setLatitude(neArray[0].toDouble());
_northEast.setLongitude(neArray[1].toDouble());
// Stats
const QJsonObject& statsObject = dataObject[_jsonStatsKey].toObject();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment