Apply code-readability suggestions

Author: praveenaak

src/MAUI/Maui.Samples/Samples/Analysis/ShowLineOfSightAnalysisOnMap/ShowLineOfSightAnalysisOnMap.xaml.cs

@@ -14,11 +14,6 @@
 using Esri.ArcGISRuntime.Mapping;
 using Esri.ArcGISRuntime.Symbology;
 using Esri.ArcGISRuntime.UI;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 using Color = System.Drawing.Color;
 using Grid = Microsoft.Maui.Controls.Grid;
 
@@ -111,10 +106,10 @@ private async Task Initialize()
                 var continuousField = await ContinuousField.CreateAsync(new[] { rasterPath }, 0);
 
                 // Create a line of sight position for the target.
-                var targetLosPosition = new LineOfSightPosition(_targetPosition, HeightOrigin.Relative);
+                var targetPosition = new LineOfSightPosition(_targetPosition, HeightOrigin.Relative);
 
                 // Create line of sight positions for each observer.
-                var observerLosPositions = ObserverSeeds.Select(seed =>
+                var observerPositions = ObserverSeeds.Select(seed =>
                     new LineOfSightPosition(
                         new MapPoint(seed.X, seed.Y, RelativeHeightMeters, SpatialReferences.WebMercator),
                         HeightOrigin.Relative)).ToList();
@@ -123,7 +118,7 @@ private async Task Initialize()
                 var parameters = new LineOfSightParameters
                 {
                     ObserverTargetPairs = new ObserverTargetPairs(
-                        observerLosPositions, new[] { targetLosPosition })
+                        observerPositions, new[] { targetPosition })
                 };
 
                 // Create line of sight function with the continuous field and parameters.
@@ -132,9 +127,6 @@ private async Task Initialize()
                 // Evaluate the line of sight function.
                 var results = await lineOfSightFunction.EvaluateAsync();
 
-                // Build observer summaries for the info panel.
-                BuildResultsUI(results);
-
                 // Add result line graphics to the results graphics overlay.
                 foreach (var result in results)
                 {
@@ -154,28 +146,16 @@ private async Task Initialize()
                         _resultsGraphicsOverlay.Graphics.Add(graphic);
                     }
                 }
+
+                // Build observer summaries for the info panel.
+                BuildResultsUI(results);
             }
             catch (Exception ex)
             {
                 await Application.Current.Windows[0].Page.DisplayAlertAsync("Error", ex.Message, "OK");
             }
         }
 
-        // Filter the result line graphics based on the checkbox state to show only visible lines.
-        private void VisibleOnlyCheckBox_Changed(object sender, CheckedChangedEventArgs e)
-        {
-            if (_resultsGraphicsOverlay == null) return;
-
-            bool showVisibleOnly = VisibleOnlyCheckBox.IsChecked;
-
-            foreach (var graphic in _resultsGraphicsOverlay.Graphics)
-            {
-                // TargetVisibility value of 1.0 indicates the target is visible from the observer.
-                bool isVisible = Convert.ToDouble(graphic.Attributes["TargetVisibility"]) == 1.0;
-                graphic.IsVisible = !showVisibleOnly || isVisible;
-            }
-        }
-
         // Build the results UI by programmatically adding rows to the VerticalStackLayout for each observer.
         private void BuildResultsUI(IReadOnlyList<LineOfSight> results)
         {
@@ -186,17 +166,18 @@ private void BuildResultsUI(IReadOnlyList<LineOfSight> results)
                 // Get the length of the visible line if it exists.
                 var visibleLength = result.VisibleLine == null ? 0 :
                     GeometryEngine.LengthGeodetic(result.VisibleLine, LinearUnits.Meters, GeodeticCurveType.Geodesic);
-                
+
                 // Set the info text based on the results of the analysis.
-               string infoText;
-               if (result.Error != null)
-                   infoText = result.Error.Message;
-               else if (result.NotVisibleLine == null)
-                   infoText = $"Target visible from observer over {visibleLength:F1} metres.";
-               else
-                   infoText = $"Target not visible from observer. Obstructed after {visibleLength:F1} metres.";
+                string infoText;
+                if (result.Error != null)
+                    infoText = result.Error.Message;
+                else if (result.NotVisibleLine == null)
+                    infoText = $"Target visible from observer over {visibleLength:F1} metres.";
+                else
+                    infoText = $"Target not visible from observer. Obstructed after {visibleLength:F1} metres.";
 
-               // Update the UI.
+                // Update the UI.
+                var color = ObserverSeeds[i].Color;
 
                 var row = new Grid
                 {
@@ -232,20 +213,19 @@ private void BuildResultsUI(IReadOnlyList<LineOfSight> results)
             }
         }
 
