Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Amenity types

Browse source
This commit is contained in:
vshcherb 2013-11-13 14:13:48 +01:00
parent b97a5c1196
commit 95d92645a6
49 changed files with 2827 additions and 2534 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd-java/src/net/osmand/binary/BinaryMapPoiReaderAdapter.java
View file

@ -155,7 +155,7 @@ public class BinaryMapPoiReaderAdapter {
case OsmandOdb.OsmAndCategoryTable.CATEGORY_FIELD_NUMBER :
String cat = codedIS.readString().intern();
region.categories.add(cat);
region.categoriesType.add(AmenityType.fromString(cat));
region.categoriesType.add(AmenityType.findOrCreateTypeNoReg(cat));
region.subcategories.add(new ArrayList<String>());
break;
case OsmandOdb.OsmAndCategoryTable.SUBCATEGORIES_FIELD_NUMBER :
@ -609,8 +609,6 @@ public class BinaryMapPoiReaderAdapter {
if(subcatId < subcats.size()){
subcat = subcats.get(subcatId);
}
} else {
type = AmenityType.OTHER;
}
if(req.poiTypeFilter.accept(type, subcat)){
codedIS.skipRawBytes(codedIS.getBytesUntilLimit());

4933
OsmAnd-java/src/net/osmand/binary/OsmandOdb.java
View file

File diff suppressed because it is too large Load diff

14
OsmAnd-java/src/net/osmand/data/Amenity.java
View file

@ -38,11 +38,6 @@ public class Amenity extends MapObject {
return openingHours;
}
public void setOpeningHours(String openingHours) {
setAdditionalInfo("opening_hours", openingHours);
this.openingHours = openingHours;
}
public String getAdditionalInfo(String key){
if(additionalInfo == null) {
return null;
@ -59,13 +54,18 @@ public class Amenity extends MapObject {
public void setAdditionalInfo(Map<String, String> additionalInfo) {
this.additionalInfo = additionalInfo;
openingHours = additionalInfo.get("opening_hours");
}
public void setAdditionalInfo(String tag, String value) {
if(this.additionalInfo == null){
this.additionalInfo = new LinkedHashMap<String, String>();
}
this.additionalInfo.put(tag, value);
if("opening_hours".equals(tag)) {
this.openingHours = value;
}
}
@ -98,5 +98,9 @@ public class Amenity extends MapObject {
setAdditionalInfo("description", description);
}
public void setOpeningHours(String openingHours) {
setAdditionalInfo("opening_hours", openingHours);
}
}

116
OsmAnd-java/src/net/osmand/data/AmenityType.java
View file

@ -1,67 +1,117 @@
package net.osmand.data;
import java.util.LinkedHashMap;
import java.util.Map;
// http://wiki.openstreetmap.org/wiki/Amenity
// POI tags : amenity, leisure, shop, sport, tourism, historic; accessories (internet-access), natural ?
public enum AmenityType {
public class AmenityType {
// Some of those types are subtypes of Amenity tag
EMERGENCY("emergency"), // [TAG] emergency services //$NON-NLS-1$ //$NON-NLS-2$
HEALTHCARE("amenity"), // hospitals, doctors, ... //$NON-NLS-1$ //$NON-NLS-2$
static Map<String, AmenityType> amenityTypes = new LinkedHashMap<String, AmenityType>();
private static AmenityType reg(String name, String defaultTag) {
name = name.toLowerCase();
if(amenityTypes.containsKey(name)) {
return amenityTypes.get(name);
}
AmenityType t = new AmenityType(name, defaultTag, amenityTypes.size());
amenityTypes.put(t.name, t);
return t;
}
public static AmenityType EMERGENCY = reg("emergency", "emergency"); // [TAG] emergency services //$NON-NLS-1$ //$NON-NLS-2$
public static AmenityType HEALTHCARE = reg("healthcare", "amenity"); // hospitals, doctors, ... //$NON-NLS-1$ //$NON-NLS-2$
TRANSPORTATION("amenity"), // trffic-stuff, parking, public transportation, ... //$NON-NLS-1$ //$NON-NLS-2$
BARRIER("barrier"), // [TAG] barrier + traffic_calming //$NON-NLS-1$ //$NON-NLS-2$
public static AmenityType TRANSPORTATION = reg("transportation", "amenity"); // trffic-stuff, parking, public transportation, ... //$NON-NLS-1$ //$NON-NLS-2$
public static AmenityType BARRIER = reg("barrier", "barrier"); // [TAG] barrier + traffic_calming //$NON-NLS-1$ //$NON-NLS-2$
TOURISM("tourism"), // [TAG] tourism hotel, sights, museum .. //$NON-NLS-1$ //$NON-NLS-2$
ENTERTAINMENT("amenity"), // cinema, ... (+! sauna, brothel) //$NON-NLS-1$ //$NON-NLS-2$
HISTORIC("historic"), // [TAG] historic places, battlefields, ... //$NON-NLS-1$ //$NON-NLS-2$
public static AmenityType TOURISM = reg("tourism", "tourism"); // [TAG] tourism hotel, sights, museum .. //$NON-NLS-1$ //$NON-NLS-2$
public static AmenityType ENTERTAINMENT = reg("entertainment", "amenity"); // cinema, ... = reg("", +! sauna, brothel) //$NON-NLS-1$ //$NON-NLS-2$
public static AmenityType HISTORIC = reg("historic", "historic"); // [TAG] historic places, battlefields, ... //$NON-NLS-1$ //$NON-NLS-2$
SPORT("sport"), // [TAG] sport //$NON-NLS-1$ //$NON-NLS-2$
LEISURE("leisure"), // [TAG] leisure //$NON-NLS-1$ //$NON-NLS-2$
GEOCACHE("geocache"), //$NON-NLS-1$
public static AmenityType SPORT = reg("sport", "sport"); // [TAG] sport //$NON-NLS-1$ //$NON-NLS-2$
public static AmenityType LEISURE = reg("leisure", "leisure"); // [TAG] leisure //$NON-NLS-1$ //$NON-NLS-2$
public static AmenityType GEOCACHE = reg("geocache", "geocache"); //$NON-NLS-1$
OTHER("amenity"), // grave-yard, post-office, [+Internet_access] //$NON-NLS-1$ //$NON-NLS-2$
FINANCE("amenity"), // bank, atm, ... //$NON-NLS-1$ //$NON-NLS-2$
OFFICE("office"), // [TAG] office //$NON-NLS-1$ //$NON-NLS-2$
ADMINISTRATIVE("administrative"), // [TAG] administrative //$NON-NLS-1$ //$NON-NLS-2$
EDUCATION("amenity"), // school, ... //$NON-NLS-1$ //$NON-NLS-2$
MAN_MADE("man_made"), // [TAG] man_made and others //$NON-NLS-1$ //$NON-NLS-2$
SUSTENANCE("amenity"), // restaurant, cafe, ... //$NON-NLS-1$ //$NON-NLS-2$
public static AmenityType OTHER = reg("other", "amenity"); // grave-yard, post-office, [+Internet_access] //$NON-NLS-1$ //$NON-NLS-2$
public static AmenityType FINANCE = reg("finance", "amenity"); // bank, atm, ... //$NON-NLS-1$ //$NON-NLS-2$
public static AmenityType OFFICE = reg("office", "office"); // [TAG] office //$NON-NLS-1$ //$NON-NLS-2$
public static AmenityType ADMINISTRATIVE = reg("administrative", "administrative"); // [TAG] administrative //$NON-NLS-1$ //$NON-NLS-2$
public static AmenityType EDUCATION = reg("education", "amenity"); // school, ... //$NON-NLS-1$ //$NON-NLS-2$
public static AmenityType MAN_MADE = reg("man_made", "man_made"); // [TAG] man_made and others //$NON-NLS-1$ //$NON-NLS-2$
public static AmenityType SUSTENANCE = reg("sustenance", "amenity"); // restaurant, cafe, ... //$NON-NLS-1$ //$NON-NLS-2$
SHOP("shop"), // [TAG] amenity convenience (product), clothes,... //$NON-NLS-1$ //$NON-NLS-2$
public static AmenityType SHOP = reg("shop", "shop"); // [TAG] amenity convenience = reg("", product); clothes,... //$NON-NLS-1$ //$NON-NLS-2$
NATURAL("natural"), // [TAG] natural places, peaks, caves, trees,... //$NON-NLS-1$ //$NON-NLS-2$
LANDUSE("landuse"), // [TAG] landuse //$NON-NLS-1$ //$NON-NLS-2$
MILITARY("military"), // [TAG] military //$NON-NLS-1$ //$NON-NLS-2$
public static AmenityType NATURAL = reg("natural", "natural"); // [TAG] natural places, peaks, caves, trees,... //$NON-NLS-1$ //$NON-NLS-2$
public static AmenityType LANDUSE = reg("landuse", "landuse"); // [TAG] landuse //$NON-NLS-1$ //$NON-NLS-2$
public static AmenityType MILITARY = reg("military", "military"); // [TAG] military //$NON-NLS-1$ //$NON-NLS-2$
public static AmenityType OSMWIKI = reg("osmwiki", "osmwiki"); //$NON-NLS-1$
public static AmenityType USER_DEFINED = reg("user_defined", "user_defined"); //$NON-NLS-1$
OSMWIKI("osmwiki"), //$NON-NLS-1$
USER_DEFINED("user_defined"), //$NON-NLS-1$
;
private final String defaultTag;
private final String name;
private final int ordinal;
private AmenityType(String defaultTag) {
private AmenityType(String name, String defaultTag, int ordinal) {
this.name = name;
this.defaultTag = defaultTag;
this.ordinal = ordinal;
}
public static AmenityType fromString(String s) {
for (AmenityType t : values()) {
if (t.name().equalsIgnoreCase(s)) {
public static AmenityType findRegisteredType(String s) {
return findRegisteredType(s, OTHER);
}
public static AmenityType findOrCreateTypeNoReg(String s) {
AmenityType type = findRegisteredType(s, null);
if(type == null) {
type = new AmenityType(s, s, -1);
}
return type;
}
public static boolean isRegisteredType(AmenityType type) {
//return amenityTypes.containsKey(type.name);
return type.ordinal >= 0;
}
public static AmenityType findRegisteredType(String s, AmenityType def) {
for (AmenityType t : amenityTypes.values()) {
if (t.name.equalsIgnoreCase(s)) {
return t;
}
}
return OTHER;
return def;
}
public static AmenityType getAndRegisterType(String name) {
return reg(name, name);
}
public String getDefaultTag() {
return defaultTag;
}
public static String valueToString(AmenityType t){
return t.toString().toLowerCase();
public String getCategoryName() {
return name;
}
public static int getCategoriesSize() {
return amenityTypes.size();
}
public static AmenityType[] getCategories(){
return AmenityType.values();
return amenityTypes.values().toArray(new AmenityType[amenityTypes.size()]);
}
public int ordinal() {
return ordinal;
}
public static String valueToString(AmenityType a) {
return a.getCategoryName();
}

22
OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java
View file

@ -39,6 +39,7 @@ public class MapRenderingTypes {
private Map<AmenityType, Map<String, String>> amenityTypeNameToTagVal = null;
private Map<String, AmenityType> amenityNameToType = null;
private Map<String, AmenityRuleType> amenityTypes = null;
private Map<String, AmenityRuleType> amenityPatternTypes = null;
public MapRenderingTypes(String fileName){
this.resourceName = fileName;
@ -61,6 +62,7 @@ public class MapRenderingTypes {
protected void checkIfInitNeeded() {
if(amenityTypes == null) {
amenityTypes = new LinkedHashMap<String, MapRenderingTypes.AmenityRuleType>();
amenityPatternTypes = new LinkedHashMap<String, MapRenderingTypes.AmenityRuleType>();
init();
}
}
@ -254,7 +256,7 @@ public class MapRenderingTypes {
rtype.value = null;
}
if (poiParentCategory != null) {
rtype.poiCategory = AmenityType.fromString(poiParentCategory);
rtype.poiCategory = AmenityType.findRegisteredType(poiParentCategory, null);
rtype.poiSpecified = true;
}
if (poiParentPrefix != null) {
@ -267,13 +269,7 @@ public class MapRenderingTypes {
if (poiCategory.length() == 0) {
rtype.poiCategory = null;
} else {
rtype.poiCategory = null;
for(AmenityType t : AmenityType.values()) {
if(AmenityType.valueToString(t).equals(poiCategory)) {
rtype.poiCategory = t;
break;
}
}
rtype.poiCategory = AmenityType.getAndRegisterType(poiCategory);
}
}
String poiPrefix = parser.getAttributeValue("", "poi_prefix");
@ -299,10 +295,14 @@ public class MapRenderingTypes {
private AmenityRuleType registerAmenityType(String tag, String val, AmenityRuleType rt) {
String keyVal = constructRuleKey(tag, val);
if (amenityTypes.containsKey(keyVal)) {
if (amenityTypes.containsKey(keyVal) || amenityPatternTypes.containsKey(keyVal)) {
throw new RuntimeException("Duplicate " + keyVal);
} else {
amenityTypes.put(keyVal, rt);
if(val != null && (tag.equals("*") || val.equals("*"))) {
amenityPatternTypes.put(keyVal, rt);
} else{
amenityTypes.put(keyVal, rt);
}
return rt;
}
}
@ -311,7 +311,7 @@ public class MapRenderingTypes {
String tag = parser.getAttributeValue("","poi_tag");
if (tag != null) {
AmenityRuleType rtype = new AmenityRuleType();
rtype.poiCategory = AmenityType.fromString(poiParentCategory);
rtype.poiCategory = AmenityType.getAndRegisterType(poiParentCategory);
rtype.poiSpecified = true;
rtype.relation = Boolean.parseBoolean(parser.getAttributeValue("", "relation"));
rtype.poiPrefix = poiParentPrefix;

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

@ -17,7 +17,7 @@ import net.osmand.util.Algorithms;
public class EntityParser {
private static void parseMapObject(MapObject mo, Entity e) {
public static void parseMapObject(MapObject mo, Entity e) {
mo.setId(e.getId());
if(mo instanceof Amenity) {
mo.setId((e.getId() << 1) + ((e instanceof Node) ? 0 : 1));
@ -62,21 +62,28 @@ public class EntityParser {
mo.setName(op);
}
public static void parseAmenity(Amenity am, Entity entity) {
parseMapObject(am, entity);
}
public static Amenity parseAmenity(Entity entity, AmenityType type, String subtype) {
public static Amenity parseAmenity(Entity entity, AmenityType type, String subtype, MapRenderingTypes types) {
Amenity am = new Amenity();
parseAmenity(am, entity);
parseMapObject(am, entity);
am.setType(type);
am.setSubType(subtype);
am.setOpeningHours(entity.getTag(OSMTagKey.OPENING_HOURS));
am.setPhone(entity.getTag(OSMTagKey.PHONE));
if (am.getPhone() == null) {
am.setPhone(entity.getTag(OSMTagKey.CONTACT_PHONE));
// TODO ; // parse additional info am.setAdditionalInfo(tag, value)
am.setAdditionalInfo("opening_hours", entity.getTag("opening_hours"));
am.setAdditionalInfo("description", entity.getTag("description"));
am.setAdditionalInfo("website", getPhone(entity));
am.setAdditionalInfo("phone", getWebSiteURL(entity));
return am;
}
private static String getPhone(Entity entity) {
String phone = entity.getTag(OSMTagKey.PHONE);
if(phone == null) {
return entity.getTag(OSMTagKey.CONTACT_PHONE);
}
return phone;
}
private static String getWebSiteURL(Entity entity) {
String siteUrl = entity.getTag(OSMTagKey.WIKIPEDIA);
if (siteUrl != null) {
if (!siteUrl.startsWith("http://")) { //$NON-NLS-1$
@ -99,9 +106,7 @@ public class EntityParser {
siteUrl = "http://" + siteUrl;
}
}
am.setSite(siteUrl);
am.setDescription(entity.getTag(OSMTagKey.DESCRIPTION));
return am;
return siteUrl;
}
public static List<Amenity> parseAmenities(MapRenderingTypes renderingTypes,
@ -116,7 +121,7 @@ public class EntityParser {
renderingTypes.getAmenityType(t, entity.getTag(t));
if (type != null) {
String subtype = renderingTypes.getAmenitySubtype(t, entity.getTag(t));
Amenity a = parseAmenity(entity, type, subtype);
Amenity a = parseAmenity(entity, type, subtype, renderingTypes);
if(checkAmenitiesToAdd(a, amenitiesList) && !"no".equals(subtype)){
amenitiesList.add(a);
}

4
OsmAnd/res/values-af/strings.xml
View file

@ -224,7 +224,7 @@
<string name="index_name_wiki">Wêreldwye Wikipedia</string>
<string name="index_name_voice">Stem pakkette (opgeneem, beperkte funksies)</string>
<string name="index_name_tts_voice">Stem pakkette (TTS-sintese, verkies)</string>
<string name="amenity_type_wikiosm">Wikipedia (aflyn)</string>
<string name="amenity_type_osmwiki">Wikipedia (aflyn)</string>
<string name="amenity_type_user_defined">gebruiker gedefinieerde</string>
<string name="fav_export_confirmation">Lêer met voorheen uitgevoerde gunstelinge bestaan reeds. Wil jy dit vervang?</string>
<string name="profile_settings">Profiel Besondere Stellings</string>
@ -464,7 +464,7 @@
<string name="amenity_type_historic">Histories</string>
<string name="amenity_type_landuse">Landgebruik</string>
<string name="amenity_type_leisure">Ontspanning</string>
<string name="amenity_type_manmade">Mensgemaakte</string>
<string name="amenity_type_man_made">Mensgemaakte</string>
<string name="amenity_type_military">Militêre</string>
<string name="amenity_type_natural">Natuurlike</string>
<string name="amenity_type_office">Kantoor</string>

4
OsmAnd/res/values-be/strings.xml
View file

@ -819,7 +819,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="index_name_wiki">Worldwide Wikipedia POIs</string>
<string name="index_name_voice">Галасавыя пакункі (запісаныя)</string>
<string name="index_name_tts_voice">Галасавыя пакункі (TTS)</string>
<string name="amenity_type_wikiosm">Вікіпэдыя (пазасеціўная)</string>
<string name="amenity_type_osmwiki">Вікіпэдыя (пазасеціўная)</string>
<string name="amenity_type_user_defined">Вызначанае карыстальнікам</string>
<string name="fav_export_confirmation">Файл з экспартаванымі ўпадабанымі ўжо існуе. Ці хочаце замяніць яго ?</string>
<string name="profile_settings">Налады профіля</string>
@ -1118,7 +1118,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="amenity_type_historic">Historic</string>
<string name="amenity_type_landuse">Landuse</string>
<string name="amenity_type_leisure">Leisure</string>
<string name="amenity_type_manmade">Man made</string>
<string name="amenity_type_man_made">Man made</string>
<string name="amenity_type_military">Military</string>
<string name="amenity_type_natural">Natural</string>
<string name="amenity_type_office">Офіс</string>

4
OsmAnd/res/values-bg/strings.xml
View file

@ -820,7 +820,7 @@ OsmAnd е с отворен код и активно да се развива.
<string name="index_name_wiki">Уикипедия POI</string>
<string name="index_name_voice">Гласова навигация (записана)</string>
<string name="index_name_tts_voice">Гласова навигация (TTS)</string>
<string name="amenity_type_wikiosm">Уикипедия (офлайн)</string>
<string name="amenity_type_osmwiki">Уикипедия (офлайн)</string>
<string name="amenity_type_user_defined">определено от Вас</string>
<string name="fav_export_confirmation">Съществува файл с любими места. Искате ли да го заместите?</string>
<string name="profile_settings">Специфични настройки на потребителя</string>
@ -1115,7 +1115,7 @@ OsmAnd е с отворен код и активно да се развива.
<string name="amenity_type_historic">Исторически</string>
<string name="amenity_type_landuse">Земеползване</string>
<string name="amenity_type_leisure">Свободно време</string>
<string name="amenity_type_manmade">Изкуствени</string>
<string name="amenity_type_man_made">Изкуствени</string>
<string name="amenity_type_military">Военни обекти</string>
<string name="amenity_type_natural">Природа</string>
<string name="amenity_type_office">Офиси</string>

4
OsmAnd/res/values-ca/strings.xml
View file

@ -182,7 +182,7 @@
<string name="index_name_asia">Àsia</string>
<string name="index_name_oceania">Oceania</string>
<string name="index_name_voice">Paquets de veu (enregistrats, funcionalitats limitades)</string>
<string name="amenity_type_wikiosm">Viquipèdia (fora de línia)</string>
<string name="amenity_type_osmwiki">Viquipèdia (fora de línia)</string>
<string name="routing_settings">Navegació</string>
<string name="routing_settings_descr">Especifiqueu les opcions de navegació</string>
<string name="global_settings">Paràmetres globals</string>
@ -404,7 +404,7 @@
<string name="tip_app_mode">Perfil d\'usuari</string>
<string name="tip_map_context_menu">Menú contextual del mapa</string>
<string name="amenity_type_healthcare">Serveis mèdics</string>
<string name="amenity_type_manmade">Construccions</string>
<string name="amenity_type_man_made">Construccions</string>
<string name="amenity_type_office">Oficines</string>
<string name="m">m</string>
<string name="reading_cached_tiles">S\'està llegint les tessel·les emmagatzemades...</string>

4
OsmAnd/res/values-cs/strings.xml
View file

@ -128,7 +128,7 @@
<string name="index_name_wiki">Celý svět - Wikipedie</string>
<string name="index_name_voice">Hlasová data (audio)</string>
<string name="index_name_tts_voice">Hlasová data (TTS)</string>
<string name="amenity_type_wikiosm">Wikipedie (offline)</string>
<string name="amenity_type_osmwiki">Wikipedie (offline)</string>
<string name="amenity_type_user_defined">Uživatelsky definované</string>
<string name="fav_export_confirmation">Soubor se záložkami již existuje. Chcete ho nahradit?</string>
<string name="profile_settings">Nastavení profilu</string>
@ -300,7 +300,7 @@
<string name="amenity_type_historic">Historie</string>
<string name="amenity_type_landuse">Využité území</string>
<string name="amenity_type_leisure">Volný čas</string>
<string name="amenity_type_manmade">Lidská díla</string>
<string name="amenity_type_man_made">Lidská díla</string>
<string name="amenity_type_military">Armáda</string>
<string name="amenity_type_natural">Příroda</string>
<string name="amenity_type_office">Kanceláře</string>

4
OsmAnd/res/values-da/strings.xml
View file

@ -518,7 +518,7 @@
</string>
<string name="tip_day_night_mode">Dag/nat tilstand</string>
<string name="navigate_point_format">Format:</string>
<string name="amenity_type_wikiosm">Wikipedia (offline)</string>
<string name="amenity_type_osmwiki">Wikipedia (offline)</string>
<string name="routing_settings">Navigation</string>
<string name="tip_osm_improve">Forbedre OSM data</string>
<string name="download_files_not_enough_space">Der er ikke ledig plads nok til at hente %1$s MB (Ledig: %2$s).</string>
@ -1002,7 +1002,7 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
<string name="amenity_type_healthcare">Sundhed</string>
<string name="amenity_type_historic">Historisk</string>
<string name="amenity_type_leisure">Fritid</string>
<string name="amenity_type_manmade">Menneskeskabt</string>
<string name="amenity_type_man_made">Menneskeskabt</string>
<string name="amenity_type_military">Militær</string>
<string name="amenity_type_natural">Natur</string>
<string name="amenity_type_office">Kontor</string>

4
OsmAnd/res/values-de/strings.xml
View file

@ -324,7 +324,7 @@
<string name="index_name_wiki">Weltweite Wikipedia POIs</string>
<string name="index_name_voice">Sprachpakete (Aufnahmen - begrenzte Funktionalität)</string>
<string name="index_name_tts_voice">Sprachpakete (TTS-Synthesizer - flexiblere Ansagen)</string>
<string name="amenity_type_wikiosm">Wikipedia (offline)</string>
<string name="amenity_type_osmwiki">Wikipedia (offline)</string>
<string name="amenity_type_user_defined">Benutzerdefiniert</string>
<string name="fav_export_confirmation">Eine Datei mit exportierten Favoriten existiert bereits. Überschreiben?</string>
<string name="profile_settings">Profilspezifische Einstellungen</string>
@ -645,7 +645,7 @@
<string name="amenity_type_historic">Historisches</string>
<string name="amenity_type_landuse">Landnutzung</string>
<string name="amenity_type_leisure">Freizeit</string>
<string name="amenity_type_manmade">von Menschenhand</string>
<string name="amenity_type_man_made">von Menschenhand</string>
<string name="amenity_type_military">Militär</string>
<string name="amenity_type_natural">Natur</string>
<string name="amenity_type_office">Büro</string>

4
OsmAnd/res/values-el/strings.xml
View file

@ -392,7 +392,7 @@
<string name="index_name_wiki">ΣΕ Παγκόσμιας Wikipedia</string>
<string name="index_name_voice">Πακέτα φωνής (ηχογραφημένα, περιορισμένες δυνατότητες)</string>
<string name="index_name_tts_voice">Πακέτα φωνής (σύνθεση-TTS, προτιμώμενο)</string>
<string name="amenity_type_wikiosm">Wikipedia (εκτός σύνδεσης)</string>
<string name="amenity_type_osmwiki">Wikipedia (εκτός σύνδεσης)</string>
<string name="amenity_type_user_defined">Ορισμένο από το χρήστη</string>
<string name="fav_export_confirmation">Υπάρχει ήδη αρχείο από προηγούμενη εξαγωγή αγαπημένων. Θέλετε να αντικατασταθεί?</string>
<string name="profile_settings">Ειδικές Ρυθμίσεις Προφίλ</string>
@ -690,7 +690,7 @@
<string name="amenity_type_historic">Ιστορικά</string>
<string name="amenity_type_landuse">Χρήσης γης</string>
<string name="amenity_type_leisure">Αναψυχή</string>
<string name="amenity_type_manmade">Ανθρώπινες κατασκευές</string>
<string name="amenity_type_man_made">Ανθρώπινες κατασκευές</string>
<string name="amenity_type_military">Στρατιωτικά</string>
<string name="amenity_type_natural">Φύση</string>
<string name="amenity_type_office">Γραφείο</string>

4
OsmAnd/res/values-es/strings.xml
View file

@ -66,7 +66,7 @@
<string name="index_name_wiki">Wikipedia mundial</string>
<string name="index_name_voice">Paquetes de voz (grabado, funciones limitadas)</string>
<string name="index_name_tts_voice">Paquetes de voz (sintetizado, preferido)</string>
<string name="amenity_type_wikiosm">Wikipedia (sin conexión)</string>
<string name="amenity_type_osmwiki">Wikipedia (sin conexión)</string>
<string name="amenity_type_user_defined">Definido por el usuario</string>
<string name="fav_export_confirmation">Ya existe un archivo anterior con favoritos exportados. ¿Quiere sustituirlo?</string>
<string name="profile_settings">Opciones específicas por perfil</string>
@ -337,7 +337,7 @@
<string name="amenity_type_historic">Histórico</string>
<string name="amenity_type_landuse">Uso de Suelo</string>
<string name="amenity_type_leisure">Placer</string>
<string name="amenity_type_manmade">Artificial</string>
<string name="amenity_type_man_made">Artificial</string>
<string name="amenity_type_military">Militar</string>
<string name="amenity_type_natural">Naturaleza</string>
<string name="amenity_type_office">Oficinas</string>

4
OsmAnd/res/values-eu/strings.xml
View file

@ -549,7 +549,7 @@
<string name="index_name_wiki">Mundu osoko Wikipediako POIak</string>
<string name="index_name_voice">Ahots paketeak (grabatuak, mugatutako ezaugarriak)</string>
<string name="index_name_tts_voice">Ahots paketeak (TTS bidez sintetizatuak)</string>
<string name="amenity_type_wikiosm">Wikipedia (lineaz kanpo)</string>
<string name="amenity_type_osmwiki">Wikipedia (lineaz kanpo)</string>
<string name="amenity_type_user_defined">Erabiltzaileak definituak</string>
<string name="fav_export_confirmation">Aurretik esportaturiko Gogokoenak dagoeneko existitzen dira. Ordeztu nahi dituzu?</string>
<string name="profile_settings">Profilaren Ezarpenak</string>
@ -769,7 +769,7 @@
<string name="amenity_type_historic">Historikoa</string>
<string name="amenity_type_landuse">Lur erabilera</string>
<string name="amenity_type_leisure">Aisialdia</string>
<string name="amenity_type_manmade">Gizakiak egina</string>
<string name="amenity_type_man_made">Gizakiak egina</string>
<string name="amenity_type_military">Militarra</string>
<string name="amenity_type_natural">Naturala</string>
<string name="amenity_type_office">Bulegoa</string>

4
OsmAnd/res/values-fa/strings.xml
View file

@ -456,7 +456,7 @@
<string name="index_name_other">کل دنیا و نقشه های بالادستی</string>
<string name="index_name_voice">بسته های صوتی(ضبط شده، قابلیت محدود)</string>
<string name="index_name_tts_voice">بسته های صوتی(TTS، ارجح)</string>
<string name="amenity_type_wikiosm">ویکیپدیا (آفلاین)</string>
<string name="amenity_type_osmwiki">ویکیپدیا (آفلاین)</string>
<string name="routing_settings">مسیریابی</string>
<string name="routing_settings_descr">تعیین گزینه های مسیریابی</string>
<string name="global_settings">تنظیمات کلی</string>
@ -530,7 +530,7 @@
<string name="amenity_type_historic">مکانهای تاریخی</string>
<string name="amenity_type_landuse">کاربری اراضی</string>
<string name="amenity_type_leisure">اوقات فراغت</string>
<string name="amenity_type_manmade">ساخته دست بشر</string>
<string name="amenity_type_man_made">ساخته دست بشر</string>
<string name="amenity_type_military">نظامی</string>
<string name="amenity_type_natural">منابع طبیعی</string>
<string name="amenity_type_office">دفتر کار</string>

4
OsmAnd/res/values-fi/strings.xml
View file

@ -170,7 +170,7 @@
<string name="index_name_oceania">Oseania</string>
<string name="index_name_other">Maailmanlaajuiset ja aihekartat</string>
<string name="index_name_wiki">Maailmanlaajuinen Wikipedia</string>
<string name="amenity_type_wikiosm">Wikipedia (offline)</string>
<string name="amenity_type_osmwiki">Wikipedia (offline)</string>
<string name="amenity_type_user_defined">Käyttäjän määrittelemä</string>
<string name="profile_settings">Profiilikohtaiset asetukset</string>
<string name="settings_preset">Oletusprofiili</string>
@ -498,7 +498,7 @@
<string name="amenity_type_historic">Historia</string>
<string name="amenity_type_landuse">Maankäyttö</string>
<string name="amenity_type_leisure">Vapaa-aika</string>
<string name="amenity_type_manmade">Rakennelma</string>
<string name="amenity_type_man_made">Rakennelma</string>
<string name="amenity_type_military">Armeijan alue</string>
<string name="amenity_type_natural">Luonto</string>
<string name="amenity_type_office">Toimisto</string>

8
OsmAnd/res/values-fr/strings.xml
View file

@ -51,7 +51,7 @@
<string name="index_name_wiki">Wikipédia Monde</string>
<string name="index_name_voice">Packs voix (enregistrées, fonctions limitées)</string>
<string name="index_name_tts_voice">Packs voix de synthèse (synthétisé TTS, à préferer)</string>
<string name="amenity_type_wikiosm">Wikipédia (hors ligne)</string>
<string name="amenity_type_osmwiki">Wikipédia (hors ligne)</string>
<string name="amenity_type_user_defined">Défini par l\'utilisateur</string>
<string name="fav_export_confirmation">Un fichier de favoris précédemment exporté existe déjà. Voulez vous le remplacer ?</string>
<string name="profile_settings">Paramètres de profil</string>
@ -335,9 +335,9 @@
<string name="amenity_type_geocache">Géocache</string>
<string name="amenity_type_healthcare">Santé</string>
<string name="amenity_type_historic">Historique</string>
<string name="amenity_type_landuse">Terrain</string>
<string name="amenity_type_leisure">Loisir</string>
<string name="amenity_type_manmade">Artefact</string>
<string name="amenity_type_landuse">Agriculture</string>
<string name="amenity_type_leisure">Plaisance</string>
<string name="amenity_type_man_made">Artisanat</string>
<string name="amenity_type_military">Militaire</string>
<string name="amenity_type_natural">Nature</string>
<string name="amenity_type_office">Bureau</string>

4
OsmAnd/res/values-he/strings.xml
View file

@ -374,7 +374,7 @@
<string name="index_name_wiki">כלל עולמי עם ויקיפדיה</string>
<string name="index_name_voice">חבילות קריינות (מוקלטות)</string>
<string name="index_name_tts_voice">חבילות קריינות (טקסט לדיבור)</string>
<string name="amenity_type_wikiosm">וקיפדיה (בלתי מקוונת)</string>
<string name="amenity_type_osmwiki">וקיפדיה (בלתי מקוונת)</string>
<string name="amenity_type_user_defined">בהגדרת המשתמש</string>
<string name="fav_export_confirmation">קיים קובץ עם מועדפים שיוצאו בעבר. האם ברצונך להחליפו?</string>
<string name="profile_settings">הגדרות יעודיות לפרופיל</string>
@ -644,7 +644,7 @@
<string name="amenity_type_historic">היסטורית</string>
<string name="amenity_type_landuse">שטח מנוצל</string>
<string name="amenity_type_leisure">פנאי</string>
<string name="amenity_type_manmade">יצירת אדם</string>
<string name="amenity_type_man_made">יצירת אדם</string>
<string name="amenity_type_military">צבאית</string>
<string name="amenity_type_natural">טבעית</string>
<string name="amenity_type_office">משרד</string>

2
OsmAnd/res/values-hr/strings.xml
View file

@ -715,7 +715,7 @@
<string name="use_osmand_routing_service">OsmAnd navigacija &gt;20km</string>
<string name="poi_filter_closest_poi">Najbliže POI</string>
<string name="amenity_type_sustenance">Prehrana</string>
<string name="amenity_type_manmade">Građevine</string>
<string name="amenity_type_man_made">Građevine</string>
<string name="amenity_type_administrative">Upravni</string>
<string name="add_waypoint_dialog_added">Navigacijska točka \'\'{0}\'\' je uspješno dodana</string>
<string name="add_waypoint_dialog_title">Dodaj navigacijsku točku na snimljeni GPX zapis</string>

4
OsmAnd/res/values-hu/strings.xml
View file

@ -118,7 +118,7 @@
<string name="index_name_wiki">Wikipédia</string>
<string name="index_name_voice">Hang csomagok (felvett, korlátozott lehetőségek)</string>
<string name="index_name_tts_voice">Hang csomagok (TTS gépi hang, ajánlott)</string>
<string name="amenity_type_wikiosm">Wikipédia (offline)</string>
<string name="amenity_type_osmwiki">Wikipédia (offline)</string>
<string name="amenity_type_user_defined">Személyre szabható</string>
<string name="fav_export_confirmation">A kedvencekből létezik már mentés. Le szeretnéd cserélni?</string>
<string name="profile_settings">Felhasználási módnak megfelelő beállítások</string>
@ -395,7 +395,7 @@
<string name="amenity_type_historic">Történelem</string>
<string name="amenity_type_landuse">Terület</string>
<string name="amenity_type_leisure">Szabadidő</string>
<string name="amenity_type_manmade">Ember alkotta</string>
<string name="amenity_type_man_made">Ember alkotta</string>
<string name="amenity_type_military">Katonai</string>
<string name="amenity_type_natural">Természet</string>
<string name="amenity_type_office">Iroda</string>

4
OsmAnd/res/values-it/strings.xml
View file

@ -37,7 +37,7 @@
<string name="free_version_message">Questa versione gratuita di OsmAnd è limitata a %1$s download e non supporta gli articoli offline di Wikipedia.</string>
<string name="free_version_title">Versione gratuita</string>
<string name="poi_context_menu_showdescription">Visualizza descrizione POI</string>
<string name="amenity_type_wikiosm">Wikipedia (offline)</string>
<string name="amenity_type_osmwiki">Wikipedia (offline)</string>
<string name="amenity_type_user_defined">Definito dall\'utente</string>
<string name="fav_export_confirmation">Esistono file con preferiti già esportati. Vuoi sostituirli?</string>
<string name="profile_settings">Impostazioni specifiche del profilo</string>
@ -318,7 +318,7 @@
<string name="amenity_type_historic">Storia</string>
<string name="amenity_type_landuse">Uso del terreno</string>
<string name="amenity_type_leisure">Tempo Libero</string>
<string name="amenity_type_manmade">Artificiale</string>
<string name="amenity_type_man_made">Artificiale</string>
<string name="amenity_type_military">Militare</string>
<string name="amenity_type_natural">Natura</string>
<string name="amenity_type_office">Ufficio</string>

2
OsmAnd/res/values-ja/strings.xml
View file

@ -190,7 +190,7 @@ OSMコミュニティはこの問題をいち早く修正することができ
<string name="amenity_type_historic">歴史(Historic)</string>
<string name="amenity_type_landuse">土地利用(Landuse)</string>
<string name="amenity_type_leisure">レジャー(Leisure)</string>
<string name="amenity_type_manmade">人工物(Man made)</string>
<string name="amenity_type_man_made">人工物(Man made)</string>
<string name="amenity_type_military">軍事施設(Military)</string>
<string name="amenity_type_natural">自然(Natural)</string>
<string name="amenity_type_office">オフィス(Office)</string>

4
OsmAnd/res/values-ka/strings.xml
View file

@ -169,7 +169,7 @@
<string name="index_name_wiki">მსოფლიო ვიკიპედია</string>
<string name="index_name_voice">ჩაწერილი ხმოვანი პაკეტები</string>
<string name="index_name_tts_voice">ხმის პაკეტები (TTS)</string>
<string name="amenity_type_wikiosm">ვიკიპედია (გათიშული)</string>
<string name="amenity_type_osmwiki">ვიკიპედია (გათიშული)</string>
<string name="amenity_type_user_defined">მომხმარებლის მიერ შექმნილი</string>
<string name="fav_export_confirmation">რჩეულების ექსპორტირებული ფაილი უკვე არსებობს. გნებავთ თავზე გადაწერა?</string>
<string name="profile_settings">პროფილის პარამეტრები</string>
@ -403,7 +403,7 @@
<string name="amenity_type_historic">ისტორიული</string>
<string name="amenity_type_landuse">მოხნული მიწები</string>
<string name="amenity_type_leisure">ცარიელი</string>
<string name="amenity_type_manmade">ქმნილება</string>
<string name="amenity_type_man_made">ქმნილება</string>
<string name="amenity_type_military">სამხედრო</string>
<string name="amenity_type_natural">ნატურალური</string>
<string name="amenity_type_office">ოფისი</string>

4
OsmAnd/res/values-ko/strings.xml
View file

@ -119,7 +119,7 @@
<string name="index_name_voice">음성 팩 (녹음)</string>
<string name="index_name_tts_voice">음성 팩 (TTS)</string>
<string name="amenity_type_wikiosm">위키피디아 (오프라인)</string>
<string name="amenity_type_osmwiki">위키피디아 (오프라인)</string>
<string name="amenity_type_user_defined">사용자 정의</string>
<string name="fav_export_confirmation">이전에 저장한 등록지점들에 대한 파일이 이미 존재합니다. 이 파일을 대체하시겠습니까?</string>
<!-- this block re-worked for new Preferences structure -->
@ -439,7 +439,7 @@
<string name="amenity_type_historic">유적지</string>
<string name="amenity_type_landuse">사유지</string>
<string name="amenity_type_leisure">레저</string>
<string name="amenity_type_manmade">인공물</string>
<string name="amenity_type_man_made">인공물</string>
<string name="amenity_type_military">군대</string>
<string name="amenity_type_natural">자연경관</string>
<string name="amenity_type_office">사무소</string>

4
OsmAnd/res/values-lt/strings.xml
View file

@ -240,7 +240,7 @@
<string name="index_name_wiki">Pasaulinė Wikipedia</string>
<string name="index_name_voice">Balso paketai (įrašyti, ribotos galimybės)</string>
<string name="index_name_tts_voice">Balso paketai (TTS-sintetinis balsas, siūloma)</string>
<string name="amenity_type_wikiosm">Wikipedia (įrenginyje)</string>
<string name="amenity_type_osmwiki">Wikipedia (įrenginyje)</string>
<string name="amenity_type_user_defined">Nustatyta vartotojo</string>
<string name="fav_export_confirmation">Failas su anksčiau eksportuotomis išsaugotomis vietomis jau egzistuoja. Ar norite jį pakeisti kitu?</string>
<string name="profile_settings">Specifiniai profilio nustatymai</string>
@ -541,7 +541,7 @@
<string name="amenity_type_historic">Istoriniai</string>
<string name="amenity_type_landuse">Žemės panaudojimas</string>
<string name="amenity_type_leisure">Laisvalaikis</string>
<string name="amenity_type_manmade">Žmogaus sukurti objektai</string>
<string name="amenity_type_man_made">Žmogaus sukurti objektai</string>
<string name="amenity_type_military">Kariniai</string>
<string name="amenity_type_natural">Gamtiniai</string>
<string name="amenity_type_office">Biurai</string>

4
OsmAnd/res/values-lv/strings.xml
View file

@ -125,7 +125,7 @@
<string name="index_name_wiki">Pasaules vikipēdija</string>
<string name="index_name_voice">Balss pakas (ieraksti)</string>
<string name="index_name_tts_voice">Balss pakas (TTS)</string>
<string name="amenity_type_wikiosm">Wikipedia (bezsaistes)</string>
<string name="amenity_type_osmwiki">Wikipedia (bezsaistes)</string>
<string name="amenity_type_user_defined">Lietotāja definēts</string>
<string name="fav_export_confirmation">Eksistē fails ar iepriekš eksportētu izlases sarakstu. Vai vēlaties to pārrakstīt?</string>
<string name="profile_settings">Ar profilu saistītie uzstādījumi</string>
@ -368,7 +368,7 @@
<string name="amenity_type_historic">Vēsturiskās</string>
<string name="amenity_type_landuse">Lietojums</string>
<string name="amenity_type_leisure">Atpūta</string>
<string name="amenity_type_manmade">Mākslīgs</string>
<string name="amenity_type_man_made">Mākslīgs</string>
<string name="amenity_type_military">Militārs</string>
<string name="amenity_type_natural">Daba</string>
<string name="amenity_type_office">Ofiss</string>

4
OsmAnd/res/values-mr/strings.xml
View file

@ -82,7 +82,7 @@
<string name="index_name_africa">अफ्रिका</string>
<string name="index_name_asia">आशिया</string>
<string name="index_name_oceania">ओशेनिया</string>
<string name="amenity_type_wikiosm">विकिपेडिया (ऑफलाइन)</string>
<string name="amenity_type_osmwiki">विकिपेडिया (ऑफलाइन)</string>
<string name="routing_settings">दिशादर्शन</string>
<string name="routing_settings_descr">दिशादर्शनाचे पर्याय ठरवा</string>
@ -445,7 +445,7 @@
<string name="context_menu_item_search_transport">परिवहन शोधा</string>
<string name="deselect_all">काहीच निवडू नका</string>
<string name="filter_existing_indexes">डाउनलोड केलेले</string>
<string name="amenity_type_manmade">मानव निर्मित</string>
<string name="amenity_type_man_made">मानव निर्मित</string>
<string name="amenity_type_administrative">प्रशासकीय</string>
<string name="amenity_type_barrier">अडथळे</string>
<string name="unit_of_length_descr">लांबी आणि वेगाचे माप बदला</string>

4
OsmAnd/res/values-nb/strings.xml
View file

@ -207,7 +207,7 @@
<string name="index_name_wiki">Verdensomspennende Wikipedia</string>
<string name="index_name_voice">Talepakker (opptak, begrenset funksjonalitet)</string>
<string name="index_name_tts_voice">Talepakker (TTS kunstig tale, foretrekk)</string>
<string name="amenity_type_wikiosm">Wikipedia (offline)</string>
<string name="amenity_type_osmwiki">Wikipedia (offline)</string>
<string name="amenity_type_user_defined">Brukerdefinert</string>
<string name="fav_export_confirmation">Fil med tidligere eksporterte favoritter finnes allerede. Vil du erstatte den?</string>
<string name="profile_settings">Profilspesifikke innstillinger</string>
@ -375,7 +375,7 @@
<string name="amenity_type_historic">Historisk</string>
<string name="amenity_type_landuse">Arealbruk</string>
<string name="amenity_type_leisure">Fritid</string>
<string name="amenity_type_manmade">Menneskelagd</string>
<string name="amenity_type_man_made">Menneskelagd</string>
<string name="amenity_type_military">Militære</string>
<string name="amenity_type_natural">Natur</string>
<string name="amenity_type_office">Kontor</string>

4
OsmAnd/res/values-nl/strings.xml
View file

@ -152,7 +152,7 @@
<string name="index_name_wiki">Wereldwijde Wikipedia</string>
<string name="index_name_voice">Stembestanden (opnamen – beperkte functionaliteit)</string>
<string name="index_name_tts_voice">Stembestanden (stemgenerator – aangeraden)</string>
<string name="amenity_type_wikiosm">Wikipedia (offline)</string>
<string name="amenity_type_osmwiki">Wikipedia (offline)</string>
<string name="amenity_type_user_defined">Zelfgedefinieerd</string>
<string name="fav_export_confirmation">Favorietenbestand bestaat al, wil je dit vervangen?</string>
<string name="profile_settings">Profielspecifieke instellingen</string>
@ -436,7 +436,7 @@ Bij elk resultaat kan via een menu gekozen worden om er heen te navigeren, het o
<string name="amenity_type_historic">Historisch</string>
<string name="amenity_type_landuse">Landgebruik</string>
<string name="amenity_type_leisure">Vrije tijd</string>
<string name="amenity_type_manmade">Artificieel</string>
<string name="amenity_type_man_made">Artificieel</string>
<string name="amenity_type_military">Militair</string>
<string name="amenity_type_natural">Natuur</string>
<string name="amenity_type_office">Kantoren</string>

4
OsmAnd/res/values-pl/strings.xml
View file

@ -243,7 +243,7 @@
<string name="amenity_type_historic">Historia</string>
<string name="amenity_type_landuse">Obszar</string>
<string name="amenity_type_leisure">Wypoczynek</string>
<string name="amenity_type_manmade">Przemysł</string>
<string name="amenity_type_man_made">Przemysł</string>
<string name="amenity_type_military">Wojsko</string>
<string name="amenity_type_natural">Natura</string>
<string name="amenity_type_office">Biura</string>
@ -839,7 +839,7 @@
<string name="index_name_wiki">Wikipedia dla POI</string>
<string name="index_name_voice">Zestawy głosów (nagrane, ograniczone możliwości)</string>
<string name="index_name_tts_voice">Zestawy głosów (TTS, zalecane)</string>
<string name="amenity_type_wikiosm">Wikipedia (offline)</string>
<string name="amenity_type_osmwiki">Wikipedia (offline)</string>
<string name="amenity_type_user_defined">Własne</string>
<string name="fav_export_confirmation">Plik z poprzednio wyeksportowanymi ulubionymi już istnieje. Nadpisać go?</string>
<string name="profile_settings">Ustawienia specyficzne dla profilu</string>

4
OsmAnd/res/values-pt/strings.xml
View file

@ -10,7 +10,7 @@
<string name="amenity_type_historic">Histórico</string>
<string name="amenity_type_landuse">Agricultura</string>
<string name="amenity_type_leisure">Lazer</string>
<string name="amenity_type_manmade">Construção Humana</string>
<string name="amenity_type_man_made">Construção Humana</string>
<string name="amenity_type_military">Militar</string>
<string name="amenity_type_natural">Natureza</string>
<string name="amenity_type_office">Escritório</string>
@ -607,7 +607,7 @@ Você pode ativar (on-line ou em cache) fontes azulejo mapa, configurações de
<string name="index_name_wiki">Worldwide Wikipedia</string>
<string name="index_name_voice">Pacotes de vozes (gravadas, funcionalidades limitadas)</string>
<string name="index_name_tts_voice">Pacotes de vozes (TTS)</string>
<string name="amenity_type_wikiosm">Wikipedia (offline)</string>
<string name="amenity_type_osmwiki">Wikipedia (offline)</string>
<string name="amenity_type_user_defined">Definido pelo utilizador</string>
<string name="fav_export_confirmation">Já existe um arquivo de favoritos exportados anteriormente. Quer substitui-lo?</string>
<string name="profile_settings">Configurações específicas de Perfil</string>

4
OsmAnd/res/values-ro/strings.xml
View file

@ -394,7 +394,7 @@
<string name="index_name_wiki">Wikipedia mondială</string>
<string name="index_name_voice">Voci înregistrate</string>
<string name="index_name_tts_voice">Voci TTS</string>
<string name="amenity_type_wikiosm">Wikipedia (offline)</string>
<string name="amenity_type_osmwiki">Wikipedia (offline)</string>
<string name="amenity_type_user_defined">Obiective utilizator</string>
<string name="fav_export_confirmation">Există un fișier cu puncte favorite exportate anterior. Doriți să-l înlocuiți?</string>
<string name="profile_settings">Setări ale profilurilor</string>
@ -682,7 +682,7 @@
<string name="amenity_type_historic">Obiective istorice</string>
<string name="amenity_type_landuse">Parcuri și spații verzi</string>
<string name="amenity_type_leisure">Locuri de relaxare</string>
<string name="amenity_type_manmade">Construcții tehnice</string>
<string name="amenity_type_man_made">Construcții tehnice</string>
<string name="amenity_type_military">Obiective militare</string>
<string name="amenity_type_natural">Natură</string>
<string name="amenity_type_office">Office</string>

4
OsmAnd/res/values-ru/strings.xml
View file

@ -188,7 +188,7 @@
<string name="index_name_wiki">Всемирная Википедия</string>
<string name="index_name_voice">Голосовые данные (запись)</string>
<string name="index_name_tts_voice">Голосовые данные (TTS)</string>
<string name="amenity_type_wikiosm">Википедия (локально)</string>
<string name="amenity_type_osmwiki">Википедия (локально)</string>
<string name="amenity_type_user_defined">Пользовательские</string>
<string name="fav_export_confirmation">Файл с избранными уже существует. Вы хотите его заменить?</string>
<string name="profile_settings">Настройка профиля</string>
@ -385,7 +385,7 @@
<string name="amenity_type_historic">Историческое</string>
<string name="amenity_type_landuse">Землепользование</string>
<string name="amenity_type_leisure">Досуг</string>
<string name="amenity_type_manmade">Сооружения</string>
<string name="amenity_type_man_made">Сооружения</string>
<string name="amenity_type_military">Военное</string>
<string name="amenity_type_natural">Природа</string>
<string name="amenity_type_office">Офис</string>

4
OsmAnd/res/values-sk/strings.xml
View file

@ -252,7 +252,7 @@
<string name="index_name_wiki">Celosvetová Wikipedia</string>
<string name="index_name_voice">Hlasové balíky (nahrávky, obmedzená funkcionalita)</string>
<string name="index_name_tts_voice">Hlasové balíky (TTS-generované, odporúčané)</string>
<string name="amenity_type_wikiosm">Wikipedia (offline)</string>
<string name="amenity_type_osmwiki">Wikipedia (offline)</string>
<string name="amenity_type_user_defined">Užívateľský</string>
<string name="fav_export_confirmation">Súbor s predošle exportovanými obľúbenými bodmi už existuje. Chcete ho nahradiť?</string>
<string name="profile_settings">Profilovo špecifické nastavenia</string>
@ -524,7 +524,7 @@
<string name="amenity_type_historic">História</string>
<string name="amenity_type_landuse">Využitie územia</string>
<string name="amenity_type_leisure">Voľný čas</string>
<string name="amenity_type_manmade">Človekom vytvorené</string>
<string name="amenity_type_man_made">Človekom vytvorené</string>
<string name="amenity_type_military">Armáda</string>
<string name="amenity_type_natural">Príroda</string>
<string name="amenity_type_office">Kancelárie</string>

4
OsmAnd/res/values-sl/strings.xml
View file

@ -293,7 +293,7 @@
<string name="index_name_wiki">Wikipedija svet</string>
<string name="index_name_voice">Glasovni paketi (posneti, omejeno št. funkcij)</string>
<string name="index_name_tts_voice">Paketi govorov (raje TTS-sintetizirani)</string>
<string name="amenity_type_wikiosm">Wikipedija (brez povezave)</string>
<string name="amenity_type_osmwiki">Wikipedija (brez povezave)</string>
<string name="amenity_type_user_defined">Razno</string>
<string name="fav_export_confirmation">Datoteka z izvoženimi priljubljenimi že obstaja. Ali jo želite zamenjati?</string>
<string name="routing_settings">Navigacija</string>
@ -567,7 +567,7 @@
<string name="old_map_index_is_not_supported">Podatki zemljevida v stari obliki \'\'{0}\'\' niso podprti</string>
<string name="no_buildings_found">Ni bilo najdenih zgradb.</string>
<string name="amenity_type_sustenance">Prehrana</string>
<string name="amenity_type_manmade">Zgradbe</string>
<string name="amenity_type_man_made">Zgradbe</string>
<string name="send_location_sms_pattern">Mesto: %1$s\n%2$s</string>
<string name="tip_initial_t">OsmAnd je navigacijska aplikacija s številnimi funkcijami.
\n\nZa osnovno predstavitev so nekateri nasveti in triki v povezavi \'Meni\' → \'Nasveti\' na zaslonu zemljevida.

4
OsmAnd/res/values-sv/strings.xml
View file

@ -353,7 +353,7 @@ Aktuella data på enheten (%1$s ledigt):</string>
<string name="index_name_wiki">Wikipedia</string>
<string name="index_name_voice">Röstpaket (inspelat, begränsad funktion)</string>
<string name="index_name_tts_voice">Röstpaket (TTS, rekommenderas)</string>
<string name="amenity_type_wikiosm">Wikipedia (offline)</string>
<string name="amenity_type_osmwiki">Wikipedia (offline)</string>
<string name="amenity_type_user_defined">Användardefinierat</string>
<string name="fav_export_confirmation">En fil med tidigare exporterade favoriter finns redan. Vill du ersätta den?</string>
<string name="profile_settings">Profilspecifika inställningar</string>
@ -583,7 +583,7 @@ Aktuella data på enheten (%1$s ledigt):</string>
<string name="amenity_type_historic">Historisk</string>
<string name="amenity_type_landuse">Markanvändning</string>
<string name="amenity_type_leisure">Fritid</string>
<string name="amenity_type_manmade">Konstgjort</string>
<string name="amenity_type_man_made">Konstgjort</string>
<string name="amenity_type_military">Militärt</string>
<string name="amenity_type_natural">Naturligt</string>
<string name="amenity_type_office">Kontor</string>

4
OsmAnd/res/values-tr/strings.xml
View file

@ -296,7 +296,7 @@
<string name="index_name_asia">Asya</string>
<string name="index_name_voice">Ses paketleri (kaydedilmiş, kısıtlı özellikler)</string>
<string name="index_name_tts_voice">Ses paketleri (Yazıdan-Sese sentezli, tercih edilen)</string>
<string name="amenity_type_wikiosm">Wikipedia (çevrimdışı)</string>
<string name="amenity_type_osmwiki">Wikipedia (çevrimdışı)</string>
<string name="amenity_type_user_defined">Kullanıcı tanımlı</string>
<string name="settings_preset">kullanıcı profili</string>
<string name="user_password">OSM şifreniz</string>
@ -899,7 +899,7 @@
<string name="amenity_type_administrative">İdari</string>
<string name="amenity_type_barrier">Engel</string>
<string name="amenity_type_historic">Tarihi</string>
<string name="amenity_type_manmade">İnsan yapımı</string>
<string name="amenity_type_man_made">İnsan yapımı</string>
<string name="amenity_type_military">Askeri</string>
<string name="amenity_type_natural">Doğal</string>
<string name="amenity_type_office">Büro</string>

4
OsmAnd/res/values-uk/strings.xml
View file

@ -199,7 +199,7 @@
<string name="index_name_wiki">Worldwide Wikipedia</string>
<string name="index_name_voice">Голосові дані (запис, обмежений функціонал)</string>
<string name="index_name_tts_voice">Голосові дані (TTS)</string>
<string name="amenity_type_wikiosm">Вікіпедія (оффлайн)</string>
<string name="amenity_type_osmwiki">Вікіпедія (оффлайн)</string>
<string name="amenity_type_user_defined">Користувацькі</string>
<string name="fav_export_confirmation">Файл з Закладками вже існує. Ви хочете його замінити?</string>
<string name="profile_settings">Налаштування профілю</string>
@ -467,7 +467,7 @@
<string name="amenity_type_historic">Історичні</string>
<string name="amenity_type_landuse">Землекористування</string>
<string name="amenity_type_leisure">Дозвілля</string>
<string name="amenity_type_manmade">Споруди</string>
<string name="amenity_type_man_made">Споруди</string>
<string name="amenity_type_military">Воєнні</string>
<string name="amenity_type_natural">Природа</string>
<string name="amenity_type_office">Офіс</string>

2
OsmAnd/res/values-vi/strings.xml
View file

@ -218,7 +218,7 @@ Translator: Le Viet Thanh; email: lethanhx2k@gmail.com --><resources>
<string name="amenity_type_historic">Di tích lịch sử</string>
<string name="amenity_type_landuse">Sử dụng đất</string>
<string name="amenity_type_leisure">Vui chơi</string>
<string name="amenity_type_manmade">Man made</string>
<string name="amenity_type_man_made">Man made</string>
<string name="amenity_type_military">Quân sự</string>
<string name="amenity_type_natural">Natural</string>
<string name="amenity_type_office">Office</string>

4
OsmAnd/res/values-zh-rCN/strings.xml
View file

@ -196,7 +196,7 @@
<string name="index_name_wiki">全球维基百科的POI</string>
<string name="index_name_voice">语音包（录制，功能有限）</string>
<string name="index_name_tts_voice">语音包（TTS合成，优先选用）</string>
<string name="amenity_type_wikiosm">维基百科（离线）</string>
<string name="amenity_type_osmwiki">维基百科（离线）</string>
<string name="amenity_type_user_defined">用户自定义</string>
<string name="settings_preset">用户配置文件</string>
<string name="routing_settings">导航</string>
@ -265,7 +265,7 @@
<string name="amenity_type_historic">历史性</string>
<string name="amenity_type_landuse">土地利用</string>
<string name="amenity_type_leisure">闲暇</string>
<string name="amenity_type_manmade">人造</string>
<string name="amenity_type_man_made">人造</string>
<string name="amenity_type_military">军事</string>
<string name="amenity_type_natural">自然</string>
<string name="amenity_type_office">办公室</string>

4
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -366,7 +366,7 @@
<string name="index_name_wiki">全球維基百科 POI</string>
<string name="index_name_voice">語音包 (真人，有限的功能)</string>
<string name="index_name_tts_voice">語音包 (TTS-合成提升)</string>
<string name="amenity_type_wikiosm">維基百科 (離線)</string>
<string name="amenity_type_osmwiki">維基百科 (離線)</string>
<string name="amenity_type_user_defined">使用者定義</string>
<string name="fav_export_confirmation">我的最愛已有上次匯出的檔，要取代它嗎？</string>
<string name="profile_settings">外觀具體的設定</string>
@ -632,7 +632,7 @@
<string name="amenity_type_historic">文化遺址</string>
<string name="amenity_type_landuse">土地利用</string>
<string name="amenity_type_leisure">休閒</string>
<string name="amenity_type_manmade">人造設施</string>
<string name="amenity_type_man_made">人造設施</string>
<string name="amenity_type_military">軍事地</string>
<string name="amenity_type_natural">自然景觀</string>
<string name="amenity_type_office">公司行號</string>

4
OsmAnd/res/values/strings.xml
View file

@ -896,7 +896,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="index_name_wiki">Worldwide Wikipedia POIs</string>
<string name="index_name_voice">Voice packs (recorded, limited features)</string>
<string name="index_name_tts_voice">Voice packs (TTS-synthesized, prefer)</string>
<string name="amenity_type_wikiosm">Wikipedia (offline)</string>
<string name="amenity_type_osmwiki">Wikipedia (offline)</string>
<string name="amenity_type_user_defined">User defined</string>
<string name="fav_export_confirmation">File with previously exported favorites already exists. Do you want to replace it?</string>
<string name="profile_settings">Profile Specific Settings</string>
@ -1196,7 +1196,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="amenity_type_historic">Historic</string>
<string name="amenity_type_landuse">Landuse</string>
<string name="amenity_type_leisure">Leisure</string>
<string name="amenity_type_manmade">Man made</string>
<string name="amenity_type_man_made">Man made</string>
<string name="amenity_type_military">Military</string>
<string name="amenity_type_natural">Natural</string>
<string name="amenity_type_office">Office</string>

57
OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
View file

@ -1,5 +1,6 @@
package net.osmand.plus;
import java.lang.reflect.Field;
import java.text.MessageFormat;
import net.osmand.data.Amenity;
@ -130,55 +131,15 @@ public class OsmAndFormatter {
}
public static String toPublicString(AmenityType t, ClientContext ctx) {
switch (t) {
case ADMINISTRATIVE:
return ctx.getString(R.string.amenity_type_administrative);
case BARRIER:
return ctx.getString(R.string.amenity_type_barrier);
case EDUCATION:
return ctx.getString(R.string.amenity_type_education);
case EMERGENCY:
return ctx.getString(R.string.amenity_type_emergency);
case ENTERTAINMENT:
return ctx.getString(R.string.amenity_type_entertainment);
case FINANCE:
return ctx.getString(R.string.amenity_type_finance);
case GEOCACHE:
return ctx.getString(R.string.amenity_type_geocache);
case HEALTHCARE:
return ctx.getString(R.string.amenity_type_healthcare);
case HISTORIC:
return ctx.getString(R.string.amenity_type_historic);
case LANDUSE:
return ctx.getString(R.string.amenity_type_landuse);
case LEISURE:
return ctx.getString(R.string.amenity_type_leisure);
case MAN_MADE:
return ctx.getString(R.string.amenity_type_manmade);
case MILITARY:
return ctx.getString(R.string.amenity_type_military);
case NATURAL:
return ctx.getString(R.string.amenity_type_natural);
case OFFICE:
return ctx.getString(R.string.amenity_type_office);
case OTHER:
return ctx.getString(R.string.amenity_type_other);
case SHOP:
return ctx.getString(R.string.amenity_type_shop);
case SPORT:
return ctx.getString(R.string.amenity_type_sport);
case SUSTENANCE:
return ctx.getString(R.string.amenity_type_sustenance);
case TOURISM:
return ctx.getString(R.string.amenity_type_tourism);
case TRANSPORTATION:
return ctx.getString(R.string.amenity_type_transportation);
case USER_DEFINED:
return ctx.getString(R.string.amenity_type_user_defined);
case OSMWIKI :
return ctx.getString(R.string.amenity_type_wikiosm);
Class<?> cl = R.string.class;
try {
Field fld = cl.getField("amenity_type_"+t.getCategoryName());
if(fld != null) {
return ctx.getString((Integer)fld.get(null));
}
} catch (Exception e) {
}
return "";
return ctx.getString(R.string.amenity_type_user_defined);
}

7
OsmAnd/src/net/osmand/plus/PoiFilter.java
View file

@ -84,7 +84,7 @@ public class PoiFilter {
}
private void initSearchAll(){
for(AmenityType t : AmenityType.values()){
for(AmenityType t : AmenityType.getCategories()){
acceptedTypes.put(t, null);
}
distanceToSearchValues = new double[] {0.5, 1, 2, 5, 10, 20, 50, 100};
@ -200,6 +200,9 @@ public class PoiFilter {
}
public boolean acceptTypeSubtype(AmenityType t, String subtype){
if(!AmenityType.isRegisteredType(t)) {
t = AmenityType.OTHER;
}
if(!acceptedTypes.containsKey(t)){
return false;
}
@ -215,7 +218,7 @@ public class PoiFilter {
}
public boolean areAllTypesAccepted(){
if(AmenityType.values().length == acceptedTypes.size()){
if(AmenityType.getCategoriesSize() == acceptedTypes.size()){
for(AmenityType a : acceptedTypes.keySet()){
if(acceptedTypes.get(a) != null){
return false;

4
OsmAnd/src/net/osmand/plus/PoiFiltersHelper.java
View file

@ -216,7 +216,7 @@ public class PoiFiltersHelper {
public List<PoiFilter> getOsmDefinedPoiFilters(){
if(cacheOsmDefinedFilters == null){
cacheOsmDefinedFilters = new ArrayList<PoiFilter>();
for(AmenityType t : AmenityType.values()){
for(AmenityType t : AmenityType.getCategories()){
cacheOsmDefinedFilters.add(new PoiFilter(t, application));
}
final Collator instance = Collator.getInstance();
@ -427,7 +427,7 @@ public class PoiFiltersHelper {
map.put(filterId, new LinkedHashMap<AmenityType, LinkedHashSet<String>>());
}
Map<AmenityType, LinkedHashSet<String>> m = map.get(filterId);
AmenityType a = AmenityType.fromString(query.getString(1));
AmenityType a = AmenityType.findOrCreateTypeNoReg(query.getString(1));
String subCategory = query.getString(2);
if(subCategory == null){
m.put(a, null);

5
OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
View file

@ -557,7 +557,8 @@ public class MapActivityLayers {
it.reg();
userDefined.add(f);
}
for(AmenityType t : AmenityType.values()){
final AmenityType[] categories = AmenityType.getCategories();
for(AmenityType t : categories){
Item it = adapter.item(OsmAndFormatter.toPublicString(t, activity.getMyApplication()));
if(RenderingIcons.containsBigIcon(t.toString().toLowerCase())) {
it.icon(RenderingIcons.getBigIconResourceId(t.toString().toLowerCase()));
@ -592,7 +593,7 @@ public class MapActivityLayers {
} else if (which <= userDefined.size()) {
filterId = userDefined.get(which - 2).getFilterId();
} else {
filterId = PoiFiltersHelper.getOsmDefinedFilterId(AmenityType.values()[which - userDefined.size() - 2]);
filterId = PoiFiltersHelper.getOsmDefinedFilterId(categories[which - userDefined.size() - 2]);
}
getApplication().getSettings().setPoiFilterForMap(filterId);
PoiFilter f = poiFilters.getFilterById(filterId);

10
OsmAnd/src/net/osmand/plus/osmedit/EditingPOIActivity.java
View file

@ -4,7 +4,6 @@ import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
@ -130,7 +129,7 @@ public class EditingPOIActivity implements DialogProvider {
}
private void showPOIDialog(int dialogID, Node n, AmenityType type, String subType) {
Amenity a = EntityParser.parseAmenity(n, type, subType);
Amenity a = EntityParser.parseAmenity(n, type, subType, MapRenderingTypes.getDefault());
dialogBundle.putSerializable(KEY_AMENITY, a);
dialogBundle.putSerializable(KEY_AMENITY_NODE, n);
ctx.showDialog(dialogID);
@ -619,14 +618,15 @@ public class EditingPOIActivity implements DialogProvider {
case DIALOG_POI_TYPES: {
final Amenity a = (Amenity) args.getSerializable(KEY_AMENITY);
Builder builder = new AlertDialog.Builder(ctx);
String[] vals = new String[AmenityType.values().length];
final AmenityType[] categories = AmenityType.getCategories();
String[] vals = new String[categories.length];
for(int i=0; i<vals.length; i++){
vals[i] = OsmAndFormatter.toPublicString(AmenityType.values()[i], ctx.getMyApplication());
vals[i] = OsmAndFormatter.toPublicString(categories[i], ctx.getMyApplication());
}
builder.setItems(vals, new Dialog.OnClickListener(){
@Override
public void onClick(DialogInterface dialog, int which) {
AmenityType aType = AmenityType.values()[which];
AmenityType aType = categories[which];
if(aType != a.getType()){
a.setType(aType);
a.setSubType(""); //$NON-NLS-1$