diff --git a/OsmAnd/src/com/osmand/activities/VoiceRouter.java b/OsmAnd/src/com/osmand/activities/VoiceRouter.java index f35736b831..aa4ed839ba 100644 --- a/OsmAnd/src/com/osmand/activities/VoiceRouter.java +++ b/OsmAnd/src/com/osmand/activities/VoiceRouter.java @@ -149,7 +149,7 @@ public class VoiceRouter { if (tParam != null) { play.turn(tParam, dist); } else if (next.turnType.isRoundAbout()) { - play.roundAbout(dist, next.turnType.getExitOut()); + play.roundAbout(dist, next.turnType.getTurnAngle(), next.turnType.getExitOut()); } else if (next.turnType.getValue().equals(TurnType.TU)) { play.makeUT(dist); } else { diff --git a/OsmAnd/voice/en/_config.p b/OsmAnd/voice/en/_config.p index 38e6448fe8..b32f853e4b 100644 --- a/OsmAnd/voice/en/_config.p +++ b/OsmAnd/voice/en/_config.p @@ -7,7 +7,7 @@ preamble - []. %% TURNS -turn('left', ['turn.ogg', 'left-e.ogg']). +turn('left', ['turn.ogg', 'left-e.ogg']). turn('left_sh', ['sharp_left-e.ogg']). turn('left_sl', ['turn.ogg', 'left-e.ogg']). turn('right', ['turn.ogg', 'right-e.ogg']). @@ -16,7 +16,7 @@ turn('right_sl', ['turn.ogg', 'right-e.ogg']). prepare_turn(Turn, Dist) == ['Prepare_to-a.ogg', 'after-m.ogg', delay_450, D, delay_450, M] :- distance(Dist) == D, turn(Turn, M). -turn(Turn, Dist) == ['after-m.ogg', delay_450, D, delay_450, M] :- +turn(Turn, Dist) == ['after-m.ogg', delay_250, D, delay_250, M] :- distance(Dist) == D, turn(Turn, M). turn(Turn) == M :- turn(Turn, M). diff --git a/OsmAnd/voice/ru/_config.p b/OsmAnd/voice/ru/_config.p index 3922cc605c..3f4931d45a 100644 --- a/OsmAnd/voice/ru/_config.p +++ b/OsmAnd/voice/ru/_config.p @@ -14,9 +14,9 @@ turn('right', ['turn.ogg', delay_350, 'right.ogg']). turn('right_sh', ['turn_sharply.ogg', delay_350,'right.ogg']). turn('right_sl', ['turn_slightly_right.ogg']). -prepare_turn(Turn, Dist) == ['Prepare_to.ogg', 'in.ogg', delay_450, D, delay_450, M] :- +prepare_turn(Turn, Dist) == ['Prepare_to.ogg', 'in.ogg', delay_300, D, delay_300, M] :- distance(Dist) == D, turn(Turn, M). -turn(Turn, Dist) == ['in.ogg', delay_450, D, delay_450, M] :- +turn(Turn, Dist) == ['in.ogg', delay_250, D, delay_250, M] :- distance(Dist) == D, turn(Turn, M). turn(Turn) == M :- turn(Turn, M). diff --git a/OsmAnd/voice/ru_2/_config.p b/OsmAnd/voice/ru_2/_config.p index 314b280d69..1efd3002ea 100644 --- a/OsmAnd/voice/ru_2/_config.p +++ b/OsmAnd/voice/ru_2/_config.p @@ -14,9 +14,9 @@ turn('right', ['turn_right-e.ogg']). turn('right_sh', ['turn_sharp_right-e.ogg']). turn('right_sl', ['turn_slightly_right-e.ogg']). -prepare_turn(Turn, Dist) == ['Prepare_to.ogg', 'after-m.ogg', delay_450, D, delay_450, M] :- +prepare_turn(Turn, Dist) == ['Prepare_to.ogg', 'after-m.ogg', delay_300, D, delay_300, M] :- distance(Dist) == D, turn(Turn, M). -turn(Turn, Dist) == ['after-m.ogg', delay_450, D, delay_450, M] :- +turn(Turn, Dist) == ['after-m.ogg', delay_300, D, delay_300, M] :- distance(Dist) == D, turn(Turn, M). turn(Turn) == M :- turn(Turn, M). @@ -31,7 +31,7 @@ make_ut(Dist) == ['after-m.ogg', delay_300, D, delay_300, 'turn_back-e.ogg'] :- distance(Dist) == D. make_ut == ['turn_back-e.ogg']. -roundabout(Dist, _Angle, Exit) == ['after-m.ogg', delay_300, D, delay_300, 'enter_the_roundabout-e.ogg', delay_250, 'after-m.ogg', +roundabout(Dist, _Angle, Exit) == ['after-m.ogg', delay_300, D, delay_300, 'enter_the_roundabout-e.ogg', delay_250, 'and_take_the.ogg', delay_250, E, 'exit-e.ogg'] :- distance(Dist) == D, nth(Exit, E). roundabout(_Angle, Exit) == ['taking_the.ogg', delay_250, E, 'exit-e.ogg'] :- nth(Exit, E).