-        // Return a description of the line of sight result based on the visible and not-visible line lengths.
-        private static string GetVisibleDistanceInfoText(double visibleLength, double notVisibleLength)
+        // Filter the result line graphics based on the checkbox state to show only visible lines.
+        private void VisibleOnlyCheckBox_Changed(object sender, CheckedChangedEventArgs e)
         {
-            if (notVisibleLength <= 0)
-                return $"Target visible from observer over {visibleLength:F1} metres.";
+            if (_resultsGraphicsOverlay == null) return;
 
-            return $"Target not visible from observer. Obstructed after {visibleLength:F1} metres.";
-        }
+            bool showVisibleOnly = VisibleOnlyCheckBox.IsChecked;
 
-        // Calculate the geodetic length of a polyline in meters.
-        private static double PolylineLengthMeters(Polyline line)
-        {
-            if (line == null) return 0;
-            return GeometryEngine.LengthGeodetic(line, LinearUnits.Meters, GeodeticCurveType.Geodesic);
+            foreach (var graphic in _resultsGraphicsOverlay.Graphics)
+            {
+                // TargetVisibility value of 1.0 indicates the target is visible from the observer.
+                bool isVisible = Convert.ToDouble(graphic.Attributes["TargetVisibility"]) == 1.0;
+                graphic.IsVisible = !showVisibleOnly || isVisible;
+            }
         }
     }
 }

src/MAUI/Maui.Samples/Samples/Analysis/ShowLineOfSightAnalysisOnMap/readme.md

@@ -23,10 +23,9 @@ The sample loads with a map centered on the Isle of Arran, Scotland, and runs a
 5. Configure `LineOfSightParameters` with a new `ObserverTargetPairs`, passing the list of observer and target line of sight positions.
 6. Create a `LineOfSightFunction` from the continuous field and line of sight parameters.
 7. Evaluate the function to get `LineOfSight` results.
-8. Check if the results contain any `LineOfSight.Error`s.
-9. Create a `Graphic` from each result, using the geometry of the result's `VisibleLine` or `NotVisibleLine` result, and an appropriate symbol.
-10. Use `LineOfSight.TargetVisibility` to determine if the observer position has a direct line of sight to the target position.
-11. Get the length of the visible line result with `GeometryEngine.LengthGeodetic` to report results.
+8. Create a `Graphic` from each result, using the geometry of the result's `VisibleLine` or `NotVisibleLine` result, and an appropriate symbol.
+9. Use `LineOfSight.TargetVisibility` to determine if the observer position has a direct line of sight to the target position.
+10. Check for `LineOfSight.Error`s and get the length of the visible line result with `GeometryEngine.LengthGeodetic` to report results.
 
 ## Relevant API
 

src/WPF/WPF.Viewer/Samples/Analysis/ShowLineOfSightAnalysisOnMap/ShowLineOfSightAnalysisOnMap.xaml.cs

@@ -53,6 +53,7 @@ private static readonly (Color Color, double X, double Y)[] ObserverSeeds =
             (Color.Blue, -571683.896, 7492017.864),
         };
 
+        // Graphics overlay for the analysis results.
         private GraphicsOverlay _resultsGraphicsOverlay;
 
         // Symbols for visible and not-visible line segments.
@@ -110,11 +111,11 @@ private async Task Initialize()
                 // Create a continuous field from the elevation raster file.
                 var continuousField = await ContinuousField.CreateAsync(new[] { rasterPath }, 0);
 
-                // Create line of sight positions for the target.
-                var targetLosPosition = new LineOfSightPosition(_targetPosition, HeightOrigin.Relative);
+                // Create a line of sight position for the target.
+                var targetPosition = new LineOfSightPosition(_targetPosition, HeightOrigin.Relative);
 
                 // Create line of sight positions for each observer.
-                var observerLosPositions = ObserverSeeds.Select(seed =>
+                var observerPositions = ObserverSeeds.Select(seed =>
                     new LineOfSightPosition(
                         new MapPoint(seed.X, seed.Y, RelativeHeightMeters, SpatialReferences.WebMercator),
                         HeightOrigin.Relative)).ToList();
@@ -123,7 +124,7 @@ private async Task Initialize()
                 var parameters = new LineOfSightParameters
                 {
                     ObserverTargetPairs = new ObserverTargetPairs(
-                        observerLosPositions, new[] { targetLosPosition })
+                        observerPositions, new[] { targetPosition })
                 };
 
                 // Create line of sight function with the continuous field and parameters.
@@ -132,10 +133,6 @@ private async Task Initialize()
                 // Evaluate the line of sight function.
                 var results = await lineOfSightFunction.EvaluateAsync();
 
-                // Build observer summaries for the info panel.
-                var summaries = BuildObserverSummaries(results);
-                ResultsItemsControl.ItemsSource = summaries;
-
                 // Add result line graphics to the results graphics overlay.
                 foreach (var result in results)
                 {
@@ -155,42 +152,36 @@ private async Task Initialize()
                         _resultsGraphicsOverlay.Graphics.Add(graphic);
                     }
                 }
+
+                // Build observer summaries for the info panel.
+                ResultsItemsControl.ItemsSource = BuildObserverSummaries(results);
             }
             catch (Exception ex)
             {
                 MessageBox.Show(ex.Message, "Error");
             }
         }
 
