Base viewshed updates for standard-deviation.

Author: abellgithub

alg/viewshed/viewshed.cpp

@@ -373,6 +373,13 @@ bool Viewshed::calcExtents(int nX, int nY, const GDALGeoTransform &invGT)
 bool Viewshed::run(GDALRasterBandH band, GDALProgressFunc pfnProgress,
                    void *pProgressArg)
 {
+    DatasetPtr sdDataset;
+    if (oOpts.sdFilename.size())
+    {
+        GDALDatasetH ds = GDALOpen(oOpts.sdFilename.c_str(), GA_ReadOnly);
+        sdDataset.reset(GDALDataset::FromHandle(ds));
+        pSdBand = sdDataset->GetRasterBand(1);
+    }
     pSrcBand = static_cast<GDALRasterBand *>(band);
 
     GDALGeoTransform fwdTransform, invTransform;
@@ -443,10 +450,20 @@ bool Viewshed::run(GDALRasterBandH band, GDALProgressFunc pfnProgress,
 
     // Execute the viewshed algorithm.
     GDALRasterBand *pDstBand = poDstDS->GetRasterBand(1);
-    ViewshedExecutor executor(*pSrcBand, *pDstBand, nX, nY, oOutExtent,
-                              oCurExtent, oOpts, oProgress,
-                              /* emitWarningIfNoData = */ true);
-    executor.run();
+    if (pSdBand)
+    {
+        ViewshedExecutor executor(*pSrcBand, *pDstBand, *pSdBand, nX, nY,
+                                  oOutExtent, oCurExtent, oOpts, oProgress,
+                                  /* emitWarningIfNoData = */ true);
+        executor.run();
+    }
+    else
+    {
+        ViewshedExecutor executor(*pSrcBand, *pDstBand, nX, nY, oOutExtent,
+                                  oCurExtent, oOpts, oProgress,
+                                  /* emitWarningIfNoData = */ true);
+        executor.run();
+    }
     oProgress.emit(1);
     return static_cast<bool>(poDstDS);
 }

alg/viewshed/viewshed.h

@@ -69,6 +69,7 @@ class Viewshed
     Window oCurExtent{};
     DatasetPtr poDstDS{};
     GDALRasterBand *pSrcBand = nullptr;
+    GDALRasterBand *pSdBand = nullptr;
 
     DatasetPtr execute(int nX, int nY, const std::string &outFilename);
     void setOutput(double &dfResult, double &dfCellVal, double dfZ);