Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-09-08 23:15:24 +02:00
commit 990d158b3e

View file

@ -67,16 +67,15 @@ 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", // "-vmapcoordinates", // "-vmap", "-vmapobjects", // "-vmapcoordinates",
// "-vrouting", // "-vrouting",
// "-vaddress", "-vcities","-vstreetgroups", "-vaddress", "-vcities",//"-vstreetgroups",
// "-vstreets", "-vbuildings", "-vintersections", // "-vstreets", "-vbuildings", "-vintersections",
// "-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/temp/Germany_bremen_europe_15_08_00.obf"
// "/Users/victorshcherb/osmand/maps/Synthetic_test_rendering.obf" // "/Users/victorshcherb/osmand/maps/Synthetic_test_rendering.obf"
// "/Users/victorshcherb/osmand/maps/Map.obf" "/Users/victorshcherb/osmand/maps/Netherlands_gelderland_europe_2.obf"
// "/Users/victorshcherb/osmand/temp/Czech-republic_jihovychod_europe_2.road.obf" // "/Users/victorshcherb/osmand/temp/Czech-republic_jihovychod_europe_2.road.obf"
}); });
} else { } else {
@ -571,7 +570,7 @@ public class BinaryInspector {
BinaryMapAddressReaderAdapter.VILLAGES_TYPE, BinaryMapAddressReaderAdapter.VILLAGES_TYPE,
BinaryMapAddressReaderAdapter.POSTCODES_TYPE BinaryMapAddressReaderAdapter.POSTCODES_TYPE
}; };
String lang = "ru"; String lang = "en";
for (int j = 0; j < cityType.length; j++) { for (int j = 0; j < cityType.length; j++) {
int type = cityType[j]; int type = cityType[j];