Merge remote-tracking branch 'origin/r3.9'

This commit is contained in:
Victor Shcherb 2021-02-12 11:45:04 +01:00
commit 743130c9cf

View file

@ -658,7 +658,7 @@ public class BinaryRoutePlanner {
break;
}
}
if (rv == viaId && rt == MapRenderingTypes.RESTRICTION_ONLY_STRAIGHT_ON) {
if (rv == viaId && via && rt == MapRenderingTypes.RESTRICTION_ONLY_STRAIGHT_ON) {
type = MapRenderingTypes.RESTRICTION_NO_STRAIGHT_ON;
break;
}
@ -675,7 +675,7 @@ public class BinaryRoutePlanner {
}
}
if (rv == viaId && rt == MapRenderingTypes.RESTRICTION_ONLY_STRAIGHT_ON) {
if (rv == viaId && via && rt == MapRenderingTypes.RESTRICTION_ONLY_STRAIGHT_ON) {
type = MapRenderingTypes.RESTRICTION_NO_STRAIGHT_ON;
break;
}