Merge remote-tracking branch 'origin/r3.9'
This commit is contained in:
commit
743130c9cf
1 changed files with 2 additions and 2 deletions
|
@ -658,7 +658,7 @@ public class BinaryRoutePlanner {
|
||||||
break;
|
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;
|
type = MapRenderingTypes.RESTRICTION_NO_STRAIGHT_ON;
|
||||||
break;
|
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;
|
type = MapRenderingTypes.RESTRICTION_NO_STRAIGHT_ON;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue