Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
267a560c98
1 changed files with 3 additions and 1 deletions
|
@ -287,7 +287,9 @@ public class SearchCoreFactory {
|
||||||
if (phrase.isNoSelectedType() && bbox != null
|
if (phrase.isNoSelectedType() && bbox != null
|
||||||
&& (phrase.isUnknownSearchWordPresent() || phrase.isEmptyQueryAllowed())
|
&& (phrase.isUnknownSearchWordPresent() || phrase.isEmptyQueryAllowed())
|
||||||
&& phrase.isSearchTypeAllowed(ObjectType.CITY)) {
|
&& phrase.isSearchTypeAllowed(ObjectType.CITY)) {
|
||||||
NameStringMatcher nm = phrase.getNameStringMatcher();
|
String wrd = phrase.getUnknownWordToSearch();
|
||||||
|
NameStringMatcher nm = phrase.getNameStringMatcher(wrd, phrase.isUnknownSearchWordComplete());
|
||||||
|
// NameStringMatcher nm = phrase.getNameStringMatcher();
|
||||||
resArray.clear();
|
resArray.clear();
|
||||||
resArray = townCitiesQR.queryInBox(bbox, resArray);
|
resArray = townCitiesQR.queryInBox(bbox, resArray);
|
||||||
int limit = 0;
|
int limit = 0;
|
||||||
|
|
Loading…
Reference in a new issue