@@ -412,36 +412,19 @@ extension NavigationMapView {
412412 func updateIntersectionSymbolImages( styleType: StyleType ? ) {
413413 let style = mapView. mapboxMap. style
414414 let styleType = styleType ?? . day
415+ let iconNameToIdentifier : [ String : String ] = [ " trafficSignal " : ImageIdentifier . trafficSignal,
416+ " railroadCrossing " : ImageIdentifier . railroadCrossing,
417+ " yieldSign " : ImageIdentifier . yieldSign,
418+ " stopSign " : ImageIdentifier . stopSign]
415419
416420 do {
417- if styleType == . day {
418- if let trafficSignlaDay = Bundle . mapboxNavigation. image ( named: " TrafficSignalDay " ) {
419- try style. addImage ( trafficSignlaDay, id: ImageIdentifier . trafficSignal)
420- }
421- if let railroadCrossingDay = Bundle . mapboxNavigation. image ( named: " RailroadCrossingDay " ) {
422- try style. addImage ( railroadCrossingDay, id: ImageIdentifier . railroadCrossing)
423- }
424- if let yieldSignDay = Bundle . mapboxNavigation. image ( named: " YieldSignDay " ) {
425- try style. addImage ( yieldSignDay, id: ImageIdentifier . yieldSign)
426- }
427- if let stopSignDay = Bundle . mapboxNavigation. image ( named: " StopSignDay " ) {
428- try style. addImage ( stopSignDay, id: ImageIdentifier . stopSign)
429- }
430- } else {
431- if let trafficSignalNight = Bundle . mapboxNavigation. image ( named: " TrafficSignalNight " ) {
432- try style. addImage ( trafficSignalNight, id: ImageIdentifier . trafficSignal)
433- }
434- if let railroadCrossingNight = Bundle . mapboxNavigation. image ( named: " RailroadCrossingNight " ) {
435- try style. addImage ( railroadCrossingNight, id: ImageIdentifier . railroadCrossing)
436- }
437- if let yieldSignNight = Bundle . mapboxNavigation. image ( named: " YieldSignNight " ) {
438- try style. addImage ( yieldSignNight, id: ImageIdentifier . yieldSign)
439- }
440- if let stopSignNight = Bundle . mapboxNavigation. image ( named: " StopSignNight " ) {
441- try style. addImage ( stopSignNight, id: ImageIdentifier . stopSign)
421+ for iconType in iconNameToIdentifier. keys {
422+ let iconName = iconType. firstCapitalized + styleType. description. firstCapitalized
423+ if let imageIdentifier = iconNameToIdentifier [ iconType] ,
424+ let iconImage = Bundle . mapboxNavigation. image ( named: iconName) {
425+ try style. addImage ( iconImage, id: imageIdentifier)
442426 }
443427 }
444-
445428 } catch {
446429 Log . error ( " Error occured while updating intersection signal images: \( error. localizedDescription) . " ,
447430 category: . navigationUI)
0 commit comments