From 738c37b8cf76ce65b97a39d35d7047caf223a671 Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 29 May 2014 13:30:42 +0200 Subject: [PATCH] rvert to original fix, issue was that TestVoiceActivity seems to no call getSpeakablePointName --- OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java | 2 +- OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java b/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java index 8020b0207c..4cd11a4114 100644 --- a/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java +++ b/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java @@ -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"))); diff --git a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java index 14c0068d47..1cab9862d8 100644 --- a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java +++ b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java @@ -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 } }