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

Merge pull request #6026 from osmandapp/js_voice_routing

Browse source 
Fixed #5969
This commit is contained in:
vshcherb 2018-09-11 11:00:35 +02:00 committed by GitHub
commit 7f0c9bf45f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -259,7 +259,7 @@ public class VoiceRouter {
double[] dist = new double[1];
makeSound();
String text = getText(location, points, dist);
p.goAhead(dist[0], null).andArriveAtWayPoint(text).play();
p.goAhead(dist[0], new StreetName()).andArriveAtWayPoint(text).play();
}
public void approachFavorite(Location location, List<LocationPointWrapper> points) {
@ -271,7 +271,7 @@ public class VoiceRouter {
double[] dist = new double[1];
makeSound();
String text = getText(location, points, dist);
p.goAhead(dist[0], null).andArriveAtFavorite(text).play();
p.goAhead(dist[0], new StreetName()).andArriveAtFavorite(text).play();
}
public void approachPoi(Location location, List<LocationPointWrapper> points) {
@ -283,7 +283,7 @@ public class VoiceRouter {
notifyOnVoiceMessage();
double[] dist = new double[1];
String text = getText(location, points, dist);
p.goAhead(dist[0], null).andArriveAtPoi(text).play();
p.goAhead(dist[0], new StreetName()).andArriveAtPoi(text).play();
}
public void announceWaypoint(List<LocationPointWrapper> points) {
@ -721,7 +721,7 @@ public class VoiceRouter {
private void playAndArriveAtDestination(NextDirectionInfo info) {
if (isTargetPoint(info)) {
String pointName = info == null ? "" : info.pointName;
String pointName = (info == null || info.pointName == null) ? "" : info.pointName;
CommandBuilder play = getNewCommandPlayerToPlay();
if (play != null) {
notifyOnVoiceMessage();