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

small refactor

Browse source
This commit is contained in:
veliymolfar 2020-06-18 13:38:24 +03:00
parent 05ffbdffaa
commit 18074b0dfc
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapPoiReaderAdapter.java
View file

@ -715,10 +715,6 @@ public class BinaryMapPoiReaderAdapter {
am.setRoutePoint(arp);
}
}
PoiType poiType = poiTypes.getPoiTypeByKeyInCategory(am.getType(), am.getSubType());
if (poiType != null && poiType.isForbidden()) {
return null;
}
return am;
case OsmandOdb.OsmAndPoiBoxDataAtom.DX_FIELD_NUMBER:
x = (codedIS.readSInt32() + (px << (24 - zoom))) << 7;
@ -774,6 +770,10 @@ public class BinaryMapPoiReaderAdapter {
}
}
subtype = poiTypes.replaceDeprecatedSubtype(type, subtype);
PoiType poiType = poiTypes.getPoiTypeByKeyInCategory(type, subtype);
if (poiType != null && poiType.isForbidden()) {
return null;
}
if (req.poiTypeFilter == null || req.poiTypeFilter.accept(type, subtype)) {
if (amenityType == null) {
amenityType = type;