Skip to content

Commit cf9221e

Browse files
committed
NAVAND-1311: introduce violated section in route line
1 parent 9da2a96 commit cf9221e

33 files changed

+4545
-88
lines changed

build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ task testReport(type: TestReport, group: 'Build') {
4242

4343
allprojects {
4444
repositories {
45+
mavenLocal()
4546
google()
4647
mavenCentral()
4748
maven {

gradle/dependencies.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ext {
1919

2020
version = [
2121
mapboxMapSdk : '10.13.0-beta.1',
22-
mapboxSdkServices : '6.11.0',
22+
mapboxSdkServices : '6.12.0-dzina',
2323
mapboxNavigator : "${mapboxNavigatorVersion}",
2424
mapboxCommonNative : '23.5.0-beta.1',
2525
mapboxCrashMonitor : '2.0.0',

libnavui-maps/api/current.txt

+23
Original file line numberDiff line numberDiff line change
@@ -1087,6 +1087,7 @@ package com.mapbox.navigation.ui.maps.route.line.model {
10871087
method public android.graphics.drawable.Drawable getDestinationIcon();
10881088
method public boolean getDisplayRestrictedRoadSections();
10891089
method public boolean getDisplaySoftGradientForTraffic();
1090+
method public boolean getDisplayViolatedSections();
10901091
method public com.mapbox.maps.extension.style.layers.properties.generated.IconPitchAlignment getIconPitchAlignment();
10911092
method public double getLineDepthOcclusionFactor();
10921093
method public android.graphics.drawable.Drawable getOriginIcon();
@@ -1104,6 +1105,7 @@ package com.mapbox.navigation.ui.maps.route.line.model {
11041105
property public final android.graphics.drawable.Drawable destinationIcon;
11051106
property public final boolean displayRestrictedRoadSections;
11061107
property public final boolean displaySoftGradientForTraffic;
1108+
property public final boolean displayViolatedSections;
11071109
property public final com.mapbox.maps.extension.style.layers.properties.generated.IconPitchAlignment iconPitchAlignment;
11081110
property public final double lineDepthOcclusionFactor;
11091111
property public final android.graphics.drawable.Drawable originIcon;
@@ -1124,6 +1126,7 @@ package com.mapbox.navigation.ui.maps.route.line.model {
11241126
method public com.mapbox.navigation.ui.maps.route.line.model.MapboxRouteLineOptions build();
11251127
method public com.mapbox.navigation.ui.maps.route.line.model.MapboxRouteLineOptions.Builder displayRestrictedRoadSections(boolean displayRestrictedRoadSections);
11261128
method public com.mapbox.navigation.ui.maps.route.line.model.MapboxRouteLineOptions.Builder displaySoftGradientForTraffic(boolean enable);
1129+
method public com.mapbox.navigation.ui.maps.route.line.model.MapboxRouteLineOptions.Builder displayViolatedSections(boolean displayViolatedSections);
11271130
method public com.mapbox.navigation.ui.maps.route.line.model.MapboxRouteLineOptions.Builder iconPitchAlignment(com.mapbox.maps.extension.style.layers.properties.generated.IconPitchAlignment iconPitchAlignment);
11281131
method @com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI public com.mapbox.navigation.ui.maps.route.line.model.MapboxRouteLineOptions.Builder lineDepthOcclusionFactor(@FloatRange(from=0.0, to=1.0) double lineDepthOcclusionFactor);
11291132
method @com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI public com.mapbox.navigation.ui.maps.route.line.model.MapboxRouteLineOptions.Builder shareLineGeometrySources(boolean shareLineGeometrySources);
@@ -1199,6 +1202,7 @@ package com.mapbox.navigation.ui.maps.route.line.model {
11991202
method public int getAlternativeRouteRestrictedRoadColor();
12001203
method public int getAlternativeRouteSevereCongestionColor();
12011204
method public int getAlternativeRouteUnknownCongestionColor();
1205+
method public int getAlternativeRouteViolatedSectionColor();
12021206
method public kotlin.ranges.IntRange getHeavyCongestionRange();
12031207
method public int getInActiveRouteLegsColor();
12041208
method public kotlin.ranges.IntRange getLowCongestionRange();
@@ -1215,6 +1219,7 @@ package com.mapbox.navigation.ui.maps.route.line.model {
12151219
method public int getRouteSevereCongestionColor();
12161220
method public int getRouteUnknownCongestionColor();
12171221
method public kotlin.ranges.IntRange getSevereCongestionRange();
1222+
method public int getViolatedSectionColor();
12181223
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineColorResources.Builder toBuilder();
12191224
property public final int alternativeRouteCasingColor;
12201225
property public final int alternativeRouteClosureColor;
@@ -1225,6 +1230,7 @@ package com.mapbox.navigation.ui.maps.route.line.model {
12251230
property public final int alternativeRouteRestrictedRoadColor;
12261231
property public final int alternativeRouteSevereCongestionColor;
12271232
property public final int alternativeRouteUnknownCongestionColor;
1233+
property public final int alternativeRouteViolatedSectionColor;
12281234
property public final kotlin.ranges.IntRange heavyCongestionRange;
12291235
property public final int inActiveRouteLegsColor;
12301236
property public final kotlin.ranges.IntRange lowCongestionRange;
@@ -1241,6 +1247,7 @@ package com.mapbox.navigation.ui.maps.route.line.model {
12411247
property public final int routeSevereCongestionColor;
12421248
property public final int routeUnknownCongestionColor;
12431249
property public final kotlin.ranges.IntRange severeCongestionRange;
1250+
property public final int violatedSectionColor;
12441251
}
12451252

12461253
public static final class RouteLineColorResources.Builder {
@@ -1254,6 +1261,7 @@ package com.mapbox.navigation.ui.maps.route.line.model {
12541261
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineColorResources.Builder alternativeRouteRestrictedRoadColor(@ColorInt int color);
12551262
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineColorResources.Builder alternativeRouteSevereCongestionColor(@ColorInt int color);
12561263
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineColorResources.Builder alternativeRouteUnknownCongestionColor(@ColorInt int color);
1264+
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineColorResources.Builder alternativeRouteViolatedSectionColor(@ColorInt int color);
12571265
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineColorResources build();
12581266
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineColorResources.Builder heavyCongestionRange(kotlin.ranges.IntRange range);
12591267
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineColorResources.Builder inActiveRouteLegsColor(@ColorInt int color);
@@ -1271,6 +1279,7 @@ package com.mapbox.navigation.ui.maps.route.line.model {
12711279
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineColorResources.Builder routeSevereCongestionColor(@ColorInt int color);
12721280
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineColorResources.Builder routeUnknownCongestionColor(@ColorInt int color);
12731281
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineColorResources.Builder severeCongestionRange(kotlin.ranges.IntRange range);
1282+
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineColorResources.Builder violatedSectionColor(@ColorInt int color);
12741283
}
12751284

12761285
public final class RouteLineData {
@@ -1310,6 +1319,7 @@ package com.mapbox.navigation.ui.maps.route.line.model {
13101319
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider? getTrailCasingExpressionProvider();
13111320
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider? getTrailExpressionProvider();
13121321
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineTrimOffset? getTrimOffset();
1322+
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider? getViolatedSectionExpressionProvider();
13131323
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineDynamicData.MutableRouteLineDynamicData toMutableValue();
13141324
property public final com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider baseExpressionProvider;
13151325
property public final com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider casingExpressionProvider;
@@ -1318,6 +1328,7 @@ package com.mapbox.navigation.ui.maps.route.line.model {
13181328
property public final com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider? trailCasingExpressionProvider;
13191329
property public final com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider? trailExpressionProvider;
13201330
property public final com.mapbox.navigation.ui.maps.route.line.model.RouteLineTrimOffset? trimOffset;
1331+
property public final com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider? violatedSectionExpressionProvider;
13211332
}
13221333

13231334
public static final class RouteLineDynamicData.MutableRouteLineDynamicData {
@@ -1328,13 +1339,15 @@ package com.mapbox.navigation.ui.maps.route.line.model {
13281339
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider? getTrailCasingExpressionProvider();
13291340
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider? getTrailExpressionProvider();
13301341
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineTrimOffset? getTrimOffset();
1342+
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider? getViolatedSectionExpressionProvider();
13311343
method public void setBaseExpressionProvider(com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider);
13321344
method public void setCasingExpressionProvider(com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider);
13331345
method public void setRestrictedSectionExpressionProvider(com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider?);
13341346
method public void setTrafficExpressionProvider(com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider?);
13351347
method public void setTrailCasingExpressionProvider(com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider?);
13361348
method public void setTrailExpressionProvider(com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider?);
13371349
method public void setTrimOffset(com.mapbox.navigation.ui.maps.route.line.model.RouteLineTrimOffset?);
1350+
method public void setViolatedSectionExpressionProvider(com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider?);
13381351
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineDynamicData toImmutableValue();
13391352
property public final com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider baseExpressionProvider;
13401353
property public final com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider casingExpressionProvider;
@@ -1343,6 +1356,7 @@ package com.mapbox.navigation.ui.maps.route.line.model {
13431356
property public final com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider? trailCasingExpressionProvider;
13441357
property public final com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider? trailExpressionProvider;
13451358
property public final com.mapbox.navigation.ui.maps.route.line.model.RouteLineTrimOffset? trimOffset;
1359+
property public final com.mapbox.navigation.ui.maps.route.line.model.RouteLineExpressionProvider? violatedSectionExpressionProvider;
13461360
}
13471361

13481362
public final class RouteLineError {
@@ -1382,6 +1396,9 @@ package com.mapbox.navigation.ui.maps.route.line.model {
13821396
method public com.mapbox.maps.extension.style.expressions.generated.Expression getRouteLineScaleExpression();
13831397
method public com.mapbox.maps.extension.style.expressions.generated.Expression getRouteTrafficLineScaleExpression();
13841398
method public java.util.List<java.lang.String> getTrafficBackfillRoadClasses();
1399+
method public java.util.List<java.lang.Double> getViolatedSectionDashArray();
1400+
method public double getViolatedSectionLineWidth();
1401+
method public double getViolatedSectionOpacity();
13851402
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineResources.Builder toBuilder();
13861403
property public final com.mapbox.maps.extension.style.expressions.generated.Expression alternativeRouteCasingLineScaleExpression;
13871404
property public final com.mapbox.maps.extension.style.expressions.generated.Expression alternativeRouteLineScaleExpression;
@@ -1397,6 +1414,9 @@ package com.mapbox.navigation.ui.maps.route.line.model {
13971414
property public final com.mapbox.maps.extension.style.expressions.generated.Expression routeLineScaleExpression;
13981415
property public final com.mapbox.maps.extension.style.expressions.generated.Expression routeTrafficLineScaleExpression;
13991416
property public final java.util.List<java.lang.String> trafficBackfillRoadClasses;
1417+
property public final java.util.List<java.lang.Double> violatedSectionDashArray;
1418+
property public final double violatedSectionLineWidth;
1419+
property public final double violatedSectionOpacity;
14001420
}
14011421

14021422
public static final class RouteLineResources.Builder {
@@ -1416,6 +1436,9 @@ package com.mapbox.navigation.ui.maps.route.line.model {
14161436
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineResources.Builder routeLineScaleExpression(com.mapbox.maps.extension.style.expressions.generated.Expression expression);
14171437
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineResources.Builder routeTrafficLineScaleExpression(com.mapbox.maps.extension.style.expressions.generated.Expression expression);
14181438
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineResources.Builder trafficBackfillRoadClasses(java.util.List<java.lang.String> roadClasses);
1439+
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineResources.Builder violatedSectionDashArray(java.util.List<java.lang.Double> dashArray);
1440+
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineResources.Builder violatedSectionLineWidth(double width);
1441+
method public com.mapbox.navigation.ui.maps.route.line.model.RouteLineResources.Builder violatedSectionOpacity(double opacity);
14191442
}
14201443

14211444
public final class RouteLineScaleValue {

0 commit comments

Comments
 (0)