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

bugfix and voice information

Browse source 
git-svn-id: https://osmand.googlecode.com/svn/trunk@354 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
Victor Shcherb 2010-07-15 12:58:05 +00:00
parent c544494fa3
commit 75417448ad
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/com/osmand/activities/VoiceRouter.java
View file

@ -149,7 +149,7 @@ public class VoiceRouter {
if (tParam != null) { if (tParam != null) {
play.turn(tParam, dist); play.turn(tParam, dist);
} else if (next.turnType.isRoundAbout()) { } 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)) { } else if (next.turnType.getValue().equals(TurnType.TU)) {
play.makeUT(dist); play.makeUT(dist);
} else { } else {

4
OsmAnd/voice/en/_config.p
View file

@ -7,7 +7,7 @@ preamble - [].
%% TURNS %% TURNS
turn('left', ['turn.ogg', 'left-e.ogg']). turn('left', ['turn.ogg', 'left-e.ogg']).
turn('left_sh', ['sharp_left-e.ogg']). turn('left_sh', ['sharp_left-e.ogg']).
turn('left_sl', ['turn.ogg', 'left-e.ogg']). turn('left_sl', ['turn.ogg', 'left-e.ogg']).
turn('right', ['turn.ogg', 'right-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] :- prepare_turn(Turn, Dist) == ['Prepare_to-a.ogg', 'after-m.ogg', delay_450, D, delay_450, M] :-
distance(Dist) == D, turn(Turn, 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). distance(Dist) == D, turn(Turn, M).
turn(Turn) == M :- turn(Turn, M). turn(Turn) == M :- turn(Turn, M).

4
OsmAnd/voice/ru/_config.p
View file

@ -14,9 +14,9 @@ turn('right', ['turn.ogg', delay_350, 'right.ogg']).
turn('right_sh', ['turn_sharply.ogg', delay_350,'right.ogg']). turn('right_sh', ['turn_sharply.ogg', delay_350,'right.ogg']).
turn('right_sl', ['turn_slightly_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). 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). distance(Dist) == D, turn(Turn, M).
turn(Turn) == M :- turn(Turn, M). turn(Turn) == M :- turn(Turn, M).

6
OsmAnd/voice/ru_2/_config.p
View file

@ -14,9 +14,9 @@ turn('right', ['turn_right-e.ogg']).
turn('right_sh', ['turn_sharp_right-e.ogg']). turn('right_sh', ['turn_sharp_right-e.ogg']).
turn('right_sl', ['turn_slightly_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). 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). distance(Dist) == D, turn(Turn, M).
turn(Turn) == M :- 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. distance(Dist) == D.
make_ut == ['turn_back-e.ogg']. 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). 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). roundabout(_Angle, Exit) == ['taking_the.ogg', delay_250, E, 'exit-e.ogg'] :- nth(Exit, E).