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

Merge pull request #11463 from osmandapp/transliterate

Browse source 
Fix transliterate
This commit is contained in:
Vitaliy 2021-04-20 11:46:57 +03:00 committed by GitHub
commit cbc4e1a427
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OsmAnd-java/src/main/java/net/osmand/data/MapObject.java
View file

@ -16,13 +16,11 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set;
import java.util.zip.GZIPInputStream; import java.util.zip.GZIPInputStream;
@ -184,9 +182,8 @@ public abstract class MapObject implements Comparable<MapObject> {
if (lang != null && lang.length() > 0) { if (lang != null && lang.length() > 0) {
if (lang.equals("en")) { if (lang.equals("en")) {
// for some objects like wikipedia, english name is stored 'name' tag // for some objects like wikipedia, english name is stored 'name' tag
if (!Algorithms.isEmpty(enName)) { String enName = getEnName(transliterate);
return getEnName(transliterate); return !Algorithms.isEmpty(enName) ? enName : getName();
}
} else { } else {
// get name // get name
if (names != null) { if (names != null) {