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

Further fixes

Browse source
This commit is contained in:
PaulStets 2017-09-14 17:57:12 +03:00
parent 8578b16842
commit 77c91467ca
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
OsmAnd-java/src/net/osmand/binary/BinaryMapIndexReader.java
View file

@ -404,16 +404,12 @@ public class BinaryMapIndexReader {
rg.add(file.getName());
}
String ls = rg.get(0);
// .replaceAll("[0-9]+", "").trim()
if (ls.lastIndexOf('_') != -1) {
if (ls.matches("[A-Za-z-_]+")) {
if (!ls.endsWith(".obf")) {
return ls.substring(0, ls.lastIndexOf('_')).replace('_', ' ');
} else if (ls.matches("([a-zA-Z_-]){3}([0-9]+_*){3}[.a-z]+")) {
String[] words = ls.split("_");
return words[0] + " " + words[1];
} else if (ls.matches("([a-zA-Z_-]){2}([0-9]+_*){3}[.a-z]+")) {
String[] words = ls.split("_");
return words[0];
} else {
String res = ls.substring(0, (ls.length() - 13));
return res.substring(0, res.lastIndexOf('_')).replace('_', ' ');
}
}