Skip to content

Commit 526813c

Browse files
DSamaryangithub-actions[bot]
DSamaryan
authored and
github-actions[bot]
committed
NAVAND-6194 Update traffic colors on route line (#10446)
* NAVAND-6194 Update traffic colors on route line * NAVAND-6194 Update traffic colors on route line GitOrigin-RevId: c230cb1f06518652b0cc8903a85f0015434ecda6
1 parent d359056 commit 526813c

File tree

4 files changed

+56
-55
lines changed

4 files changed

+56
-55
lines changed

‎changelog/updated-traffic-colors.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Updated default traffic colors on the primary route line

‎ui-maps/src/main/java/com/mapbox/navigation/ui/maps/route/RouteLayerConstants.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@ object RouteLayerConstants {
117117
internal val ROUTE_LOW_TRAFFIC_COLOR = Color.parseColor("#56A8FB")
118118

119119
@ColorInt
120-
internal val ROUTE_MODERATE_TRAFFIC_COLOR = Color.parseColor("#ff9500")
120+
internal val ROUTE_MODERATE_TRAFFIC_COLOR = Color.parseColor("#F5C32E")
121121

122122
@ColorInt
123-
internal val ROUTE_HEAVY_TRAFFIC_COLOR = Color.parseColor("#ff4d4d")
123+
internal val ROUTE_HEAVY_TRAFFIC_COLOR = Color.parseColor("#F54724")
124124

125125
@ColorInt
126-
internal val ROUTE_SEVERE_TRAFFIC_COLOR = Color.parseColor("#8f2447")
126+
internal val ROUTE_SEVERE_TRAFFIC_COLOR = Color.parseColor("#C32828")
127127

128128
@ColorInt
129129
internal val ROUTE_LEG_INACTIVE_UNKNOWN_TRAFFIC_COLOR = Color.TRANSPARENT

‎ui-maps/src/test/java/com/mapbox/navigation/ui/maps/internal/route/line/MapboxRouteLineUtilsRoboTest.kt‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -776,9 +776,9 @@ class MapboxRouteLineUtilsRoboTest {
776776
val expectedPrimaryTrafficLineExpression = listOf(
777777
StringChecker("step"),
778778
StringChecker("[line-progress]"),
779-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
779+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
780780
DoubleChecker(0.0),
781-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
781+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
782782
DoubleChecker(0.057450106815746),
783783
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
784784
)
@@ -825,26 +825,26 @@ class MapboxRouteLineUtilsRoboTest {
825825
DoubleChecker(0.0),
826826
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
827827
DoubleChecker(0.057699774865110785),
828-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
828+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
829829
DoubleChecker(0.11325578361883003),
830830
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
831831
DoubleChecker(0.4083904023623381),
832-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
832+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
833833
DoubleChecker(0.4289348860509439),
834834
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
835835
DoubleChecker(0.4578611756172846),
836836
// this is the moderate color at the start of the second leg
837837
// even though it's preceded by a duplicate 'severe' point which is ignored
838-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
838+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
839839

840840
DoubleChecker(0.5102280025300374),
841841
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
842842
DoubleChecker(0.6773590053264998),
843-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
843+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
844844
DoubleChecker(0.7281017096572071),
845845
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
846846
DoubleChecker(0.8759875634288179),
847-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
847+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
848848
DoubleChecker(0.8962617854158452),
849849
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
850850
)
@@ -929,9 +929,9 @@ class MapboxRouteLineUtilsRoboTest {
929929
StringChecker("[linear]"),
930930
StringChecker("[line-progress]"),
931931
DoubleChecker(0.0),
932-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
932+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
933933
DoubleChecker(0.05745010681574608),
934-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
934+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
935935
DoubleChecker(0.3065161093064062),
936936
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
937937
DoubleChecker(1.0),
@@ -962,7 +962,7 @@ class MapboxRouteLineUtilsRoboTest {
962962
@Test
963963
fun getTrafficLineExpression() {
964964
val expectedPrimaryTrafficLineExpression = "[step, [line-progress]" +
965-
", [rgba, 255.0, 149.0, 0.0, 1.0], 0.0, [rgba, 255.0, 149.0, 0.0, 1.0], " +
965+
", [rgba, 245.0, 195.0, 46.0, 1.0], 0.0, [rgba, 245.0, 195.0, 46.0, 1.0], " +
966966
"0.05745010681574614, [rgba, 86.0, 168.0, 251.0, 1.0]]"
967967

968968
val result = MapboxRouteLineUtils.getTrafficLineExpression(
@@ -1008,25 +1008,25 @@ class MapboxRouteLineUtilsRoboTest {
10081008
DoubleChecker(0.0),
10091009
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
10101010
DoubleChecker(0.057699774865110785),
1011-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1011+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
10121012
DoubleChecker(0.11325578361882999),
10131013
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
10141014
DoubleChecker(0.4083904023623381),
1015-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1015+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
10161016
DoubleChecker(0.4289348860509439),
10171017
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
10181018
// this is the moderate color at the start of the second leg
10191019
// even though it's preceded by a duplicate 'severe' point which is ignored
10201020
DoubleChecker(0.4578611756172846),
1021-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1021+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
10221022
DoubleChecker(0.5102280025300375),
10231023
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
10241024
DoubleChecker(0.6773590053264998),
1025-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1025+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
10261026
DoubleChecker(0.7281017096572071),
10271027
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
10281028
DoubleChecker(0.8759875634288179),
1029-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1029+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
10301030
DoubleChecker(0.8962617854158452),
10311031
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
10321032
)
@@ -1189,9 +1189,9 @@ class MapboxRouteLineUtilsRoboTest {
11891189
StringChecker("[linear]"),
11901190
StringChecker("[line-progress]"),
11911191
DoubleChecker(0.0),
1192-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1192+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
11931193
DoubleChecker(0.05745010681574608),
1194-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1194+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
11951195
DoubleChecker(0.3065161093057461),
11961196
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
11971197
DoubleChecker(1.0),
@@ -1277,41 +1277,41 @@ class MapboxRouteLineUtilsRoboTest {
12771277
DoubleChecker(0.057699774865110785),
12781278
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
12791279
DoubleChecker(0.07809162465058853),
1280-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1280+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
12811281
DoubleChecker(0.11325578361882999),
1282-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1282+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
12831283
DoubleChecker(0.1336476334043077),
12841284
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
12851285
DoubleChecker(0.4083904023623381),
12861286
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
12871287
DoubleChecker(0.4287822521478158),
1288-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1288+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
12891289
DoubleChecker(0.4289348860509439),
1290-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1290+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
12911291
DoubleChecker(0.44932673583642163),
12921292
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
12931293
DoubleChecker(0.4578611756172846),
12941294
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
12951295
DoubleChecker(0.4782530254027623),
1296-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1296+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
12971297
DoubleChecker(0.5102280025300375),
1298-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1298+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
12991299
DoubleChecker(0.5306198523155153),
13001300
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
13011301
DoubleChecker(0.6773590053264998),
13021302
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
13031303
DoubleChecker(0.6977508551119776),
1304-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1304+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
13051305
DoubleChecker(0.7281017096572071),
1306-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1306+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
13071307
DoubleChecker(0.7484935594426849),
13081308
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
13091309
DoubleChecker(0.8759875634288179),
13101310
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
13111311
DoubleChecker(0.8962617854058452),
1312-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1312+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
13131313
DoubleChecker(0.8962617854158452),
1314-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1314+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
13151315
DoubleChecker(0.9166536352013229),
13161316
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
13171317
DoubleChecker(1.0),
@@ -1352,18 +1352,18 @@ class MapboxRouteLineUtilsRoboTest {
13521352
DoubleChecker(0.10977413369872581),
13531353
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
13541354
DoubleChecker(0.1253172288729834),
1355-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1355+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
13561356
DoubleChecker(0.140879889720177),
1357-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1357+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
13581358
DoubleChecker(0.15642298489443452),
13591359
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
13601360
DoubleChecker(0.4978356586215484),
13611361
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
13621362
DoubleChecker(0.513378753795806),
1363-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1363+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
13641364
// notice this value (below) plus the stopGap value equals the previous value (2 lines below)
13651365
DoubleChecker(0.5322425632874296),
1366-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1366+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
13671367
DoubleChecker(0.5477856584616871),
13681368
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
13691369
DoubleChecker(1.0),
@@ -1404,15 +1404,15 @@ class MapboxRouteLineUtilsRoboTest {
14041404
DoubleChecker(0.1097741336987258),
14051405
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
14061406
DoubleChecker(0.12531722887298333),
1407-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1407+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
14081408
DoubleChecker(0.14087988972017695),
1409-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1409+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
14101410
DoubleChecker(0.15642298489443449),
14111411
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
14121412
DoubleChecker(0.49783565862154844),
14131413
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
14141414
DoubleChecker(0.513378753795806),
1415-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1415+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
14161416
DoubleChecker(0.53),
14171417
// doesn't matter what comes after 0.53, as this part will be erased with line-trim-start.
14181418
{},
@@ -1452,9 +1452,9 @@ class MapboxRouteLineUtilsRoboTest {
14521452
DoubleChecker(0.10977413369872582),
14531453
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
14541454
DoubleChecker(0.12531722887298343),
1455-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1455+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
14561456
DoubleChecker(0.140879889720177),
1457-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1457+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
14581458
// this is the value to notice
14591459
DoubleChecker(0.1545333379862618),
14601460
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
@@ -1497,17 +1497,17 @@ class MapboxRouteLineUtilsRoboTest {
14971497
DoubleChecker(0.10977413369872581),
14981498
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
14991499
DoubleChecker(0.1253172288729834),
1500-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1500+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
15011501
DoubleChecker(0.140879889720177),
1502-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1502+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
15031503
DoubleChecker(0.15642298489443452),
15041504
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
15051505
DoubleChecker(0.4978356586215484),
15061506
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
15071507
DoubleChecker(0.513378753795806),
1508-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1508+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
15091509
DoubleChecker(0.5322425632874296),
1510-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1510+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
15111511
DoubleChecker(0.5477856584616871),
15121512
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
15131513
// notice no stop added before the vanishing point
@@ -1549,17 +1549,17 @@ class MapboxRouteLineUtilsRoboTest {
15491549
DoubleChecker(0.10977413369872582),
15501550
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
15511551
DoubleChecker(0.12531722887298343),
1552-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1552+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
15531553
DoubleChecker(0.140879889720177),
1554-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1554+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
15551555
DoubleChecker(0.1564229848944345),
15561556
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
15571557
DoubleChecker(0.4978356586215484),
15581558
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
15591559
DoubleChecker(0.5133787537958059),
1560-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1560+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
15611561
DoubleChecker(0.5322425632874296),
1562-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
1562+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
15631563
DoubleChecker(0.5477856584616871),
15641564
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
15651565
// notice no stop added before the vanishing point

‎ui-maps/src/test/java/com/mapbox/navigation/ui/maps/route/line/api/MapboxRouteLineApiRoboTest.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2853,9 +2853,9 @@ class MapboxRouteLineApiRoboTest {
28532853
val expectedTrafficLineExpressionContents = listOf(
28542854
StringChecker("step"),
28552855
StringChecker("[line-progress]"),
2856-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
2856+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
28572857
DoubleChecker(0.0),
2858-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
2858+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
28592859
DoubleChecker(0.057451),
28602860
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
28612861
)
@@ -3335,9 +3335,9 @@ class MapboxRouteLineApiRoboTest {
33353335
val expectedTrafficLineExpressionContents = listOf(
33363336
StringChecker("step"),
33373337
StringChecker("[line-progress]"),
3338-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
3338+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
33393339
DoubleChecker(0.0),
3340-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
3340+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
33413341
DoubleChecker(0.057451),
33423342
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
33433343
)
@@ -4054,9 +4054,9 @@ class MapboxRouteLineApiRoboTest {
40544054
val expectedPrimaryTrafficLineExpressionContents = listOf(
40554055
StringChecker("step"),
40564056
StringChecker("[line-progress]"),
4057-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
4057+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
40584058
DoubleChecker(0.0),
4059-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
4059+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
40604060
DoubleChecker(0.05745011),
40614061
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
40624062
)
@@ -4415,9 +4415,9 @@ class MapboxRouteLineApiRoboTest {
44154415
val expectedTrafficLineExpressionContents = listOf(
44164416
StringChecker("step"),
44174417
StringChecker("[line-progress]"),
4418-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
4418+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
44194419
DoubleChecker(0.0),
4420-
StringChecker("[rgba, 255.0, 149.0, 0.0, 1.0]"),
4420+
StringChecker("[rgba, 245.0, 195.0, 46.0, 1.0]"),
44214421
DoubleChecker(0.0574502),
44224422
StringChecker("[rgba, 86.0, 168.0, 251.0, 1.0]"),
44234423
)

0 commit comments

Comments
 (0)