From c9c0d08d5489c9d3393b3fb8815fedf08f42a85d Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Mon, 28 Sep 2015 00:07:27 +0200 Subject: [PATCH] Fix #1737 --- .../src/net/osmand/binary/BinaryInspector.java | 8 ++++---- OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java | 15 ++++++++------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java index 869b83fc04..4fad96be36 100644 --- a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java +++ b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java @@ -66,17 +66,17 @@ public class BinaryInspector { // test cases show info if(args.length == 1 && "test".equals(args[0])) { in.inspector(new String[]{ -// "-vpoi", + "-vpoi", // "-vmap", "-vmapobjects", // "-vmapcoordinates", // "-vrouting", - "-vaddress", "-vcities",//"-vstreetgroups", +// "-vaddress", "-vcities",//"-vstreetgroups", // "-vstreets", "-vbuildings", "-vintersections", // "-zoom=15", // "-bbox=1.74,51.17,1.75,51.16", // "-vstats", // "/Users/victorshcherb/osmand/maps/Synthetic_test_rendering.obf" - "/Users/victorshcherb/osmand/maps/Netherlands_gelderland_europe_2.obf" -// "/Users/victorshcherb/osmand/temp/Czech-republic_jihovychod_europe_2.road.obf" +// "/Users/victorshcherb/osmand/maps/Netherlands_europe_2.road.obf" + "/Users/victorshcherb/osmand/maps/Map.obf" }); } else { in.inspector(args); diff --git a/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java b/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java index 61a2a00de3..6fd47ea11e 100644 --- a/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java +++ b/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java @@ -584,15 +584,16 @@ public class MapPoiTypes { } public boolean isTextAdditionalInfo(String key, String value) { - if(key.startsWith("name:") || key.equals("name")) { + if (key.startsWith("name:") || key.equals("name")) { return true; } - initPoiTypesByTag(); - PoiType pat = poiTypesByTag.get(key+"/"+value); - if(pat == null) { - pat = poiTypesByTag.get(key); - } - if(pat == null) { + PoiType pat = (PoiType) getAnyPoiAdditionalTypeByKey(key); +// initPoiTypesByTag(); +// PoiType pat = poiTypesByTag.get(key + "/" + value); +// if (pat == null) { +// pat = poiTypesByTag.get(key); +// } + if (pat == null) { return true; } else { return pat.isText();