Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix relation tags

Browse source
This commit is contained in:
Victor Shcherb 2015-10-15 01:38:19 +02:00
parent 1ba490179c
commit 284f709087
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
View file

@ -74,9 +74,9 @@ public class BinaryInspector {
// "-zoom=15", // "-zoom=15",
// "-bbox=1.74,51.17,1.75,51.16", // "-bbox=1.74,51.17,1.75,51.16",
// "-vstats", // "-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/Netherlands_europe_2.road.obf"
// "/Users/victorshcherb/osmand/maps/Map.obf" "/Users/victorshcherb/osmand/maps/Map.obf"
}); });
} else { } else {
in.inspector(args); in.inspector(args);

6
OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java
View file

@ -153,15 +153,15 @@ public abstract class MapRenderingTypes {
return a; return a;
} }
protected MapRulType getRuleType(String tag, String val, boolean poi) { protected MapRulType getRuleType(String tag, String val, boolean poi, boolean map) {
Map<String, MapRulType> types = getEncodingRuleTypes(); Map<String, MapRulType> types = getEncodingRuleTypes();
tag = lc(tag); tag = lc(tag);
val = lc(val); val = lc(val);
MapRulType rType = types.get(constructRuleKey(tag, 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)); 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; return null;
} else if(rType.isAdditional() && rType.tagValuePattern.value == null) { } else if(rType.isAdditional() && rType.tagValuePattern.value == null) {
MapRulType parent = rType; MapRulType parent = rType;