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

rvert to original fix, issue was that TestVoiceActivity seems to no call getSpeakablePointName

Browse source
This commit is contained in:
sonora 2014-05-29 13:30:42 +02:00
parent e2444989fa
commit 738c37b8cf
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java
View file

@ -169,7 +169,7 @@ public class TestVoiceActivity extends SherlockActivity {
addButton(ll, "Route recalculated (23150m & 350sec)", builder(p).routeRecalculated(23150, 350));
addButton(ll, "Prepare to turn slighlty left after 850m then bear right", builder(p).prepareTurn(AbstractPrologCommandPlayer.A_LEFT_SL, 850, street(p, "")).then().bearRight(street(p, "")));
addButton(ll, "After 1050m turn sharply left onto 'Hauptstraße'", builder(p).turn(AbstractPrologCommandPlayer.A_LEFT_SH, 1050, street(p, "Hauptstraße")));
addButton(ll, "After 1050m turn sharply left onto 'Hauptstra"+"\u00df"+"e'", builder(p).turn(AbstractPrologCommandPlayer.A_LEFT_SH, 1050, street(p, "Hauptstraße")));
addButton(ll, "Turn left onto 'Main Street'", builder(p).turn(AbstractPrologCommandPlayer.A_LEFT, street(p, "Main Street")));
addButton(ll, "Prepare to turn right after 320m onto 'SR 80'", builder(p).prepareTurn(AbstractPrologCommandPlayer.A_RIGHT, 320, street(p, "SR 80")) );
addButton(ll, "After 370m turn slightly right onto 'F23' 'Main Street'", builder(p).turn(AbstractPrologCommandPlayer.A_RIGHT_SL, 370, street(p, "Main street", "F23")));

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

@ -487,8 +487,7 @@ public class VoiceRouter {
if ((player != null) && (!"de".equals(player.getLanguage()))) {
pn = pn.replace("\u00df", "ss"); // Helps non-German tts voices to pronounce German Strasse (=street)
}
// if ((player != null) && ("en".startsWith(player.getLanguage()))) {
if (player != null) {
if ((player != null) && ("en".startsWith(player.getLanguage()))) {
pn = pn.replace("SR", "S R"); // Avoid SR (as for State Route or Strada Regionale) be pronounced as "Senior" in English tts voice
}
}