From 8fccae99e3f97c4e2d2bb4fb729d5f6b983a0cea Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 4 Aug 2018 16:32:19 -0700 Subject: [PATCH] Use NaN to signal lower level error --- src/Terrain/TerrainQuery.cc | 4 ++-- src/TerrainTile.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Terrain/TerrainQuery.cc b/src/Terrain/TerrainQuery.cc index 8467df6e9..81dcd45dc 100644 --- a/src/Terrain/TerrainQuery.cc +++ b/src/Terrain/TerrainQuery.cc @@ -412,7 +412,7 @@ bool TerrainTileManager::_getAltitudesForCoordinates(const QList if (_tiles.contains(tileHash)) { if (_tiles[tileHash].isIn(coordinate)) { double elevation = _tiles[tileHash].elevation(coordinate); - if (elevation < 0.0) { + if (qIsNaN(elevation)) { error = true; qCWarning(TerrainQueryLog) << "TerrainTileManager::_getAltitudesForCoordinates Internal Error: negative elevation in tile cache"; } else { @@ -421,7 +421,7 @@ bool TerrainTileManager::_getAltitudesForCoordinates(const QList altitudes.push_back(elevation); } else { qCWarning(TerrainQueryLog) << "TerrainTileManager::_getAltitudesForCoordinates Internal Error: coordinate not in tile region"; - altitudes.push_back(-1.0); + altitudes.push_back(qQNaN()); error = true; } } else { diff --git a/src/TerrainTile.cc b/src/TerrainTile.cc index 5c04e5e1a..55f485a23 100644 --- a/src/TerrainTile.cc +++ b/src/TerrainTile.cc @@ -121,13 +121,13 @@ double TerrainTile::elevation(const QGeoCoordinate& coordinate) const int indexLon = _lonToDataIndex(coordinate.longitude()); if (indexLat == -1 || indexLon == -1) { qCWarning(TerrainTileLog) << "Internal error indexLat:indexLon == -1" << indexLat << indexLon; - return -1.0; + return qQNaN(); } qCDebug(TerrainTileLog) << "indexLat:indexLon" << indexLat << indexLon << "elevation" << _data[indexLat][indexLon]; return static_cast(_data[indexLat][indexLon]); } else { qCWarning(TerrainTileLog) << "Asking for elevation, but no valid data."; - return -1.0; + return qQNaN(); } } -- 2.22.0