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 2018-01-11 15:53:00 +01:00
commit 936b4eb85c
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd-java/src/net/osmand/osm/edit/EntityParser.java
View file

@ -41,6 +41,9 @@ public class EntityParser {
if (mo.getName().length() == 0) {
mo.setName(mo.getEnName(false));
}
if (mo.getName().length() == 0 && tags.containsKey(OSMTagKey.LOCK_NAME.getValue())) {
mo.setName(tags.get(OSMTagKey.LOCK_NAME.getValue()));
}
if (mo.getLocation() == null) {
LatLon l = null;
if (mo instanceof Building) {

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

@ -5,6 +5,7 @@ public class OSMSettings {
public enum OSMTagKey {
NAME("name"), //$NON-NLS-1$
NAME_EN("name:en"), //$NON-NLS-1$
LOCK_NAME("lock_name"), //$NON-NLS-1$
// ways
HIGHWAY("highway"), //$NON-NLS-1$