Update the property and function names.

mapbox · Oct 24, 2022 · 5fe5f65 · 5fe5f65
1 parent 57c8edf
commit 5fe5f65
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 26 deletions.
diff --git a/Sources/MapboxNavigation/CarPlayNavigationViewController.swift b/Sources/MapboxNavigation/CarPlayNavigationViewController.swift
@@ -789,7 +789,7 @@ open class CarPlayNavigationViewController: UIViewController, BuildingHighlighti
         }
 
         if annotatesIntersectionsAlongRoute {
-            navigationMapView?.updateIntersectionSignals(with: routeProgress)
+            navigationMapView?.updateIntersectionAnnotations(with: routeProgress)
         }
 
         navigationMapView?.updateRouteLine(routeProgress: routeProgress, coordinate: location.coordinate, shouldRedraw: legIndex != currentLegIndexMapped)
@@ -890,7 +890,7 @@ open class CarPlayNavigationViewController: UIViewController, BuildingHighlighti
         navigationMapView?.showWaypoints(on: progress.route, legIndex: legIndex)
 
         if annotatesIntersectionsAlongRoute {
-            navigationMapView?.updateIntersectionSignals(with: progress)
+            navigationMapView?.updateIntersectionAnnotations(with: progress)
         }
     }
 
@@ -1037,9 +1037,9 @@ open class CarPlayNavigationViewController: UIViewController, BuildingHighlighti
     func updateIntersectionsAlongRoute() {
         if annotatesIntersectionsAlongRoute {
             navigationMapView?.updateIntersectionSymbolImages(styleType: styleManager?.currentStyleType)
-            navigationMapView?.updateIntersectionSignals(with: navigationService.routeProgress)
+            navigationMapView?.updateIntersectionAnnotations(with: navigationService.routeProgress)
         } else {
-            navigationMapView?.removeIntersectionSignals()
+            navigationMapView?.removeIntersectionAnnotations()
         }
     }
 }

