Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-03-01 09:31:19 +01:00
commit 519647d691

View file

@ -99,7 +99,11 @@ public class PointDescription {
@NonNull
public String getSimpleName(Context ctx, boolean addTypeName) {
if (isLocation()) {
return getLocationName(ctx, lat, lon, true).replace('\n', ' ');
if (Algorithms.isEmpty(name) {
return getLocationName(ctx, lat, lon, true).replace('\n', ' ');
} else {
return name;
}
}
if (!Algorithms.isEmpty(typeName)) {
if (Algorithms.isEmpty(name)) {