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 9bff39dcb1..e273fa4e7f 100644 --- a/OsmAnd-java/src/main/java/net/osmand/osm/MapPoiTypes.java +++ b/OsmAnd-java/src/main/java/net/osmand/osm/MapPoiTypes.java @@ -205,20 +205,6 @@ public class MapPoiTypes { if (pt != null && !pt.isReference()) { return pt; } - if (pc.isWiki() && name.startsWith(WIKI_LANG)) { - return getPoiTypeForWiki(pc, name); - } - } - return null; - } - - public AbstractPoiType getPoiTypeForWiki(PoiCategory osmwiki, String name) { - for (PoiType pt : osmwiki.getPoiTypes()) { - for (PoiType wikiLangPt : pt.getPoiAdditionals()) { - if (wikiLangPt != null && Algorithms.objectEquals(wikiLangPt.getOsmTag(), name)) { - return wikiLangPt; - } - } } return null; } diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchHelper.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchHelper.java index 55da1967d0..1213f550c1 100644 --- a/OsmAnd/src/net/osmand/plus/search/QuickSearchHelper.java +++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchHelper.java @@ -436,7 +436,12 @@ public class QuickSearchHelper implements ResourceListener { SearchResult sr = new SearchResult(phrase); PointDescription pd = point.getName(); if (pd.isPoiType()) { - AbstractPoiType pt = MapPoiTypes.getDefault().getAnyPoiTypeByKey(pd.getName()); + String name = pd.getName(); + MapPoiTypes mapPoiTypes = MapPoiTypes.getDefault(); + AbstractPoiType pt = mapPoiTypes.getAnyPoiTypeByKey(name); + if (pt == null) { + pt = mapPoiTypes.getAnyPoiAdditionalTypeByKey(name); + } if (pt != null) { sr.localeName = pt.getTranslation(); sr.object = pt;