From 3e17352d3ed50466c1bd8543b4b47c8a40ef037a Mon Sep 17 00:00:00 2001 From: veliymolfar Date: Mon, 13 Jan 2020 17:24:51 +0200 Subject: [PATCH] commented speakable exit --- .../net/osmand/plus/routing/VoiceRouter.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java index 80a2945f88..2fe3b9aef0 100644 --- a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java +++ b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java @@ -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) {