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 2017-06-12 20:38:39 +02:00
commit 52f9006389
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -72,17 +72,19 @@ public class BinaryInspector {
// test cases show info // test cases show info
if ("test".equals(args[0])) { if ("test".equals(args[0])) {
in.inspector(new String[] { in.inspector(new String[] {
// "-vpoi", // "-vpoi",
// "-vmap", "-vmapobjects", // "-vmapcoordinates", "-vmap", "-vmapobjects", // "-vmapcoordinates",
"-vrouting", // "-vrouting",
// "-vtransport", // "-vtransport",
// "-vaddress", "-vcities","-vstreetgroups", // "-vaddress", "-vcities","-vstreetgroups",
// "-vstreets", "-vbuildings", "-vintersections", // "-vstreets", "-vbuildings", "-vintersections",
// "-lang=ru", // "-lang=ru",
// "-bbox=30.4981,50.4424,30.5195,50.4351", // "-bbox=30.4981,50.4424,30.5195,50.4351",
// "-osm="+System.getProperty("maps.dir")+"/map.obf.osm", // "-osm="+System.getProperty("maps.dir")+"/map_full.obf.osm",
System.getProperty("maps.dir")+"/Map.obf" System.getProperty("maps.dir")+"/Map.obf"
// System.getProperty("maps.dir")+"/Ukraine_kiev-city_europe.obf" // System.getProperty("maps.dir")+"../temp/kiev/Ukraine_kiev-city_europe_17_06_05.obf",
// System.getProperty("maps.dir")+"Ukraine_kiev-city_europe_2.obf",
}); });
} else { } else {
in.inspector(args); in.inspector(args);
@ -258,7 +260,7 @@ public class BinaryInspector {
println("\n" + extracted.size() + " parts were successfully extracted to " + args[1]); println("\n" + extracted.size() + " parts were successfully extracted to " + args[1]);
} }
} }
} else if (f.startsWith("-v")) { } else if (f.startsWith("-v") || f.startsWith("-osm")) {
if (args.length < 2) { if (args.length < 2) {
printUsage("Missing file parameter"); printUsage("Missing file parameter");
} else { } else {

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

@ -300,6 +300,7 @@ public abstract class MapRenderingTypes {
rt.id = mapRulType.id; rt.id = mapRulType.id;
if(rt.isMain()) { if(rt.isMain()) {
mapRulType.main = true; mapRulType.main = true;
mapRulType.order = rt.order;
if(rt.minzoom != 0) { if(rt.minzoom != 0) {
mapRulType.minzoom = Math.max(rt.minzoom, mapRulType.minzoom); mapRulType.minzoom = Math.max(rt.minzoom, mapRulType.minzoom);
} }