diff --git a/OsmAnd-java/src/main/java/net/osmand/osm/MapPoiTypes.java b/OsmAnd-java/src/main/java/net/osmand/osm/MapPoiTypes.java index 9e769098df1..5ad79229d19 100644 --- a/OsmAnd-java/src/main/java/net/osmand/osm/MapPoiTypes.java +++ b/OsmAnd-java/src/main/java/net/osmand/osm/MapPoiTypes.java @@ -31,7 +31,7 @@ public class MapPoiTypes { - private static final String OTHER_MAP_CATEGORY = "Other"; + public static final String OTHER_MAP_CATEGORY = "Other"; private static MapPoiTypes DEFAULT_INSTANCE = null; private static final Log log = PlatformUtil.getLog(MapRenderingTypes.class); private String resourceName; @@ -971,11 +971,7 @@ public String replaceDeprecatedSubtype(PoiCategory type, String subtype) { } public Amenity parseAmenity(String tag, String val, boolean relation, Map otherTags) { - initPoiTypesByTag(); - PoiType pt = poiTypesByTag.get(tag + "/" + val); - if (pt == null) { - pt = poiTypesByTag.get(tag); - } + PoiType pt = getPoiTypeByTagValue(tag, val); if (pt == null || pt.isAdditional()) { return null; } @@ -1033,6 +1029,16 @@ public Amenity parseAmenity(String tag, String val, boolean relation, Map