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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2014-02-23 14:21:03 +01:00
commit a6e06bdeec
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,12 +57,11 @@ public class BinaryInspector {
if(args.length == 1 && "test".equals(args[0])) { if(args.length == 1 && "test".equals(args[0])) {
in.inspector(new String[]{ in.inspector(new String[]{
//"-vpoi", //"-vpoi",
//"-vmap", "-vmapobjects", // "-vmap", "-vmapobjects",
//"-vaddress", "-vcities", "-vstreets", "-vstreetgroups","-vbuildings", // "-vaddress", "-vcities", "-vstreets", "-vstreetgroups","-vbuildings",
//"-zoom=16", //"-zoom=16",
//"-bbox=4,55,7,50", //"-bbox=4,55,7,50",
//"/home/victor/osmand/Test.obf" // "/home/victor/projects/osmand/osm-gen/Test.obf"
//"/home/victor/projects/osmand/osm-gen/Map.obf"
}); });
} else { } else {
in.inspector(args); in.inspector(args);

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

@ -520,6 +520,8 @@ public class MapRenderingTypes {
rt.applyToTagValue.addAll(mapRulType.applyToTagValue); rt.applyToTagValue.addAll(mapRulType.applyToTagValue);
mapRulType.applyToTagValue.add(rt.tagValuePattern); mapRulType.applyToTagValue.add(rt.tagValuePattern);
} }
} else {
mapRulType.applyToTagValue = null;
} }
if(rt.isMain()) { if(rt.isMain()) {
mapRulType.main = true; mapRulType.main = true;