From 623cc8ccc0dc0790f63db3051553bf03ce0f0dda Mon Sep 17 00:00:00 2001
From: Erik Broberg <Erik Broberg>
Date: Tue, 21 Jun 2016 23:15:13 -0400
Subject: [PATCH] Quick fix of bug causing height tiles with missing data to be
 ignored and rendered as usual

---
 modules/globebrowsing/tile/tiledataset.cpp | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/modules/globebrowsing/tile/tiledataset.cpp b/modules/globebrowsing/tile/tiledataset.cpp
index f666d20502..3ef001a5d1 100644
--- a/modules/globebrowsing/tile/tiledataset.cpp
+++ b/modules/globebrowsing/tile/tiledataset.cpp
@@ -252,10 +252,24 @@ namespace openspace {
         result->imageData = getImageDataFlippedY(region, _dataLayout, imageData);
         result->dimensions = glm::uvec3(region.numPixels, 1);
         result->nBytesImageData = _dataLayout.bytesPerPixel * region.numPixels.x * region.numPixels.y;
+        result->error = worstError;
         if (_doPreprocessing) {
             result->preprocessData = preprocess(imageData, region, _dataLayout);
+            int success;
+            auto gdalOverview = _dataset->GetRasterBand(1)->GetOverview(region.overview);
+            double missingDataValue = gdalOverview->GetNoDataValue(&success);
+            if (!success) {
+                missingDataValue = 32767; // missing data value
+            }
+            bool hasMissingData = false;
+            for (size_t c = 0; c < _dataLayout.numRasters; c++) {
+                hasMissingData |= result->preprocessData->maxValues[c] == missingDataValue;
+            }
+            bool onHighLevel = region.chunkIndex.level > 6;
+            if (hasMissingData && onHighLevel) {
+                result->error = CE_Fatal;
+            }
         }
-        result->error = worstError;
 
         delete[] imageData;
         return result;
@@ -323,6 +337,11 @@ namespace openspace {
                 }
             }
         }
+        for (size_t c = 0; c < dataLayout.numRasters; c++) {
+            if (preprocessData->maxValues[c] > 8800.0f) {
+                LDEBUG("Bad preprocess data: " << preprocessData->maxValues[c] << " at " << region.chunkIndex);
+            }
+        }
 
         return std::shared_ptr<TilePreprocessData>(preprocessData);
     }