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

Update search core phrase

Browse source
This commit is contained in:
Victor Shcherb 2016-07-09 12:20:08 +03:00
parent 183b4bc98f
commit d85405b98f
2 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd-java/src/net/osmand/search/example/core/SearchCoreFactory.java
View file

@ -96,9 +96,6 @@ public class SearchCoreFactory {
return p.isLastWord(ObjectType.POI); return p.isLastWord(ObjectType.POI);
} }
public boolean isLastWordRegion(SearchPhrase p) {
return p.isLastWord(ObjectType.REGION);
}
public boolean isNoSelectedType(SearchPhrase p) { public boolean isNoSelectedType(SearchPhrase p) {
return p.isNoSelectedType(); return p.isNoSelectedType();
@ -114,7 +111,8 @@ public class SearchCoreFactory {
} }
// (search streets in neighboor cities for radiusLevel > 2) // (search streets in neighboor cities for radiusLevel > 2)
if (isLastWordPoi(phrase) || isNoSelectedType(phrase) || if (isLastWordPoi(phrase) || isNoSelectedType(phrase) ||
isLastWordRegion(phrase) || phrase.getRadiusLevel() >= 2) { phrase.isLastWord(ObjectType.CITY, ObjectType.VILLAGE, ObjectType.POSTCODE) ||
phrase.isLastWord(ObjectType.REGION) || phrase.getRadiusLevel() >= 2) {
int letters = phrase.getLastWord().length() / 3 + 1; int letters = phrase.getLastWord().length() / 3 + 1;
final boolean locSpecified = false; // phrase.getLastTokenLocation() != null; final boolean locSpecified = false; // phrase.getLastTokenLocation() != null;
LatLon loc = phrase.getLastTokenLocation(); LatLon loc = phrase.getLastTokenLocation();

43
OsmAnd-java/src/net/osmand/search/example/core/SearchPhrase.java
View file

@ -13,7 +13,6 @@ import net.osmand.data.LatLon;
public class SearchPhrase { public class SearchPhrase {
private List<SearchWord> words = new ArrayList<>(); private List<SearchWord> words = new ArrayList<>();
private String text = "";
private String lastWord = ""; private String lastWord = "";
private CollatorStringMatcher sm; private CollatorStringMatcher sm;
private SearchSettings settings; private SearchSettings settings;
@ -50,7 +49,7 @@ public class SearchPhrase {
sp.words.add(sw); sp.words.add(sw);
// sp.text = this.text + sw.getWord() + ", "; // sp.text = this.text + sw.getWord() + ", ";
// TODO FIX // TODO FIX
sp.text = this.text + " " + sw.getWord() + ", "; // sp.text = this.text + " " + sw.getWord() + ", ";
return sp; return sp;
} }
@ -66,18 +65,25 @@ public class SearchPhrase {
return w; return w;
} }
public boolean isLastWord(ObjectType p) {
public boolean isLastWord(ObjectType... p) {
for (int i = words.size() - 1; i >= 0; i--) { for (int i = words.size() - 1; i >= 0; i--) {
SearchWord sw = words.get(i); SearchWord sw = words.get(i);
if (sw.getType() == p) { for(ObjectType o : p) {
if (sw.getType() == o) {
return true; return true;
} else if (sw.getType() != ObjectType.UNKNOWN_NAME_FILTER) { }
}
if (sw.getType() != ObjectType.UNKNOWN_NAME_FILTER) {
return false; return false;
} }
} }
return false; return false;
} }
public StringMatcher getNameStringMatcher() { public StringMatcher getNameStringMatcher() {
if(sm != null) { if(sm != null) {
return sm; return sm;
@ -99,8 +105,15 @@ public class SearchPhrase {
return false; return false;
} }
public String getText() { public String getText(boolean includeLastWord) {
return text; StringBuilder sb = new StringBuilder();
for(SearchWord s : words) {
sb.append(s.getWord()).append(", ");
}
if(includeLastWord) {
sb.append(lastWord);
}
return sb.toString();
} }
public String getStringRerpresentation() { public String getStringRerpresentation() {
@ -146,14 +159,12 @@ public class SearchPhrase {
SearchPhrase sp = new SearchPhrase(settings); SearchPhrase sp = new SearchPhrase(settings);
String atext = text; String atext = text;
List<SearchWord> leftWords = this.words; List<SearchWord> leftWords = this.words;
if (text.startsWith((this.text + this.lastWord).trim())) { String thisTxt = getText(true);
if (text.startsWith(thisTxt)) {
// string is longer // string is longer
atext = text.substring(this.text.length()); atext = text.substring(getText(false).length());
sp.text = this.text;
sp.words = new ArrayList<>(this.words); sp.words = new ArrayList<>(this.words);
leftWords = leftWords.subList(leftWords.size(), leftWords.size()); leftWords = leftWords.subList(leftWords.size(), leftWords.size());
} else {
sp.text = "";
} }
if (!atext.contains(",")) { if (!atext.contains(",")) {
sp.lastWord = atext; sp.lastWord = atext;
@ -172,12 +183,12 @@ public class SearchPhrase {
if(unknown) { if(unknown) {
sp.words.add(new SearchWord(ws[i].trim())); sp.words.add(new SearchWord(ws[i].trim()));
} }
sp.text += ws[i] + ", "; // sp.text += ws[i] + ", ";
}
} }
} }
sp.text = sp.text.trim(); sp.lastWord = ws[ws.length - 1];
}
//sp.text = sp.text.trim();
return sp; return sp;
} }