avoid repeating the same ref
This commit is contained in:
parent
4670bd4a65
commit
a12dd24cf8
1 changed files with 3 additions and 2 deletions
|
@ -145,7 +145,7 @@ public class RouteDataObject {
|
|||
|
||||
public String getDestinationName(String lang, boolean transliterate, boolean direction){
|
||||
//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 + ", ";
|
||||
|
||||
if(names != null) {
|
||||
|
@ -188,9 +188,10 @@ public class RouteDataObject {
|
|||
}
|
||||
if(transliterate && destinationDefault != null) {
|
||||
return destRef1 + Junidecode.unidecode(destinationDefault);
|
||||
}
|
||||
} else if (destinationDefault != null) {
|
||||
return destRef1 + destinationDefault;
|
||||
}
|
||||
}
|
||||
return "".equals(destRef) ? null : destRef;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue