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 2015-10-15 00:53:37 +02:00
commit 4fa38b4f05
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -66,17 +66,17 @@ public class BinaryInspector {
// test cases show info
if(args.length == 1 && "test".equals(args[0])) {
in.inspector(new String[]{
// "-vpoi",
// "-vmap", "-vmapobjects", // "-vmapcoordinates",
"-vrouting",
"-vpoi",
// "-vmap","-vmapobjects", // "-vmapcoordinates",
// "-vrouting",
// "-vaddress", "-vcities",//"-vstreetgroups",
// "-vstreets", "-vbuildings", "-vintersections",
// "-zoom=15",
// "-bbox=1.74,51.17,1.75,51.16",
// "-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/Map.obf"
// "/Users/victorshcherb/osmand/maps/Map.obf"
});
} else {
in.inspector(args);
@ -1036,9 +1036,9 @@ public class BinaryInspector {
while(it.hasNext()) {
Entry<String, String> e = it.next();
if(e.getValue().startsWith(" gz ")) {
s += e.getKey() +"=...";
s += " " + e.getKey() +"=...";
} else {
s += e.getKey() +"=" +e.getValue();
s += " " + e.getKey() +"=" +e.getValue();
}
}

5
OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java
View file

@ -56,6 +56,11 @@ public class MapPoiTypes {
}
public static void setDefault(MapPoiTypes types) {
DEFAULT_INSTANCE = types;
DEFAULT_INSTANCE.init();
}
public static MapPoiTypes getDefault() {
if(DEFAULT_INSTANCE == null){
DEFAULT_INSTANCE = new MapPoiTypes(null);