Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-03-01 11:37:46 +01:00
commit dede8a4450

View file

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