From 284f7090878b11d2984b03b27710d8dbb391360a Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Thu, 15 Oct 2015 01:38:19 +0200 Subject: [PATCH] Fix relation tags --- OsmAnd-java/src/net/osmand/binary/BinaryInspector.java | 4 ++-- OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java index ee9d1d6415..c14c61b8f4 100644 --- a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java +++ b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java @@ -74,9 +74,9 @@ public class BinaryInspector { // "-zoom=15", // "-bbox=1.74,51.17,1.75,51.16", // "-vstats", - "/Users/victorshcherb/osmand/maps/Synthetic_test_rendering.obf" +// "/Users/victorshcherb/osmand/maps/Synthetic_test_rendering.obf" // "/Users/victorshcherb/osmand/maps/Netherlands_europe_2.road.obf" -// "/Users/victorshcherb/osmand/maps/Map.obf" + "/Users/victorshcherb/osmand/maps/Map.obf" }); } else { in.inspector(args); diff --git a/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java b/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java index af7c3751d0..1090a20138 100644 --- a/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java +++ b/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java @@ -153,15 +153,15 @@ public abstract class MapRenderingTypes { return a; } - protected MapRulType getRuleType(String tag, String val, boolean poi) { + protected MapRulType getRuleType(String tag, String val, boolean poi, boolean map) { Map types = getEncodingRuleTypes(); tag = lc(tag); val = lc(val); MapRulType rType = types.get(constructRuleKey(tag, val)); - if (rType == null || (!rType.isPOI() && poi) || (!rType.isMap() && !poi)) { + if (rType == null || (!rType.isPOI() && poi) || (!rType.isMap() && map)) { rType = types.get(constructRuleKey(tag, null)); } - if(rType == null || (!rType.isPOI() && poi) || (!rType.isMap() && !poi)) { + if(rType == null || (!rType.isPOI() && poi) || (!rType.isMap() && map)) { return null; } else if(rType.isAdditional() && rType.tagValuePattern.value == null) { MapRulType parent = rType;