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 2016-07-31 15:17:11 +02:00
commit eec8d3d9ed
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -73,13 +73,13 @@ public class BinaryInspector {
in.inspector(new String[]{
// "-vpoi",
// "-vmap", "-vmapobjects", // "-vmapcoordinates",
"-vrouting",
// "-vrouting",
// "-vaddress", "-vcities","-vstreetgroups",
// "-vstreets", "-vbuildings", "-vintersections",
// "-lang=ru",
// "-bbox=4.8486,52.3084,4.8747,52.2970",
"-osm="+System.getProperty("maps.dir")+"/map.obf.osm",
System.getProperty("maps.dir")+"/Map.obf"
// "-osm="+System.getProperty("maps.dir")+"/map.obf.osm",
System.getProperty("maps.dir")+"/Gb_england_europe_simple.obf"
});
} else {
in.inspector(args);

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

@ -528,7 +528,15 @@ public class MapPoiTypes {
return translation;
}
}
return Algorithms.capitalizeFirstLetterAndLowercase(abstractPoiType.getKeyName().replace('_', ' '));
String name = abstractPoiType.getKeyName();
if(name.startsWith("osmand_")) {
name = name.substring("osmand_".length());
}
if(name.startsWith("amenity_")) {
name = name.substring("amenity_".length());
}
name = name.replace('_', ' ');
return Algorithms.capitalizeFirstLetterAndLowercase(name);
}