Fix wikipedia layer / search'

This commit is contained in:
max-klaus 2020-07-02 12:07:56 +03:00
parent d274649ec7
commit 0c4d3dfd13

View file

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