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

Fix #9187 - add test

Browse source
This commit is contained in:
Victor Shcherb 2020-06-09 19:09:45 +02:00
parent f5cdb9077f
commit 40fd5667e5
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
OsmAnd-java/src/main/java/net/osmand/CollatorStringMatcher.java
View file

@ -33,8 +33,9 @@ public class CollatorStringMatcher implements StringMatcher {
public CollatorStringMatcher(String part, StringMatcherMode mode) { public CollatorStringMatcher(String part, StringMatcherMode mode) {
this.collator = OsmAndCollator.primaryCollator(); this.collator = OsmAndCollator.primaryCollator();
this.part = part.toLowerCase(Locale.getDefault()); this.part = simplifyStringAndAlignChars(part);
this.mode = mode; this.mode = mode;
} }
public Collator getCollator() { public Collator getCollator() {
@ -123,14 +124,15 @@ public class CollatorStringMatcher implements StringMatcher {
* @param theStart * @param theStart
* @return true if searchIn starts with token * @return true if searchIn starts with token
*/ */
public static boolean cstartsWith(Collator collator, String fullText, String theStart, public static boolean cstartsWith(Collator collator, String fullTextP, String theStart,
boolean checkBeginning, boolean checkSpaces, boolean equals) { boolean checkBeginning, boolean checkSpaces, boolean equals) {
String searchIn = fullText.toLowerCase(Locale.getDefault()); String searchIn = simplifyStringAndAlignChars(fullTextP);
int searchInLength = searchIn.length(); int searchInLength = searchIn.length();
int startLength = theStart.length(); int startLength = theStart.length();
if (startLength == 0) { if (startLength == 0) {
return true; return true;
} }
// this is not correct because of Auhofstrasse != Auhofstraße
if (startLength > searchInLength) { if (startLength > searchInLength) {
return false; return false;
} }
@ -152,7 +154,8 @@ public class CollatorStringMatcher implements StringMatcher {
if (isSpace(searchIn.charAt(i - 1)) && !isSpace(searchIn.charAt(i))) { if (isSpace(searchIn.charAt(i - 1)) && !isSpace(searchIn.charAt(i))) {
if (collator.equals(searchIn.substring(i, i + startLength), theStart)) { if (collator.equals(searchIn.substring(i, i + startLength), theStart)) {
if(equals) { if(equals) {
if(i + startLength == searchInLength || isSpace(searchIn.charAt(i + startLength))) { if(i + startLength == searchInLength ||
isSpace(searchIn.charAt(i + startLength))) {
return true; return true;
} }
} else { } else {
@ -168,7 +171,17 @@ public class CollatorStringMatcher implements StringMatcher {
return false; return false;
} }
private static String simplifyStringAndAlignChars(String fullText) {
int i;
fullText = fullText.toLowerCase(Locale.getDefault());
while( (i = fullText.indexOf('ß') ) != -1 ) {
fullText = fullText.substring(0, i) + "ss" + fullText.substring(i+1);
}
return fullText;
}
private static boolean isSpace(char c){ private static boolean isSpace(char c){
return !Character.isLetter(c) && !Character.isDigit(c); return !Character.isLetter(c) && !Character.isDigit(c);
} }
} }

1
OsmAnd-java/src/main/java/net/osmand/OsmAndCollator.java
View file

@ -38,4 +38,5 @@ public class OsmAndCollator {
} }
}; };
} }
} }