Fix Utility Network Samples (#1742)

Author: praveenaak

src/MAUI/Maui.Samples/Samples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.xaml.cs

@@ -25,13 +25,12 @@ public partial class ConfigureSubnetworkTrace : ContentPage
         // Feature service for an electric utility network in Naperville, Illinois.
         private const string FeatureServiceUrl = "https://sampleserver7.arcgisonline.com/server/rest/services/UtilityNetwork/NapervilleElectric/FeatureServer";
         private UtilityNetwork _utilityNetwork;
-        private UtilityTier _sourceTier;
 
         // For creating the default starting location.
         private const string DeviceTableName = "Electric Distribution Device";
-        private const string AssetGroupName = "Service Point";
-        private const string AssetTypeName = "Three Phase Low Voltage Meter";
-        private const string GlobalId = "{3AEC2649-D867-4EA7-965F-DBFE1F64B090}";
+        private const string AssetGroupName = "Circuit Breaker";
+        private const string AssetTypeName = "Three Phase";
+        private const string GlobalId = "{1CAF7740-0BF4-4113-8DB2-654E18800028}";
         private UtilityElement _startingLocation;
 
         // For creating the default trace configuration.
@@ -41,6 +40,9 @@ public partial class ConfigureSubnetworkTrace : ContentPage
         // Holding the initial conditional expression.
         private UtilityTraceConditionalExpression _initialExpression;
 
+        // The trace configuration.
+        private UtilityTraceConfiguration _configuration;
+
         public ConfigureSubnetworkTrace()
         {
             InitializeComponent();
@@ -88,16 +90,20 @@ private async Task Initialize()
 
                 // Get a default trace configuration from a tier to update the UI.
                 UtilityDomainNetwork domainNetwork = _utilityNetwork.Definition.GetDomainNetwork(DomainNetworkName);
-                _sourceTier = domainNetwork.GetTier(TierName);
+                UtilityTier sourceTier = domainNetwork.GetTier(TierName);
+
+                // Set the trace configuration.
+                _configuration = sourceTier.GetDefaultTraceConfiguration();
 
-                if (_sourceTier.GetDefaultTraceConfiguration().Traversability.Barriers is UtilityTraceConditionalExpression expression)
+                // Set the default expression (if provided).
+                if (_configuration.Traversability.Barriers is UtilityTraceConditionalExpression expression)
                 {
                     ConditionBarrierExpression.Text = ExpressionToString(expression);
                     _initialExpression = expression;
                 }
 
                 // Set the traversability scope.
-                _sourceTier.GetDefaultTraceConfiguration().Traversability.Scope = UtilityTraversabilityScope.Junctions;
+                _configuration.Traversability.Scope = UtilityTraversabilityScope.Junctions;
             }
             catch (Exception ex)
             {
@@ -191,7 +197,7 @@ private async void OnTrace(object sender, System.EventArgs e)
             {
                 // Create utility trace parameters for the starting location.
                 UtilityTraceParameters parameters = new UtilityTraceParameters(UtilityTraceType.Subnetwork, new[] { _startingLocation });
-                parameters.TraceConfiguration = _sourceTier.GetDefaultTraceConfiguration();
+                parameters.TraceConfiguration = _configuration;
 
                 // Trace the utility network.
                 IEnumerable<UtilityTraceResult> results = await _utilityNetwork.TraceAsync(parameters);
@@ -211,23 +217,21 @@ private async void OnTrace(object sender, System.EventArgs e)
         private void OnReset(object sender, System.EventArgs e)
         {
             // Reset the barrier condition to the initial value.
-            UtilityTraceConfiguration traceConfiguration = _sourceTier.GetDefaultTraceConfiguration();
-            traceConfiguration.Traversability.Barriers = _initialExpression;
+            _configuration.Traversability.Barriers = _initialExpression;
             ConditionBarrierExpression.Text = ExpressionToString(_initialExpression);
         }
 
         private async void OnAddCondition(object sender, EventArgs e)
         {
             try
             {
-                UtilityTraceConfiguration traceConfiguration = _sourceTier.GetDefaultTraceConfiguration();
-                if (traceConfiguration == null)
+                if (_configuration == null)
                 {
-                    traceConfiguration = new UtilityTraceConfiguration();
+                    _configuration = new UtilityTraceConfiguration();
                 }
-                if (traceConfiguration.Traversability == null)
+                if (_configuration.Traversability == null)
                 {
-                    traceConfiguration.Traversability = new UtilityTraversability();
+                    _configuration.Traversability = new UtilityTraversability();
                 }
 
                 // NOTE: You may also create a UtilityCategoryComparison with UtilityNetworkDefinition.Categories and UtilityCategoryComparisonOperator.
@@ -247,12 +251,12 @@ private async void OnAddCondition(object sender, EventArgs e)
                     }
                     // NOTE: You may also create a UtilityNetworkAttributeComparison with another NetworkAttribute.
                     UtilityTraceConditionalExpression expression = new UtilityNetworkAttributeComparison(attribute, attributeOperator, otherValue);
-                    if (traceConfiguration.Traversability.Barriers is UtilityTraceConditionalExpression otherExpression)
+                    if (_configuration.Traversability.Barriers is UtilityTraceConditionalExpression otherExpression)
                     {
                         // NOTE: You may also combine expressions with UtilityTraceAndCondition
                         expression = new UtilityTraceOrCondition(otherExpression, expression);
                     }
-                    traceConfiguration.Traversability.Barriers = expression;
+                    _configuration.Traversability.Barriers = expression;
                     ConditionBarrierExpression.Text = ExpressionToString(expression);
                 }
             }
@@ -264,12 +268,12 @@ private async void OnAddCondition(object sender, EventArgs e)
 
         private void IncludeBarriersChanged(object sender, ToggledEventArgs e)
         {
-            _sourceTier.GetDefaultTraceConfiguration().IncludeBarriers = e.Value;
+            _configuration.IncludeBarriers = e.Value;
         }
 
         private void IncludeContainersChanged(object sender, ToggledEventArgs e)
         {
-            _sourceTier.GetDefaultTraceConfiguration().IncludeContainers = e.Value;
+            _configuration.IncludeContainers = e.Value;
         }
     }
 }