diff --git a/Sources/MapboxNavigation/NavigationMapView+Annotations.swift b/Sources/MapboxNavigation/NavigationMapView+Annotations.swift
@@ -395,8 +395,20 @@ extension NavigationMapView {
 
     // MARK: Intersection Signals Annotations
 
+
+    /**
+     Removes all the intersection annotations on current route.
+     */
+    func removeIntersectionAnnotations() {
+        let style = mapView.mapboxMap.style
+        style.removeLayers([NavigationMapView.LayerIdentifier.intersectionAnnotationsLayer])
+        style.removeSources([NavigationMapView.SourceIdentifier.intersectionAnnotationsSource])
+    }
+
     /**
      Updates the image assets in the map style for the route intersection signals.
+     
+     - parameter styleType: The `StyleType` to choose `Day` or `Night` style of icon images for route intersection signals.
      */
     func updateIntersectionSymbolImages(styleType: StyleType?) {
         let style = mapView.mapboxMap.style
@@ -428,9 +440,9 @@ extension NavigationMapView {
         }
     }
 
-    func updateIntersectionSignals(with routeProgress: RouteProgress) {
+    func updateIntersectionAnnotations(with routeProgress: RouteProgress) {
         guard !routeProgress.routeIsComplete else {
-            removeIntersectionSignals()
+            removeIntersectionAnnotations()
             return
         }
         var featureCollection = FeatureCollection(features: [])
@@ -440,15 +452,15 @@ extension NavigationMapView {
         let stepIntersections = stepProgress.intersectionsIncludingUpcomingManeuverIntersection
 
         for intersection in stepIntersections?.suffix(from: intersectionIndex) ?? [] {
-            if let feature = signalFeature(from: intersection) {
+            if let feature = intersectionFeature(from: intersection) {
                 featureCollection.features.append(feature)
             }
         }
 
         let style = mapView.mapboxMap.style
 
         do {
-            let sourceIdentifier = NavigationMapView.SourceIdentifier.intersectionSignalSource
+            let sourceIdentifier = NavigationMapView.SourceIdentifier.intersectionAnnotationsSource
             if style.sourceExists(withId: sourceIdentifier) {
                 try style.updateGeoJSONSource(withId: sourceIdentifier, geoJSON: .featureCollection(featureCollection))
             } else {
@@ -457,7 +469,7 @@ extension NavigationMapView {
                 try style.addSource(source, id: sourceIdentifier)
             }
 
-            let layerIdentifier = NavigationMapView.LayerIdentifier.intersectionSignalLayer
+            let layerIdentifier = NavigationMapView.LayerIdentifier.intersectionAnnotationsLayer
             guard !style.layerExists(withId: layerIdentifier) else { return }
 
             var shapeLayer = SymbolLayer(id: layerIdentifier)
@@ -475,7 +487,7 @@ extension NavigationMapView {
         }
     }
 
-    private func signalFeature(from intersection: Intersection) -> Feature? {
+    private func intersectionFeature(from intersection: Intersection) -> Feature? {
         var properties: JSONObject? = nil
         if intersection.railroadCrossing == true {
             properties = ["imageName": .string(ImageIdentifier.railroadCrossing)]

diff --git a/Sources/MapboxNavigation/NavigationMapView.swift b/Sources/MapboxNavigation/NavigationMapView.swift
@@ -1459,7 +1459,7 @@ open class NavigationMapView: UIView {
             LayerIdentifier.arrowLayer,
             LayerIdentifier.arrowSymbolCasingLayer,
             LayerIdentifier.arrowSymbolLayer,
-            LayerIdentifier.intersectionSignalLayer
+            LayerIdentifier.intersectionAnnotationsLayer
         ]
         let uppermostSymbolLayers: [String] = [
             LayerIdentifier.waypointCircleLayer,

diff --git a/Sources/MapboxNavigation/NavigationMapViewIdentifiers.swift b/Sources/MapboxNavigation/NavigationMapViewIdentifiers.swift
@@ -11,7 +11,7 @@ extension NavigationMapView {
         static let arrowSymbolCasingLayer = "\(identifier)_arrowSymbolCasingLayer"
         static let voiceInstructionLabelLayer = "\(identifier)_voiceInstructionLabelLayer"
         static let voiceInstructionCircleLayer = "\(identifier)_voiceInstructionCircleLayer"
-        static let intersectionSignalLayer = "\(identifier)_trafficLayer"
+        static let intersectionAnnotationsLayer = "\(identifier)_intersectionAnnotationsLayer"
         static let waypointCircleLayer = "\(identifier)_waypointCircleLayer"
         static let waypointSymbolLayer = "\(identifier)_waypointSymbolLayer"
         static let buildingExtrusionLayer = "\(identifier)_buildingExtrusionLayer"
@@ -26,7 +26,7 @@ extension NavigationMapView {
         static let arrowStrokeSource = "\(identifier)_arrowStrokeSource"
         static let arrowSymbolSource = "\(identifier)_arrowSymbolSource"
         static let voiceInstructionSource = "\(identifier)_instructionSource"
-        static let intersectionSignalSource = "\(identifier)_trafficSource"
+        static let intersectionAnnotationsSource = "\(identifier)_intersectionAnnotationsSource"
         static let waypointSource = "\(identifier)_waypointSource"
         static let routeDurationAnnotationsSource: String = "\(identifier)_routeDurationAnnotationsSource"
         static let continuousAlternativeRoutesDurationAnnotationsSource: String = "\(identifier)_continuousAlternativeRoutesDurationAnnotationsSource"

diff --git a/Sources/MapboxNavigation/NavigationViewController.swift b/Sources/MapboxNavigation/NavigationViewController.swift
@@ -886,9 +886,9 @@ open class NavigationViewController: UIViewController, NavigationStatusPresenter
     func updateIntersectionsAlongRoute() {
         if annotatesIntersectionsAlongRoute {
             navigationMapView?.updateIntersectionSymbolImages(styleType: styleManager?.currentStyleType)
-            navigationMapView?.updateIntersectionSignals(with: navigationService.routeProgress)
+            navigationMapView?.updateIntersectionAnnotations(with: navigationService.routeProgress)
         } else {
-            navigationMapView?.removeIntersectionSignals()
+            navigationMapView?.removeIntersectionAnnotations()
         }
     }
 }

diff --git a/Sources/MapboxNavigation/RouteLineController.swift b/Sources/MapboxNavigation/RouteLineController.swift
@@ -56,7 +56,7 @@ extension NavigationMapView {
             }
 
             if annotatesIntersections {
-                navigationMapView.updateIntersectionSignals(with: router.routeProgress)
+                navigationMapView.updateIntersectionAnnotations(with: router.routeProgress)
             }
         }
 
@@ -94,7 +94,7 @@ extension NavigationMapView {
             }
 
             if annotatesIntersections {
-                navigationMapView.updateIntersectionSignals(with: router.routeProgress)
+                navigationMapView.updateIntersectionAnnotations(with: router.routeProgress)
             }
         }
 
@@ -118,7 +118,7 @@ extension NavigationMapView {
             }
 
             if annotatesIntersections {
-                navigationMapView.updateIntersectionSignals(with: progress)
+                navigationMapView.updateIntersectionAnnotations(with: progress)
             }
 
             navigationMapView.updateRouteLine(routeProgress: progress, coordinate: location.coordinate, shouldRedraw: currentLegIndexMapped != legIndex)

diff --git a/Tests/MapboxNavigationTests/NavigationViewControllerTests.swift b/Tests/MapboxNavigationTests/NavigationViewControllerTests.swift
@@ -526,11 +526,11 @@ class NavigationViewControllerTests: TestCase {
                        "Failed to update the style of SpriteRepository singleton with the injected NavigationMapView.")
     }
 
-    func testUpdateIntersectionSignalsAlongRouteOnMap() {
+    func testAnnotatesIntersectionsAlongRoute() {
         let navigationViewController = navigationViewControllerMock()
         let imageIdentifier = NavigationMapView.ImageIdentifier.trafficSignal
-        let layerIdentifier = NavigationMapView.LayerIdentifier.intersectionSignalLayer
-        let sourceIdentifier = NavigationMapView.SourceIdentifier.intersectionSignalSource
+        let layerIdentifier = NavigationMapView.LayerIdentifier.intersectionAnnotationsLayer
+        let sourceIdentifier = NavigationMapView.SourceIdentifier.intersectionAnnotationsSource
 
         guard let style = navigationViewController.navigationMapView?.mapView.mapboxMap.style else {
             XCTFail("Failed to get the MapView style object.")

diff --git a/Tests/MapboxNavigationTests/RouteLineLayerPositionTests.swift b/Tests/MapboxNavigationTests/RouteLineLayerPositionTests.swift
@@ -245,7 +245,7 @@ class RouteLineLayerPositionTests: TestCase {
         navigationMapView.showsRestrictedAreasOnRoute = false
         navigationMapView.routeLineTracksTraversal = true
         navigationMapView.updateIntersectionSymbolImages(styleType: .day)
-        navigationMapView.updateIntersectionSignals(with: routeProgress)
+        navigationMapView.updateIntersectionAnnotations(with: routeProgress)
 
         expectedLayerSequence = [
             buildingLayer["id"]!,
@@ -258,7 +258,7 @@ class RouteLineLayerPositionTests: TestCase {
             NavigationMapView.LayerIdentifier.arrowLayer,
             NavigationMapView.LayerIdentifier.arrowSymbolCasingLayer,
             NavigationMapView.LayerIdentifier.arrowSymbolLayer,
-            NavigationMapView.LayerIdentifier.intersectionSignalLayer,
+            NavigationMapView.LayerIdentifier.intersectionAnnotationsLayer,
             roadExitLayer["id"]!,
             poiLabelLayer["id"]!,
             poiLabelCircleLayer["id"]!
@@ -284,7 +284,7 @@ class RouteLineLayerPositionTests: TestCase {
                                 layerPosition: .below(roadLabelLayer["id"]!))
         navigationMapView.removeRoutes()
         navigationMapView.removeArrow()
-        navigationMapView.removeIntersectionSignals()
+        navigationMapView.removeIntersectionAnnotations()
 
         expectedLayerSequence = [
             buildingLayer["id"]!,
@@ -307,7 +307,7 @@ class RouteLineLayerPositionTests: TestCase {
         navigationMapView.show([multilegRoute])
         navigationMapView.showsRestrictedAreasOnRoute = true
         navigationMapView.routeLineTracksTraversal = false
-        navigationMapView.updateIntersectionSignals(with: routeProgress)
+        navigationMapView.updateIntersectionAnnotations(with: routeProgress)
 
         expectedLayerSequence = [
             buildingLayer["id"]!,
@@ -321,7 +321,7 @@ class RouteLineLayerPositionTests: TestCase {
             NavigationMapView.LayerIdentifier.arrowLayer,
             NavigationMapView.LayerIdentifier.arrowSymbolCasingLayer,
             NavigationMapView.LayerIdentifier.arrowSymbolLayer,
-            NavigationMapView.LayerIdentifier.intersectionSignalLayer,
+            NavigationMapView.LayerIdentifier.intersectionAnnotationsLayer,
             roadExitLayer["id"]!,
             poiLabelLayer["id"]!,
             poiLabelCircleLayer["id"]!,