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

Fix postcode search

Browse source
This commit is contained in:
Alexey Kulish 2017-03-24 10:13:37 +03:00
parent dd50a56e60
commit aa35c8366a
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -170,6 +170,8 @@ public class SearchCoreFactory {
public static class SearchPostcodeAPI extends SearchBaseAPI { public static class SearchPostcodeAPI extends SearchBaseAPI {
private static final int LIMIT = 10000;
@Override @Override
public boolean search(final SearchPhrase phrase, final SearchResultMatcher resultMatcher) throws IOException { public boolean search(final SearchPhrase phrase, final SearchResultMatcher resultMatcher) throws IOException {
if (!phrase.isUnknownSearchWordPresent()) { if (!phrase.isUnknownSearchWordPresent()) {
@ -185,7 +187,9 @@ public class SearchCoreFactory {
SearchRequest<City> req = BinaryMapIndexReader.buildAddressRequest(new ResultMatcher<City>() { SearchRequest<City> req = BinaryMapIndexReader.buildAddressRequest(new ResultMatcher<City>() {
@Override @Override
public boolean publish(City object) { public boolean publish(City object) {
return object.isPostcode() && nm.matches(object.getPostcode()); return object.isPostcode()
&& !Algorithms.isEmpty(object.getName())
&& nm.matches(object.getName());
} }
@Override @Override
@ -194,8 +198,10 @@ public class SearchCoreFactory {
} }
}); });
List<City> l = r.getCities(req, BinaryMapAddressReaderAdapter.POSTCODES_TYPE); List<City> l = r.getCities(req, BinaryMapAddressReaderAdapter.POSTCODES_TYPE);
int limit = 0;
for (City c : l) { for (City c : l) {
LatLon cl = c.getLocation(); LatLon cl = c.getLocation();
c.setReferenceFile(r);
int y = MapUtils.get31TileNumberY(cl.getLatitude()); int y = MapUtils.get31TileNumberY(cl.getLatitude());
int x = MapUtils.get31TileNumberX(cl.getLongitude()); int x = MapUtils.get31TileNumberX(cl.getLongitude());
if (postcodeBbox.contains(x, y, x, y)) { if (postcodeBbox.contains(x, y, x, y)) {
@ -211,6 +217,10 @@ public class SearchCoreFactory {
res.priorityDistance = 0.1; res.priorityDistance = 0.1;
res.objectType = ObjectType.POSTCODE; res.objectType = ObjectType.POSTCODE;
resultMatcher.publish(res); resultMatcher.publish(res);
if (limit++ > LIMIT * phrase.getRadiusLevel()) {
break;
}
} }
} }
} }