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-09-28 00:08:20 +02:00
commit 5669df9445
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -66,17 +66,17 @@ 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", // "-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/maps/Synthetic_test_rendering.obf" // "/Users/victorshcherb/osmand/maps/Synthetic_test_rendering.obf"
"/Users/victorshcherb/osmand/maps/Netherlands_gelderland_europe_2.obf" // "/Users/victorshcherb/osmand/maps/Netherlands_europe_2.road.obf"
// "/Users/victorshcherb/osmand/temp/Czech-republic_jihovychod_europe_2.road.obf" "/Users/victorshcherb/osmand/maps/Map.obf"
}); });
} else { } else {
in.inspector(args); in.inspector(args);

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

@ -584,15 +584,16 @@ public class MapPoiTypes {
} }
public boolean isTextAdditionalInfo(String key, String value) { public boolean isTextAdditionalInfo(String key, String value) {
if(key.startsWith("name:") || key.equals("name")) { if (key.startsWith("name:") || key.equals("name")) {
return true; return true;
} }
initPoiTypesByTag(); PoiType pat = (PoiType) getAnyPoiAdditionalTypeByKey(key);
PoiType pat = poiTypesByTag.get(key+"/"+value); // initPoiTypesByTag();
if(pat == null) { // PoiType pat = poiTypesByTag.get(key + "/" + value);
pat = poiTypesByTag.get(key); // if (pat == null) {
} // pat = poiTypesByTag.get(key);
if(pat == null) { // }
if (pat == null) {
return true; return true;
} else { } else {
return pat.isText(); return pat.isText();