Checkpoint.

Author: abellgithub

alg/viewshed/viewshed_executor.cpp

@@ -219,6 +219,15 @@ double ViewshedExecutor::calcHeightAdjFactor()
 /// dfZ  Minimum observable height at cell.
 void ViewshedExecutor::setOutput(double &dfResult, double &dfCellVal,
                                  double dfZ)
+{
+    if (!m_sdCalc)
+        setOutputNormal(dfResult, dfCellVal, dfZ);
+    else
+        setOutputSd(dfResult, dfCellVal, dfZ);
+}
+
+void ViewshedExecutor::setOutputNormal(double &dfResult, double &dfCellVal,
+                                       double dfZ)
 {
     if (oOpts.outputMode != OutputMode::Normal)
     {
@@ -232,6 +241,25 @@ void ViewshedExecutor::setOutput(double &dfResult, double &dfCellVal,
     dfCellVal = std::max(dfCellVal, dfZ);
 }
 
+void ViewshedExecutor::setOutputSd(double &dfResult, double &dfCellVal,
+                                   double dfZ)
+{
+    assert(oOpts.outputMode == OutputMode::Normal);
+    if (dfResult == oOpts.invisibleVal)
+    {
+        double cellHeight = dfCellVal + oOpts.targetHeight;
+        if (cellHeight > dfZ)
+            dfResult = oOpts.maybeVisibleVal;
+    }
+    //ABELL
+    /**
+    if (lines.sd[pixel] <= 1)
+        dfCellVal = std::max(dfZ, dfCellVal);
+    else
+        dfCellVal = dfZ;
+**/
+}
+
 /// Read a line of raster data.
 ///
 /// @param  nLine  Line number to read.
@@ -464,21 +492,27 @@ bool ViewshedExecutor::processFirstLine(Lines &lines)
             lines.result[m_nX] = oOpts.visibleVal;
     }
 
-    //ABELL
-    if (!oCurExtent.containsY(m_nY))
-        processFirstLineTopOrBottom(ll, lines);
-    else
+    auto process = [this, &ll, &lines](bool sdCalc)
     {
-        CPLJobQueuePtr pQueue = m_pool.CreateJobQueue();
-        pQueue->SubmitJob([&]() { processFirstLineLeft(ll, lines); });
-        pQueue->SubmitJob([&]() { processFirstLineRight(ll, lines); });
-        pQueue->WaitCompletion();
-    }
-    //ABELL
+        m_sdCalc = sdCalc;
+        if (!oCurExtent.containsY(m_nY))
+            processFirstLineTopOrBottom(ll, lines);
+        else
+        {
+            CPLJobQueuePtr pQueue = m_pool.CreateJobQueue();
+            pQueue->SubmitJob([&]() { processFirstLineLeft(ll, lines); });
+            pQueue->SubmitJob([&]() { processFirstLineRight(ll, lines); });
+            pQueue->WaitCompletion();
+        }
+        sdCalc = false;
+    };
+
+    process(false);
     if (sdMode())
     {
+        lines.cur = std::move(lines.input);
+        process(true);
     }
-    //ABELL
 
     if (oOpts.pitchMasking())
         applyPitchMask(lines.result, lines.pitchMask);
@@ -947,11 +981,22 @@ bool ViewshedExecutor::processLine(int nLine, Lines &lines)
         maskInitial(lines.result, nLine);
     }
 
-    // process left half then right half of line
-    CPLJobQueuePtr pQueue = m_pool.CreateJobQueue();
-    pQueue->SubmitJob([&]() { processLineLeft(nYOffset, ll, lines); });
-    pQueue->SubmitJob([&]() { processLineRight(nYOffset, ll, lines); });
-    pQueue->WaitCompletion();
+    auto process = [this, nYOffset, &ll, &lines](bool sdCalc)
+    {
+        m_sdCalc = sdCalc;
+        CPLJobQueuePtr pQueue = m_pool.CreateJobQueue();
+        pQueue->SubmitJob([&]() { processLineLeft(nYOffset, ll, lines); });
+        pQueue->SubmitJob([&]() { processLineRight(nYOffset, ll, lines); });
+        pQueue->WaitCompletion();
+        m_sdCalc = false;
+    };
+
+    process(false);
+    if (sdMode())
+    {
+        lines.cur = std::move(lines.input);
+        process(true);
+    }
 
     if (oOpts.pitchMasking())
         applyPitchMask(lines.result, lines.pitchMask);

alg/viewshed/viewshed_executor.h

@@ -110,9 +110,12 @@ class ViewshedExecutor
     double m_lowTanPitch{std::numeric_limits<double>::quiet_NaN()};
     double m_highTanPitch{std::numeric_limits<double>::quiet_NaN()};
     double (*oZcalc)(int, int, double, double, double){};
+    bool m_sdCalc = false;
 
     double calcHeightAdjFactor();
     void setOutput(double &dfResult, double &dfCellVal, double dfZ);
+    void setOutputNormal(double &dfResult, double &dfCellVal, double dfZ);
+    void setOutputSd(double &dfResult, double &dfCellVal, double dfZ);
     bool readLine(int nLine, Lines &lines);
     bool writeLine(int nLine, std::vector<double> &vResult);
     bool processLine(int nLine, Lines &lines);

alg/viewshed/viewshed_types.h

@@ -60,6 +60,8 @@ struct Options
     Point observer{0, 0, 0};  //!< x, y, and z of the observer
     double visibleVal{255};   //!< raster output value for visible pixels.
     double invisibleVal{0};   //!< raster output value for non-visible pixels.
+    double maybeVisibleVal{
+        2};  //!< raster output for potentially visible pixels.
     double outOfRangeVal{
         0};  //!< raster output value for pixels outside of max distance.
     double nodataVal{-1};      //!< raster output value for pixels with no data