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

Fix search bank abcd

Browse source
This commit is contained in:
crimean 2018-12-05 12:05:17 +03:00
parent 6ac823bb9c
commit 4c2cfb9c97
5 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -124,6 +124,9 @@ public class CollatorStringMatcher implements StringMatcher {
public static boolean cstartsWith(Collator collator, String searchInParam, String theStart, public static boolean cstartsWith(Collator collator, String searchInParam, String theStart,
boolean checkBeginning, boolean checkSpaces, boolean equals, boolean trim) { boolean checkBeginning, boolean checkSpaces, boolean equals, boolean trim) {
String searchIn = searchInParam.toLowerCase(Locale.getDefault()); String searchIn = searchInParam.toLowerCase(Locale.getDefault());
if (trim && searchIn.length() > 0) {
searchIn += " ";
}
int searchInLength = searchIn.length(); int searchInLength = searchIn.length();
if (trim && searchInLength > 0 && theStart.length() > searchInLength) { if (trim && searchInLength > 0 && theStart.length() > searchInLength) {
theStart = theStart.substring(0, searchInLength); theStart = theStart.substring(0, searchInLength);

2
OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java
View file

@ -500,7 +500,7 @@ public class SearchUICore {
} }
currentSearchResult = collection; currentSearchResult = collection;
if (phrase.getSettings().isExportObjects()) { if (phrase.getSettings().isExportObjects()) {
rm.createTestJSON(collection); //rm.createTestJSON(collection);
} }
rm.searchFinished(phrase); rm.searchFinished(phrase);
if (onResultsComplete != null) { if (onResultsComplete != null) {

9
OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java
View file

@ -662,8 +662,13 @@ public class SearchCoreFactory {
categories = types.getCategories(false); categories = types.getCategories(false);
} }
List<AbstractPoiType> results = new ArrayList<AbstractPoiType>(); List<AbstractPoiType> results = new ArrayList<AbstractPoiType>();
NameStringMatcher nm = NameStringMatcher nm;
new NameStringMatcher(phrase.getUnknownSearchPhrase(), StringMatcherMode.CHECK_STARTS_FROM_SPACE); String unknownSearchPhrase = phrase.getUnknownSearchPhrase();
if (phrase.getUnknownSearchWord().length() < unknownSearchPhrase.length()) {
nm = new NameStringMatcher(unknownSearchPhrase, StringMatcherMode.CHECK_ONLY_STARTS_WITH_TRIM);
} else {
nm = new NameStringMatcher(unknownSearchPhrase, StringMatcherMode.CHECK_STARTS_FROM_SPACE);
}
for (AbstractPoiType pf : topVisibleFilters) { for (AbstractPoiType pf : topVisibleFilters) {
if (!phrase.isUnknownSearchWordPresent() if (!phrase.isUnknownSearchWordPresent()
|| nm.matches(pf.getTranslation()) || nm.matches(pf.getTranslation())

5
OsmAnd-java/src/main/java/net/osmand/search/core/SearchExportSettings.java
View file

@ -9,6 +9,11 @@ public class SearchExportSettings {
exportBuildings = true; exportBuildings = true;
} }
public SearchExportSettings(boolean exportEmptyCities, boolean exportBuildings) {
this.exportEmptyCities = exportEmptyCities;
this.exportBuildings = exportBuildings;
}
public boolean isExportEmptyCities() { public boolean isExportEmptyCities() {
return exportEmptyCities; return exportEmptyCities;
} }

1
OsmAnd-java/src/main/java/net/osmand/search/core/SearchSettings.java
View file

@ -24,6 +24,7 @@ public class SearchSettings {
private boolean emptyQueryAllowed; private boolean emptyQueryAllowed;
private boolean sortByName; private boolean sortByName;
private SearchExportSettings exportSettings; private SearchExportSettings exportSettings;
//private SearchExportSettings exportSettings = new SearchExportSettings(false, false);
public SearchSettings(SearchSettings s) { public SearchSettings(SearchSettings s) {
if(s != null) { if(s != null) {