issue #40: Use sites buffer distance instead of prism buffer distance…

… when regenerating surfaces layers, if needed, because sites are outside of AOI. issue #43: Continue work on NotReady status
PSU-CSAR · Jul 11, 2023 · 9b434c7 · 9b434c7
1 parent 0431226
commit 9b434c7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/bagis-pro/AnalysisTools.cs b/bagis-pro/AnalysisTools.cs
@@ -4968,10 +4968,10 @@ public static async Task<BA_ReturnCode> ReclipSurfacesAsync(string aoiFolderPath
             string clipEnvelope = "";
             string strOutputFeatures = GeodatabaseTools.GetGeodatabasePath(aoiFolderPath, GeodatabaseNames.Analysis, true) +
                 "tmpBuffer";
-            string strDistance = "1 Kilometers";
-            if (Module1.Current.BatchToolSettings.PrecipBufferDistance != null)
+            string strDistance = "5 Kilometers";
+            if (Module1.Current.BatchToolSettings.SnotelBufferDistance != null)
             {
-                strDistance = (string)Module1.Current.BatchToolSettings.PrecipBufferDistance + " " +
+                strDistance = (string)Module1.Current.BatchToolSettings.SnotelBufferDistance + " " +
                     (string)Module1.Current.BatchToolSettings.PrecipBufferUnits;
             }
 

diff --git a/bagis-pro/DockAdminToolsViewModel.cs b/bagis-pro/DockAdminToolsViewModel.cs
@@ -714,15 +714,20 @@ private async void RunImplAsync(object param)
             // Make sure that maps and maps_publish folders exist
             for (int idxRow = 0; idxRow < Names.Count; idxRow++)
             {
-                if (Names[idxRow].AoiBatchStateText.Equals(AoiBatchState.NotReady.ToString()))
-                {
-
-                }
-                else if (Names[idxRow].AoiBatchIsSelected)
+                if (Names[idxRow].AoiBatchIsSelected)
                 {
                     int errorCount = 0; // keep track of any non-fatal errors
                     string aoiFolder = Names[idxRow].FilePath;
-                    Names[idxRow].AoiBatchStateText = AoiBatchState.Started.ToString();  // update gui
+                    if (Names[idxRow].AoiBatchStateText.Equals(AoiBatchState.NotReady.ToString()))
+                    {
+                        strLogEntry = $@"Skipping report for {Names[idxRow].FilePath}. Required station information is missing.{System.Environment.NewLine}";
+                        File.AppendAllText(_strLogFile, strLogEntry);
+                        continue;
+                    }
+                    else
+                    {
+                        Names[idxRow].AoiBatchStateText = AoiBatchState.Started.ToString();  // update gui
+                    }
                     string[] arrFolders = { aoiFolder + "\\" + Constants.FOLDER_MAPS, aoiFolder + "\\" + Constants.FOLDER_MAP_PACKAGE,
                                                 aoiFolder + "\\" + Constants.FOLDER_LOGS};
                     foreach (var directory in arrFolders)