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 2014-06-23 03:02:38 +02:00
commit aa358de67c
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd-java/src/net/osmand/data/City.java
View file

@ -11,7 +11,7 @@ public class City extends MapObject {
public enum CityType { public enum CityType {
// that's tricky way to play with that numbers (to avoid including suburbs in city & vice verse) // that's tricky way to play with that numbers (to avoid including suburbs in city & vice verse)
// district special type and it is not registered as a city // district special type and it is not registered as a city
CITY(10000), TOWN(5000), VILLAGE(1300), HAMLET(1000), SUBURB(400), DISTRICT(400); CITY(10000), TOWN(5000), VILLAGE(1300), HAMLET(1000), SUBURB(400), DISTRICT(400), NEIGHBOURHOOD(300);
private double radius; private double radius;

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

@ -35,6 +35,7 @@ public class OSMSettings {
ADDR_STREET("addr:street"), //$NON-NLS-1$ ADDR_STREET("addr:street"), //$NON-NLS-1$
ADDR_STREET2("addr:street2"), //$NON-NLS-1$ ADDR_STREET2("addr:street2"), //$NON-NLS-1$
ADDR_CITY("addr:city"), //$NON-NLS-1$ ADDR_CITY("addr:city"), //$NON-NLS-1$
ADDR_PLACE("addr:place"), //$NON-NLS-1$
ADDR_POSTCODE("addr:postcode"), //$NON-NLS-1$ ADDR_POSTCODE("addr:postcode"), //$NON-NLS-1$
ADDR_INTERPOLATION("addr:interpolation"), //$NON-NLS-1$ ADDR_INTERPOLATION("addr:interpolation"), //$NON-NLS-1$
ADDRESS_TYPE("address:type"), //$NON-NLS-1$ ADDRESS_TYPE("address:type"), //$NON-NLS-1$