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

Fix wikipedia layer / search'

Browse source
This commit is contained in:
max-klaus 2020-07-02 12:07:56 +03:00
parent d274649ec7
commit 0c4d3dfd13
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
View file

@ -834,12 +834,19 @@ public class PoiUIFilter implements SearchPoiTypeFilter, Comparable<PoiUIFilter>
if (!poiTypes.isRegisteredType(type)) { if (!poiTypes.isRegisteredType(type)) {
type = poiTypes.getOtherPoiCategory(); type = poiTypes.getOtherPoiCategory();
} }
if (acceptedTypes.containsKey(type)) {
LinkedHashSet<String> acceptedTypesSet = acceptedTypes.get(type); LinkedHashSet<String> acceptedTypesSet = acceptedTypes.get(type);
if (acceptedTypesSet != null && acceptedTypesSet.contains(subtype)) { if (acceptedTypesSet == null || acceptedTypesSet.contains(subtype)) {
return true; return true;
} }
acceptedTypesSet = acceptedTypesOrigin.get(type); }
return acceptedTypesSet != null && acceptedTypesSet.contains(subtype); if (acceptedTypesOrigin.containsKey(type)) {
LinkedHashSet<String> acceptedTypesSet = acceptedTypesOrigin.get(type);
if (acceptedTypesSet == null || acceptedTypesSet.contains(subtype)) {
return true;
}
}
return false;
} }
@Override @Override