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

Rename: EMPTY_SEARCH_POI_TYPE_FILTER -> ACCEPT_ALL_POI_TYPE_FILTER

Browse source
This commit is contained in:
Roman Inflianskas 2016-05-30 09:43:21 +03:00
parent 1cdb28d2fc
commit e7897826ca
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
View file

@ -48,7 +48,6 @@ import net.osmand.data.Building;
import net.osmand.data.City;
import net.osmand.data.MapObject;
import net.osmand.data.Street;
import net.osmand.osm.PoiCategory;
import net.osmand.util.MapUtils;
import com.google.protobuf.CodedOutputStream;
@ -1067,7 +1066,7 @@ public class BinaryInspector {
MapUtils.get31TileNumberY(verbose.lattop),
MapUtils.get31TileNumberY(verbose.latbottom),
verbose.getZoom(),
BinaryMapIndexReader.EMPTY_SEARCH_POI_TYPE_FILTER,
BinaryMapIndexReader.ACCEPT_ALL_POI_TYPE_FILTER,
new ResultMatcher<Amenity>() {
@Override
public boolean publish(Amenity object) {

5
OsmAnd-java/src/net/osmand/binary/BinaryMapIndexReader.java
View file

@ -21,7 +21,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@ -1557,7 +1556,7 @@ public class BinaryMapIndexReader {
public boolean isEmpty();
}
public static final SearchPoiTypeFilter EMPTY_SEARCH_POI_TYPE_FILTER = new SearchPoiTypeFilter() {
public static final SearchPoiTypeFilter ACCEPT_ALL_POI_TYPE_FILTER = new SearchPoiTypeFilter() {
@Override
public boolean accept(PoiCategory type, String subcategory) {
return true;
@ -2159,7 +2158,7 @@ public class BinaryMapIndexReader {
println(" " + poiRegion.subcategories.get(i));
}
SearchRequest<Amenity> req = buildSearchPoiRequest(sleft, sright, stop, sbottom, -1, EMPTY_SEARCH_POI_TYPE_FILTER, null);
SearchRequest<Amenity> req = buildSearchPoiRequest(sleft, sright, stop, sbottom, -1, ACCEPT_ALL_POI_TYPE_FILTER, null);
List<Amenity> results = reader.searchPoi(req);
for (Amenity a : results) {
println(a.getType() + " " + a.getSubType() + " " + a.getName() + " " + a.getLocation());