Fix rendering types issue

This commit is contained in:
Victor Shcherb 2015-01-08 00:19:54 +01:00
parent 38407ae763
commit e1300b9df7
2 changed files with 5 additions and 5 deletions

View file

@ -60,12 +60,12 @@ public class BinaryInspector {
// test cases show info // test cases show info
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",
// "-vrouting", // "-vrouting",
// "-vaddress", "-vcities", "-vstreets", "-vstreetgroups","-vbuildings", // "-vaddress", "-vcities", "-vstreets", "-vstreetgroups","-vbuildings",
//"-zoom=16", //"-zoom=16",
//"-bbox=4,55,7,50", // "-bbox=1.74,51.17,1.75,51.16",
"/home/victor/projects/osmand/osm-gen/Map.obf" "/home/victor/projects/osmand/osm-gen/Map.obf"
}); });
} else { } else {
@ -727,7 +727,7 @@ public class BinaryInspector {
for(int i=0; i<obj.getPointsLength(); i++) { for(int i=0; i<obj.getPointsLength(); i++) {
float x = (float) MapUtils.get31LongitudeX(obj.getPoint31XTile(i)); float x = (float) MapUtils.get31LongitudeX(obj.getPoint31XTile(i));
float y = (float) MapUtils.get31LatitudeY(obj.getPoint31YTile(i)); float y = (float) MapUtils.get31LatitudeY(obj.getPoint31YTile(i));
b.append(x).append(" / ").append(y).append(" , "); b.append(y).append(" / ").append(x).append(" , ");
} }
} }

View file

@ -582,7 +582,7 @@ public class MapRenderingTypes {
rt.applyToTagValue = null; rt.applyToTagValue = null;
} else { } else {
rt.applyToTagValue.addAll(mapRulType.applyToTagValue); rt.applyToTagValue.addAll(mapRulType.applyToTagValue);
mapRulType.applyToTagValue.add(rt.tagValuePattern); mapRulType.applyToTagValue.addAll(rt.applyToTagValue);
} }
} else { } else {
mapRulType.applyToTagValue = null; mapRulType.applyToTagValue = null;