-        // Filter the result line graphics based on the checkbox state to show only visible lines.
-        private void VisibleOnlyCheckBox_Changed(object sender, RoutedEventArgs e)
-        {
-            if (_resultsGraphicsOverlay == null) return;
-
-            bool showVisibleOnly = VisibleOnlyCheckBox.IsChecked == true;
-
-            foreach (var graphic in _resultsGraphicsOverlay.Graphics)
-            {
-                // TargetVisibility value of 1.0 indicates the target is visible from the observer.
-                bool isVisible = Convert.ToDouble(graphic.Attributes["TargetVisibility"]) == 1.0;
-                graphic.IsVisible = !showVisibleOnly || isVisible;
-            }
-        }
-
         // Build a list of observer result summaries from the line of sight results for display in the info panel.
         private List<ObserverResultSummary> BuildObserverSummaries(IReadOnlyList<LineOfSight> results)
         {
             var summaries = new List<ObserverResultSummary>();
             for (int i = 0; i < results.Count; i++)
             {
                 var result = results[i];
-                var error = result.Error;
-                var visibleLength = PolylineLengthMeters(result.VisibleLine);
-                var notVisibleLength = PolylineLengthMeters(result.NotVisibleLine);
 
-                string infoText = error != null
-                    ? error.Message
-                    : GetVisibleDistanceInfoText(visibleLength, notVisibleLength);
+                // Get the length of the visible line if it exists.
+                var visibleLength = result.VisibleLine == null ? 0 :
+                    GeometryEngine.LengthGeodetic(result.VisibleLine, LinearUnits.Meters, GeodeticCurveType.Geodesic);
+
+                // Set the info text based on the results of the analysis.
+                string infoText;
+                if (result.Error != null)
+                    infoText = result.Error.Message;
+                else if (result.NotVisibleLine == null)
+                    infoText = $"Target visible from observer over {visibleLength:F1} metres.";
+                else
+                    infoText = $"Target not visible from observer. Obstructed after {visibleLength:F1} metres.";
 
                 var color = ObserverSeeds[i].Color;
                 var brush = new SolidColorBrush(
@@ -201,20 +192,19 @@ private List<ObserverResultSummary> BuildObserverSummaries(IReadOnlyList<LineOfS
             return summaries;
         }
 
-        // Return a description of the line of sight result based on the visible and not-visible line lengths.
-        private static string GetVisibleDistanceInfoText(double visibleLength, double notVisibleLength)
+        // Filter the result line graphics based on the checkbox state to show only visible lines.
+        private void VisibleOnlyCheckBox_Changed(object sender, RoutedEventArgs e)
         {
-            if (notVisibleLength <= 0)
-                return $"Target visible from observer over {visibleLength:F1} metres.";
+            if (_resultsGraphicsOverlay == null) return;
 
-            return $"Target not visible from observer. Obstructed after {visibleLength:F1} metres.";
-        }
+            bool showVisibleOnly = VisibleOnlyCheckBox.IsChecked == true;
 
-        // Calculate the geodetic length of a polyline in meters.
-        private static double PolylineLengthMeters(Polyline line)
-        {
-            if (line == null) return 0;
-            return GeometryEngine.LengthGeodetic(line, LinearUnits.Meters, GeodeticCurveType.Geodesic);
+            foreach (var graphic in _resultsGraphicsOverlay.Graphics)
+            {
+                // TargetVisibility value of 1.0 indicates the target is visible from the observer.
+                bool isVisible = Convert.ToDouble(graphic.Attributes["TargetVisibility"]) == 1.0;
+                graphic.IsVisible = !showVisibleOnly || isVisible;
+            }
         }
     }
 

src/WPF/WPF.Viewer/Samples/Analysis/ShowLineOfSightAnalysisOnMap/readme.md

@@ -23,10 +23,9 @@ The sample loads with a map centered on the Isle of Arran, Scotland, and runs a
 5. Configure `LineOfSightParameters` with a new `ObserverTargetPairs`, passing the list of observer and target line of sight positions.
 6. Create a `LineOfSightFunction` from the continuous field and line of sight parameters.
 7. Evaluate the function to get `LineOfSight` results.
-8. Check if the results contain any `LineOfSight.Error`s.
-9. Create a `Graphic` from each result, using the geometry of the result's `VisibleLine` or `NotVisibleLine` result, and an appropriate symbol.
-10. Use `LineOfSight.TargetVisibility` to determine if the observer position has a direct line of sight to the target position.
-11. Get the length of the visible line result with `GeometryEngine.LengthGeodetic` to report results.
+8. Create a `Graphic` from each result, using the geometry of the result's `VisibleLine` or `NotVisibleLine` result, and an appropriate symbol.
+9. Use `LineOfSight.TargetVisibility` to determine if the observer position has a direct line of sight to the target position.
+10. Check for `LineOfSight.Error`s and get the length of the visible line result with `GeometryEngine.LengthGeodetic` to report results.
 
 ## Relevant API