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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-12-02 19:42:49 +01:00
commit 7368e2b454
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
OsmAnd-java/src/net/osmand/binary/RouteDataObject.java
View file

@ -145,7 +145,7 @@ public class RouteDataObject {
public String getDestinationName(String lang, boolean transliterate, boolean direction){ public String getDestinationName(String lang, boolean transliterate, boolean direction){
//Issue #3289: Treat destination:ref like a destination, not like a ref //Issue #3289: Treat destination:ref like a destination, not like a ref
String destRef = (getDestinationRef(direction) == null) ? "" : getDestinationRef(direction); String destRef = ((getDestinationRef(direction) == null) || getDestinationRef(direction).equals(getRef(direction)) ? "" : getDestinationRef(direction);
String destRef1 = ("".equals(destRef)) ? "" : destRef + ", "; String destRef1 = ("".equals(destRef)) ? "" : destRef + ", ";
if(names != null) { if(names != null) {
@ -188,8 +188,9 @@ public class RouteDataObject {
} }
if(transliterate && destinationDefault != null) { if(transliterate && destinationDefault != null) {
return destRef1 + Junidecode.unidecode(destinationDefault); return destRef1 + Junidecode.unidecode(destinationDefault);
} else if (destinationDefault != null) {
return destRef1 + destinationDefault;
} }
return destRef1 + destinationDefault;
} }
return "".equals(destRef) ? null : destRef; return "".equals(destRef) ? null : destRef;
} }