Address PR feedback

Author: des12437

Shared/Samples/Augment reality to navigate route/AugmentRealityToNavigateRouteView.ARSceneView.swift

@@ -97,7 +97,7 @@ extension AugmentRealityToNavigateRouteView {
         private(set) var routeGraphicsOverlay = GraphicsOverlay()
 
         /// The elevation surface set to the base surface of the scene.
-        private(set) var elevationSurface: Surface = {
+        private let elevationSurface: Surface = {
             let elevationSurface = Surface()
             elevationSurface.navigationConstraint = .unconstrained
             elevationSurface.opacity = 0
@@ -177,25 +177,22 @@ extension AugmentRealityToNavigateRouteView {
         ///   - polyline: The polyline geometry of the route.
         /// - Returns: A polyline with adjusted elevation.
         private func addingElevation(_ z: Double, to polyline: Polyline) async throws -> Polyline? {
-            if let densifiedPolyline = GeometryEngine.densify(polyline, maxSegmentLength: 0.3) as? Polyline {
-                let polylineBuilder = PolylineBuilder(spatialReference: densifiedPolyline.spatialReference)
-                for part in densifiedPolyline.parts {
-                    for point in part.points {
-                        let elevation = try await elevationSurface.elevation(at: point)
-                        let newPoint = GeometryEngine.makeGeometry(from: point, z: elevation + z)
-                        // Put the new point 3 meters above the ground elevation.
-                        polylineBuilder.add(newPoint)
-                    }
+            guard let densifiedPolyline = GeometryEngine.densify(polyline, maxSegmentLength: 0.3) as? Polyline else { return nil }
+            let polylineBuilder = PolylineBuilder(spatialReference: densifiedPolyline.spatialReference)
+            for part in densifiedPolyline.parts {
+                for point in part.points {
+                    let elevation = try await elevationSurface.elevation(at: point)
+                    let newPoint = GeometryEngine.makeGeometry(from: point, z: elevation + z)
+                    // Put the new point 3 meters above the ground elevation.
+                    polylineBuilder.add(newPoint)
                 }
-                return polylineBuilder.toGeometry()
-            } else {
-                return nil
             }
+            return polylineBuilder.toGeometry()
         }
 
         /// Starts navigating the route.
         func startNavigation() async throws {
-            guard let routeResult = routeResult else { return }
+            guard let routeResult else { return }
             routeTracker = RouteTracker(
                 routeResult: routeResult,
                 routeIndex: 0,
@@ -237,7 +234,7 @@ extension AugmentRealityToNavigateRouteView {
 
         /// Monitors the asynchronous stream of voice guidances.
         private func trackVoiceGuidance() async {
-            guard let routeTracker = routeTracker else { return }
+            guard let routeTracker else { return }
             for try await voiceGuidance in routeTracker.voiceGuidances {
                 speechSynthesizer.stopSpeaking(at: .word)
                 speechSynthesizer.speak(AVSpeechUtterance(string: voiceGuidance.text))

Shared/Samples/Augment reality to navigate route/AugmentRealityToNavigateRouteView.swift

@@ -25,28 +25,32 @@ struct AugmentRealityToNavigateRouteView: View {
     /// The error shown in the error alert.
     @State private var error: Error?
 
+    /// The point on the map where the user tapped.
+    @State private var tapLocation: Point?
+    
     var body: some View {
         MapView(
             map: model.map,
             graphicsOverlays: model.graphicsOverlays
         )
+        .locationDisplay(model.locationDisplay)
         .onSingleTapGesture { _, mapPoint in
-            Task {
-                do {
-                    try await model.addRouteGraphic(for: mapPoint)
-                } catch {
-                    self.error = error
-                }
+            tapLocation = mapPoint
+        }
+        .task(id: tapLocation) {
+            guard let tapLocation else { return }
+            
+            do {
+                try await model.addRouteGraphic(for: tapLocation)
+            } catch {
+                self.error = error
             }
         }
-        .locationDisplay(model.locationDisplay)
         .task {
-            Task {
-                do {
-                    try await model.setup()
-                } catch {
-                    self.error = error
-                }
+            do {
+                try await model.setUp()
+            } catch {
+                self.error = error
             }
         }
         .overlay(alignment: .top) {
@@ -172,7 +176,7 @@ private extension AugmentRealityToNavigateRouteView {
 
         /// Performs important tasks including setting up the location display, creating route parameters,
         /// and loading the scene elevation source.
-        func setup() async throws {
+        func setUp() async throws {
             try await startLocationDisplay()
             try await makeParameters()
             try await sceneModel.loadElevationSource()
@@ -215,21 +219,15 @@ private extension AugmentRealityToNavigateRouteView {
                 endPoint = mapPoint
                 sceneModel.routeParameters.setStops(makeStops())
 
-                Task {
-                    do {
-                        let routeResult = try await sceneModel.routeTask.solveRoute(
-                            using: sceneModel.routeParameters
-                        )
-                        if let firstRoute = routeResult.routes.first {
-                            let routeGraphic = Graphic(geometry: firstRoute.geometry)
-                            routeGraphicsOverlay.addGraphic(routeGraphic)
-                            sceneModel.routeResult = routeResult
-                            try await sceneModel.makeRouteOverlay()
-                            statusText = "Tap camera to start navigation."
-                        }
-                    } catch {
-                        throw error
-                    }
+                let routeResult = try await sceneModel.routeTask.solveRoute(
+                    using: sceneModel.routeParameters
+                )
+                if let firstRoute = routeResult.routes.first {
+                    let routeGraphic = Graphic(geometry: firstRoute.geometry)
+                    routeGraphicsOverlay.addGraphic(routeGraphic)
+                    sceneModel.routeResult = routeResult
+                    try await sceneModel.makeRouteOverlay()
+                    statusText = "Tap camera to start navigation."
                 }
             }
         }