src/MAUI/Maui.Samples/Samples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.xaml.cs

@@ -161,11 +161,10 @@ private async void OnTrace(object sender, EventArgs e)
                 _configuration.IncludeIsolatedFeatures = IncludeIsolatedFeatures.IsToggled;
 
                 // Build parameters for isolation trace.
-                UtilityTraceParameters parameters = new UtilityTraceParameters(UtilityTraceType.Isolation, new[] { _startingLocation });
-                parameters.TraceConfiguration = _configuration;
+                _parameters.TraceConfiguration = _configuration;
 
                 // Get the trace result from trace.
-                IEnumerable<UtilityTraceResult> traceResult = await _utilityNetwork.TraceAsync(parameters);
+                IEnumerable<UtilityTraceResult> traceResult = await _utilityNetwork.TraceAsync(_parameters);
                 UtilityElementTraceResult elementTraceResult = traceResult?.FirstOrDefault() as UtilityElementTraceResult;
 
                 // Select all the features from the result.

src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.xaml

@@ -32,16 +32,22 @@
 
         <!--  NOTE that There are also: IncludeContent, IncludeStructures, IgnoreBarriersAtStartingPoints, ValidateConsistency  -->
 
-        <CheckBox Grid.Column="1"
+        <CheckBox x:Name="IncludeBarriersCheckBox"
+                  Grid.Column="1"
                   Margin="5"
                   Content="Include Barriers"
                   FontSize="15"
-                  IsChecked="{Binding IncludeBarriers}" />
-        <CheckBox Grid.Column="2"
+                  IsChecked="True"
+                  Checked="OnIncludeBarriersChanged"
+                  Unchecked="OnIncludeBarriersChanged" />
+        <CheckBox x:Name="IncludeContainersCheckBox"
+                  Grid.Column="2"
                   Margin="5"
                   Content="Include Containers"
                   FontSize="15"
-                  IsChecked="{Binding IncludeContainers}" />
+                  IsChecked="True"
+                  Checked="OnIncludeContainersChanged"
+                  Unchecked="OnIncludeContainersChanged" />
 
         <!--  Row 2  -->
         <TextBlock Grid.Row="1"

src/WinUI/ArcGIS.WinUI.Viewer/Samples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.xaml.cs

@@ -103,17 +103,18 @@ private async Task Initialize()
                 _configuration = sourceTier.GetDefaultTraceConfiguration();
 
                 // Set the default expression (if provided).
-                if (sourceTier.GetDefaultTraceConfiguration().Traversability.Barriers is UtilityTraceConditionalExpression expression)
+                if (_configuration.Traversability.Barriers is UtilityTraceConditionalExpression expression)
                 {
                     ConditionBarrierExpression.Text = ExpressionToString(expression);
                     _initialExpression = expression;
                 }
 
-                // Setting DataContext will resolve the data-binding in XAML.
-                Configuration.DataContext = _configuration;
-
                 // Set the traversability scope.
-                sourceTier.GetDefaultTraceConfiguration().Traversability.Scope = UtilityTraversabilityScope.Junctions;
+                _configuration.Traversability.Scope = UtilityTraversabilityScope.Junctions;
+
+                // Initialize the checkboxes to match the configuration.
+                IncludeBarriersCheckBox.IsChecked = _configuration.IncludeBarriers;
+                IncludeContainersCheckBox.IsChecked = _configuration.IncludeContainers;
             }
             catch (Exception ex)
             {
@@ -274,9 +275,24 @@ private void OnAttributeChanged(object sender, SelectionChangedEventArgs e)
         private void OnReset(object sender, RoutedEventArgs e)
         {
             // Reset the barrier condition to the initial value.
-            UtilityTraceConfiguration traceConfiguration = _configuration;
-            traceConfiguration.Traversability.Barriers = _initialExpression;
+            _configuration.Traversability.Barriers = _initialExpression;
             ConditionBarrierExpression.Text = ExpressionToString(_initialExpression);
         }
+
+        private void OnIncludeBarriersChanged(object sender, RoutedEventArgs e)
+        {
+            if (_configuration != null)
+            {
+                _configuration.IncludeBarriers = IncludeBarriersCheckBox.IsChecked == true;
+            }
+        }
+
+        private void OnIncludeContainersChanged(object sender, RoutedEventArgs e)
+        {
+            if (_configuration != null)
+            {
+                _configuration.IncludeContainers = IncludeContainersCheckBox.IsChecked == true;
+            }
+        }
     }
 }