Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

commented speakable exit

Browse source
This commit is contained in:
veliymolfar 2020-01-13 17:24:51 +02:00
parent c718369ce5
commit 3e17352d3e
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java
View file

@ -695,13 +695,13 @@ public class VoiceRouter {
String tParam = getTurnType(next.getTurnType());
boolean isPlay = true;
ExitInfo exitInfo = next.getExitInfo();
String lang = player.getLanguage();
if (tParam != null) {
if (exitInfo != null) {
p.takeExit(tParam, dist, getSpeakableExitName(next, exitInfo, true));
} else {
p.turn(tParam, dist, getSpeakableStreetName(currentSegment, next, true));
}
p.turn(tParam, dist, getSpeakableStreetName(currentSegment, next, true));
// if (exitInfo != null) {
// p.takeExit(tParam, dist, getSpeakableExitName(next, exitInfo, true));
// } else {
// p.turn(tParam, dist, getSpeakableStreetName(currentSegment, next, true));
// }
suppressDest = true;
} else if (next.getTurnType().isRoundAbout()) {
p.roundAbout(dist, next.getTurnType().getTurnAngle(), next.getTurnType().getExitOut(), getSpeakableStreetName(currentSegment, next, true));
@ -771,11 +771,12 @@ public class VoiceRouter {
boolean isplay = true;
String lang = player.getLanguage();
if (tParam != null) {
if (exitInfo != null) {
p.takeExit(tParam, getSpeakableExitName(next, exitInfo, !suppressDest));
} else {
p.turn(tParam, getSpeakableStreetName(currentSegment, next, !suppressDest));
}
p.turn(tParam, getSpeakableStreetName(currentSegment, next, !suppressDest));
// if (exitInfo != null) {
// p.takeExit(tParam, getSpeakableExitName(next, exitInfo, !suppressDest));
// } else {
// p.turn(tParam, getSpeakableStreetName(currentSegment, next, !suppressDest));
// }
} else if (next.getTurnType().isRoundAbout()) {
p.roundAbout(next.getTurnType().getTurnAngle(), next.getTurnType().getExitOut(), getSpeakableStreetName(currentSegment, next, !suppressDest));
} else if (next.getTurnType().getValue() == TurnType.TU || next.getTurnType().getValue() == TurnType.TRU) {