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

Update poi filters

Browse source
This commit is contained in:
Victor Shcherb 2015-06-10 01:47:16 +02:00
parent 8a2fa29f38
commit db1bd53217
38 changed files with 604 additions and 524 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
OsmAnd-java/src/net/osmand/osm/AbstractPoiType.java
View file

@ -11,6 +11,8 @@ public abstract class AbstractPoiType {
protected final String keyName;
protected final MapPoiTypes registry;
private List<PoiType> poiAdditionals = null;
private boolean topVisible;
public AbstractPoiType(String keyName, MapPoiTypes registry) {
this.keyName = keyName;
@ -25,6 +27,18 @@ public abstract class AbstractPoiType {
return getKeyName().replace(':', '_');
}
public void setTopVisible(boolean topVisible) {
this.topVisible = topVisible;
}
public boolean isTopVisible() {
return topVisible;
}
public boolean isAdditional() {
return this instanceof PoiType && ((PoiType) this).isAdditional();
}
public String getTranslation() {
return registry.getTranslation(this);

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

@ -126,7 +126,7 @@ public class MapPoiTypes {
return null;
}
public Map<String, PoiType> getAllTranslatedNames(boolean onlyTranslation) {
public Map<String, PoiType> getAllTranslatedNames() {
Map<String, PoiType> translation = new TreeMap<String, PoiType>();
for(PoiCategory pc : categories) {
for(PoiType pt : pc.getPoiTypes()) {
@ -134,12 +134,6 @@ public class MapPoiTypes {
continue;
}
translation.put(pt.getTranslation(), pt);
if(!onlyTranslation) {
String kn = pt.getKeyName().replace('_', ' ');
if(!pt.getTranslation().toLowerCase().contains(kn)) {
translation.put(Algorithms.capitalizeFirstLetterAndLowercase(kn), pt);
}
}
}
}
return translation;
@ -147,7 +141,6 @@ public class MapPoiTypes {
public Map<String, AbstractPoiType> getAllTypesTranslatedNames(StringMatcher matcher) {
TreeMap<String, AbstractPoiType> tm = new TreeMap<String, AbstractPoiType>(Collator.getInstance());
Map<String, PoiType> translation = new TreeMap<String, PoiType>();
for (PoiCategory pc : categories) {
addIf(tm, pc, matcher);
for (PoiFilter pt : pc.getPoiFilters()) {
@ -160,6 +153,7 @@ public class MapPoiTypes {
addIf(tm, pt, matcher);
}
}
return tm;
}
@ -167,6 +161,12 @@ public class MapPoiTypes {
if(matcher.matches(pc.getTranslation()) || matcher.matches(pc.getKeyName().replace('_', ' '))) {
tm.put(pc.getTranslation(), pc);
}
List<PoiType> additionals = pc.getPoiAdditionals();
if (additionals != null) {
for (PoiType a : additionals) {
addIf(tm, a, matcher);
}
}
}
@ -174,11 +174,10 @@ public class MapPoiTypes {
Map<String, PoiType> translation = new TreeMap<String, PoiType>();
for (PoiType pt : pc.getPoiTypes()) {
translation.put(pt.getTranslation(), pt);
if (!onlyTranslation) {
String kn = pt.getKeyName().replace('_', ' ');
if(!pt.getTranslation().toLowerCase().contains(kn)) {
translation.put(Algorithms.capitalizeFirstLetterAndLowercase(kn), pt);
}
// translation.put(pt.getKeyName(), pt);
translation.put(Algorithms.capitalizeFirstLetterAndLowercase(pt.getKeyName().replace('_', ' ')), pt);
}
}
return translation;
@ -264,6 +263,10 @@ public class MapPoiTypes {
lastCategory.addPoiType(tp);
} else if (name.equals("poi_additional")) {
PoiType tp = new PoiType(this, lastCategory, parser.getAttributeValue("", "name"));
tp.setAdditional(lastType != null ? lastType :
(lastFilter != null ? lastFilter : lastCategory));
tp.setTopVisible(Boolean.parseBoolean(parser.getAttributeValue("", "top")));
tp.setOsmTag(parser.getAttributeValue("", "tag"));
tp.setOsmValue(parser.getAttributeValue("", "value"));
tp.setOsmTag2(parser.getAttributeValue("", "tag2"));
@ -350,6 +353,42 @@ public class MapPoiTypes {
}
private PoiType getPoiAdditionalByKey(AbstractPoiType p, String name) {
List<PoiType> pp = p.getPoiAdditionals();
if (pp != null) {
for (PoiType pt : pp) {
if (pt.getKeyName().equals(name)) {
return pt;
}
}
}
return null;
}
public AbstractPoiType getAnyPoiAdditionalTypeByKey(String name) {
PoiType add = null;
for (PoiCategory pc : categories) {
add = getPoiAdditionalByKey(pc, name);
if (add != null) {
return add;
}
for (PoiFilter pf : pc.getPoiFilters()) {
add = getPoiAdditionalByKey(pf, name);
if (add != null) {
return add;
}
}
for (PoiType p : pc.getPoiTypes()) {
add = getPoiAdditionalByKey(p, name);
if (add != null) {
return add;
}
}
}
return null;
}
private static void print(String indent, PoiFilter f) {
for(PoiType pt : f.getPoiTypes()) {
System.out.println(indent + " Type " + pt.getKeyName() +

9
OsmAnd-java/src/net/osmand/osm/PoiFilter.java
View file

@ -9,7 +9,6 @@ import java.util.Map;
public class PoiFilter extends AbstractPoiType {
private PoiCategory pc;
private boolean topVisible;
private List<PoiType> poiTypes = new ArrayList<PoiType>();
private Map<String, PoiType> map = new LinkedHashMap<String, PoiType>();
@ -71,12 +70,4 @@ public class PoiFilter extends AbstractPoiType {
return poiTypes;
}
public void setTopVisible(boolean topVisible) {
this.topVisible = topVisible;
}
public boolean isTopVisible() {
return topVisible;
}
}

14
OsmAnd-java/src/net/osmand/osm/PoiType.java
View file

@ -6,6 +6,7 @@ import java.util.Map;
public class PoiType extends AbstractPoiType {
private PoiCategory category;
private AbstractPoiType parentType;
private PoiType referenceType;
private String osmTag;
private String osmTag2;
@ -79,6 +80,9 @@ public class PoiType extends AbstractPoiType {
}
public Map<PoiCategory, LinkedHashSet<String>> putTypes(Map<PoiCategory, LinkedHashSet<String>> acceptedTypes) {
if (isAdditional()) {
return parentType.putTypes(acceptedTypes);
}
PoiType rt = getReferenceType();
PoiType poiType = rt != null ? rt : this;
if (!acceptedTypes.containsKey(poiType.category)) {
@ -91,6 +95,16 @@ public class PoiType extends AbstractPoiType {
return acceptedTypes;
}
public void setAdditional(AbstractPoiType parentType) {
this.parentType = parentType;
}
public boolean isAdditional(){
return parentType != null;
}
public AbstractPoiType getParentType() {
return parentType;
}
}

46
OsmAnd/res/values-be/phrases.xml
View file

@ -730,29 +730,29 @@
<string name="poi_valley">Даліна</string>
<string name="poi_wood">Лес</string>
<string name="poi_landuse">Землекарыстаньне</string>
<string name="poi_fuel:diesel">Дызэль</string>
<string name="poi_fuel:gtl_diesel">GTL-дызэль</string>
<string name="poi_fuel:hgv_diesel">HGV-дызэль</string>
<string name="poi_fuel:biodiesel">Біядызэль</string>
<string name="poi_fuel:lpg">Звадкаваны газ</string>
<string name="poi_fuel:octane_80">Актан 80</string>
<string name="poi_fuel:octane_91">Актан 91</string>
<string name="poi_fuel:octane_92">Актан 92</string>
<string name="poi_fuel:octane_95">Актан 95</string>
<string name="poi_fuel:octane_98">Актан 98</string>
<string name="poi_fuel:octane_100">Актан 100</string>
<string name="poi_fuel:cng">Сьціснуты прыродны газ</string>
<string name="poi_fuel:1_25">Паліва 1:25</string>
<string name="poi_fuel:1_50">Паліва 1:50</string>
<string name="poi_fuel:ethanol">Этаноль</string>
<string name="poi_fuel:methanol">Мэтаноль</string>
<string name="poi_fuel:svo">Алейнае паліва</string>
<string name="poi_fuel:e10">E10</string>
<string name="poi_fuel:e20">E20</string>
<string name="poi_fuel:e85">E85</string>
<string name="poi_fuel:biogas">E85</string>
<string name="poi_fuel:lh2">Вадкі вадарод</string>
<string name="poi_fuel:electricity">Электрычнасьць</string>
<string name="poi_fuel_diesel">Дызэль</string>
<string name="poi_fuel_gtl_diesel">GTL-дызэль</string>
<string name="poi_fuel_hgv_diesel">HGV-дызэль</string>
<string name="poi_fuel_biodiesel">Біядызэль</string>
<string name="poi_fuel_lpg">Звадкаваны газ</string>
<string name="poi_fuel_octane_80">Актан 80</string>
<string name="poi_fuel_octane_91">Актан 91</string>
<string name="poi_fuel_octane_92">Актан 92</string>
<string name="poi_fuel_octane_95">Актан 95</string>
<string name="poi_fuel_octane_98">Актан 98</string>
<string name="poi_fuel_octane_100">Актан 100</string>
<string name="poi_fuel_cng">Сьціснуты прыродны газ</string>
<string name="poi_fuel_1_25">Паліва 1:25</string>
<string name="poi_fuel_1_50">Паліва 1:50</string>
<string name="poi_fuel_ethanol">Этаноль</string>
<string name="poi_fuel_methanol">Мэтаноль</string>
<string name="poi_fuel_svo">Алейнае паліва</string>
<string name="poi_fuel_e10">E10</string>
<string name="poi_fuel_e20">E20</string>
<string name="poi_fuel_e85">E85</string>
<string name="poi_fuel_biogas">E85</string>
<string name="poi_fuel_lh2">Вадкі вадарод</string>
<string name="poi_fuel_electricity">Электрычнасьць</string>
<string name="poi_farmyard">Падворак</string>
<string name="poi_meadow">Луг</string>

34
OsmAnd/res/values-bg/phrases.xml
View file

@ -153,21 +153,21 @@
<string name="poi_vehicle_inspection">ГТП</string>
<string name="poi_car_wash">Автомивка</string>
<string name="poi_fuel">Бензиностанция</string>
<string name="poi_fuel:diesel">Дизел</string>
<string name="poi_fuel:gtl_diesel">GTL дизел</string>
<string name="poi_fuel:hgv_diesel">Дизел за камиони</string>
<string name="poi_fuel:biodiesel">Био дизел</string>
<string name="poi_fuel:lpg">Природен газ</string>
<string name="poi_fuel:octane_80">Октан 80</string>
<string name="poi_fuel:octane_91">А 91</string>
<string name="poi_fuel:octane_92">А 92</string>
<string name="poi_fuel:octane_95">А 95</string>
<string name="poi_fuel:octane_98">А 98</string>
<string name="poi_fuel:octane_100">А 100</string>
<string name="poi_fuel:1_25">1:25 гориво</string>
<string name="poi_fuel:1_50">1:50 гориво</string>
<string name="poi_fuel:ethanol">Етанол</string>
<string name="poi_fuel:methanol">Метанол</string>
<string name="poi_fuel:e10">E10</string>
<string name="poi_fuel:e20">E20</string>
<string name="poi_fuel_diesel">Дизел</string>
<string name="poi_fuel_gtl_diesel">GTL дизел</string>
<string name="poi_fuel_hgv_diesel">Дизел за камиони</string>
<string name="poi_fuel_biodiesel">Био дизел</string>
<string name="poi_fuel_lpg">Природен газ</string>
<string name="poi_fuel_octane_80">Октан 80</string>
<string name="poi_fuel_octane_91">А 91</string>
<string name="poi_fuel_octane_92">А 92</string>
<string name="poi_fuel_octane_95">А 95</string>
<string name="poi_fuel_octane_98">А 98</string>
<string name="poi_fuel_octane_100">А 100</string>
<string name="poi_fuel_1_25">1:25 гориво</string>
<string name="poi_fuel_1_50">1:50 гориво</string>
<string name="poi_fuel_ethanol">Етанол</string>
<string name="poi_fuel_methanol">Метанол</string>
<string name="poi_fuel_e10">E10</string>
<string name="poi_fuel_e20">E20</string>
</resources>

46
OsmAnd/res/values-ca/phrases.xml
View file

@ -405,19 +405,19 @@
<string name="poi_kitchen">Mobles de cuina</string>
<string name="poi_medical_supply">Subministraments mèdics</string>
<string name="poi_photo">Fotografia</string>
<string name="poi_fuel:diesel">Dièsel</string>
<string name="poi_fuel:hgv_diesel">Gasoil de vehicles pesants</string>
<string name="poi_fuel:biodiesel">Gasoil biològic</string>
<string name="poi_fuel:octane_80">80 octans</string>
<string name="poi_fuel:octane_91">91 octans</string>
<string name="poi_fuel:octane_92">92 octans</string>
<string name="poi_fuel:octane_95">95 octans</string>
<string name="poi_fuel:octane_98">98 octans</string>
<string name="poi_fuel:octane_100">100 octans</string>
<string name="poi_fuel:ethanol">Etanol</string>
<string name="poi_fuel:methanol">Metanol</string>
<string name="poi_fuel:lh2">Hidrogen líquid</string>
<string name="poi_fuel:electricity">Electricitat</string>
<string name="poi_fuel_diesel">Dièsel</string>
<string name="poi_fuel_hgv_diesel">Gasoil de vehicles pesants</string>
<string name="poi_fuel_biodiesel">Gasoil biològic</string>
<string name="poi_fuel_octane_80">80 octans</string>
<string name="poi_fuel_octane_91">91 octans</string>
<string name="poi_fuel_octane_92">92 octans</string>
<string name="poi_fuel_octane_95">95 octans</string>
<string name="poi_fuel_octane_98">98 octans</string>
<string name="poi_fuel_octane_100">100 octans</string>
<string name="poi_fuel_ethanol">Etanol</string>
<string name="poi_fuel_methanol">Metanol</string>
<string name="poi_fuel_lh2">Hidrogen líquid</string>
<string name="poi_fuel_electricity">Electricitat</string>
<string name="poi_vehicle_ramp">Rampa per vehicles</string>
<string name="poi_compressed_air">Aire comprimit</string>
<string name="poi_public_transport_stop_position">Localització de parada de transport públic</string>
@ -434,16 +434,16 @@
<string name="poi_standpipe">Boca d\'incendis</string>
<string name="poi_water_works">Subministrament d\'aigua</string>
<string name="poi_fire_flapper">Xafa focs</string>
<string name="poi_fuel:e10">10% etanol</string>
<string name="poi_fuel:e20">20% etanol</string>
<string name="poi_fuel:e85">85% etanol</string>
<string name="poi_fuel:biogas">85% etanol</string>
<string name="poi_fuel:gtl_diesel">Gasoil extra</string>
<string name="poi_fuel:lpg">Gas liquat del petroli</string>
<string name="poi_fuel:cng">Gas natural comprimit</string>
<string name="poi_fuel:1_25">Benzina amb 1:25 d\'oli</string>
<string name="poi_fuel:1_50">Benzina amb 1:50 d\'oli</string>
<string name="poi_fuel:svo">Carburant d\'oli vegetal</string>
<string name="poi_fuel_e10">10% etanol</string>
<string name="poi_fuel_e20">20% etanol</string>
<string name="poi_fuel_e85">85% etanol</string>
<string name="poi_fuel_biogas">85% etanol</string>
<string name="poi_fuel_gtl_diesel">Gasoil extra</string>
<string name="poi_fuel_lpg">Gas liquat del petroli</string>
<string name="poi_fuel_cng">Gas natural comprimit</string>
<string name="poi_fuel_1_25">Benzina amb 1:25 d\'oli</string>
<string name="poi_fuel_1_50">Benzina amb 1:50 d\'oli</string>
<string name="poi_fuel_svo">Carburant d\'oli vegetal</string>
<string name="poi_railway_buffer_stop">Topall de via</string>
<string name="poi_industrial">Àrea industrial</string>
<string name="poi_meadow">Prat</string>

46
OsmAnd/res/values-cs/phrases.xml
View file

@ -321,29 +321,29 @@
<string name="poi_traffic_calming_rumble_strip">Hlukové pásy</string>
<string name="poi_traffic_calming_table">Plochý hrb</string>
<string name="poi_traffic_calming_choker">Zůžení</string>
<string name="poi_fuel:diesel">Nafta</string>
<string name="poi_fuel:gtl_diesel">Vysoce kvalitní nafta</string>
<string name="poi_fuel:hgv_diesel">Nafta (tlakový přívod)</string>
<string name="poi_fuel:biodiesel">Bionafta</string>
<string name="poi_fuel:lpg">LPG</string>
<string name="poi_fuel:octane_80">80 oktanů</string>
<string name="poi_fuel:octane_91">91 oktanů</string>
<string name="poi_fuel:octane_92">92 oktanů</string>
<string name="poi_fuel:octane_95">95 oktanů</string>
<string name="poi_fuel:octane_98">98 oktanů</string>
<string name="poi_fuel:octane_100">100 oktanů</string>
<string name="poi_fuel:cng">CNG - zemní plyn</string>
<string name="poi_fuel:1_25">1:25 palivo (olej:benzín)</string>
<string name="poi_fuel:1_50">1:50 palivo (olej:benzín)</string>
<string name="poi_fuel:ethanol">Etanol</string>
<string name="poi_fuel:methanol">Metanol</string>
<string name="poi_fuel:svo">Rostlinný olej</string>
<string name="poi_fuel:e10">E10 (10% Bioetanol)</string>
<string name="poi_fuel:e20">E20 (20% Etanol)</string>
<string name="poi_fuel:e85">E85 - (85% Etanol)</string>
<string name="poi_fuel:biogas">E85 - (85% Etanol)</string>
<string name="poi_fuel:lh2">Kapalný vodík</string>
<string name="poi_fuel:electricity">Nabíjení</string>
<string name="poi_fuel_diesel">Nafta</string>
<string name="poi_fuel_gtl_diesel">Vysoce kvalitní nafta</string>
<string name="poi_fuel_hgv_diesel">Nafta (tlakový přívod)</string>
<string name="poi_fuel_biodiesel">Bionafta</string>
<string name="poi_fuel_lpg">LPG</string>
<string name="poi_fuel_octane_80">80 oktanů</string>
<string name="poi_fuel_octane_91">91 oktanů</string>
<string name="poi_fuel_octane_92">92 oktanů</string>
<string name="poi_fuel_octane_95">95 oktanů</string>
<string name="poi_fuel_octane_98">98 oktanů</string>
<string name="poi_fuel_octane_100">100 oktanů</string>
<string name="poi_fuel_cng">CNG - zemní plyn</string>
<string name="poi_fuel_1_25">1:25 palivo (olej:benzín)</string>
<string name="poi_fuel_1_50">1:50 palivo (olej:benzín)</string>
<string name="poi_fuel_ethanol">Etanol</string>
<string name="poi_fuel_methanol">Metanol</string>
<string name="poi_fuel_svo">Rostlinný olej</string>
<string name="poi_fuel_e10">E10 (10% Bioetanol)</string>
<string name="poi_fuel_e20">E20 (20% Etanol)</string>
<string name="poi_fuel_e85">E85 - (85% Etanol)</string>
<string name="poi_fuel_biogas">E85 - (85% Etanol)</string>
<string name="poi_fuel_lh2">Kapalný vodík</string>
<string name="poi_fuel_electricity">Nabíjení</string>
<string name="poi_vehicle_ramp">Servisní rampa</string>
<string name="poi_compressed_air">Stlačený vzduch</string>
<string name="poi_motorcycle_parking">Motocyklové parkoviště</string>

46
OsmAnd/res/values-da/phrases.xml
View file

@ -736,29 +736,29 @@
<string name="poi_water">Vand</string>
<string name="poi_wood">Træ</string>
<string name="poi_landuse">Arealanvendelse</string>
<string name="poi_fuel:diesel">Diesel</string>
<string name="poi_fuel:gtl_diesel">GTL diesel</string>
<string name="poi_fuel:hgv_diesel">HGV diesel</string>
<string name="poi_fuel:biodiesel">Bio-diesel</string>
<string name="poi_fuel:lpg">LPG</string>
<string name="poi_fuel:octane_80">Oktan 80</string>
<string name="poi_fuel:octane_91">Oktan 91</string>
<string name="poi_fuel:octane_92">Oktan 92</string>
<string name="poi_fuel:octane_95">Oktan 95</string>
<string name="poi_fuel:octane_98">Oktan 98</string>
<string name="poi_fuel:octane_100">Oktan 100</string>
<string name="poi_fuel:cng">CNG</string>
<string name="poi_fuel:1_25">1:25 benzin</string>
<string name="poi_fuel:1_50">1:50 benzin</string>
<string name="poi_fuel:ethanol">Ethanol</string>
<string name="poi_fuel:methanol">Methanol</string>
<string name="poi_fuel:svo">SVO</string>
<string name="poi_fuel:e10">E10</string>
<string name="poi_fuel:e20">E20</string>
<string name="poi_fuel:e85">E85</string>
<string name="poi_fuel:biogas">E85</string>
<string name="poi_fuel:lh2">Flydende brint</string>
<string name="poi_fuel:electricity">Elektricitet</string>
<string name="poi_fuel_diesel">Diesel</string>
<string name="poi_fuel_gtl_diesel">GTL diesel</string>
<string name="poi_fuel_hgv_diesel">HGV diesel</string>
<string name="poi_fuel_biodiesel">Bio-diesel</string>
<string name="poi_fuel_lpg">LPG</string>
<string name="poi_fuel_octane_80">Oktan 80</string>
<string name="poi_fuel_octane_91">Oktan 91</string>
<string name="poi_fuel_octane_92">Oktan 92</string>
<string name="poi_fuel_octane_95">Oktan 95</string>
<string name="poi_fuel_octane_98">Oktan 98</string>
<string name="poi_fuel_octane_100">Oktan 100</string>
<string name="poi_fuel_cng">CNG</string>
<string name="poi_fuel_1_25">1:25 benzin</string>
<string name="poi_fuel_1_50">1:50 benzin</string>
<string name="poi_fuel_ethanol">Ethanol</string>
<string name="poi_fuel_methanol">Methanol</string>
<string name="poi_fuel_svo">SVO</string>
<string name="poi_fuel_e10">E10</string>
<string name="poi_fuel_e20">E20</string>
<string name="poi_fuel_e85">E85</string>
<string name="poi_fuel_biogas">E85</string>
<string name="poi_fuel_lh2">Flydende brint</string>
<string name="poi_fuel_electricity">Elektricitet</string>
<string name="poi_industrial">Industriområde</string>
<string name="poi_farmyard">Gårdsplads</string>
<string name="poi_meadow">Eng</string>

46
OsmAnd/res/values-de/phrases.xml
View file

@ -652,28 +652,28 @@
<string name="poi_medical_supply">Medizinische Versorgung</string>
<string name="poi_photo">Fotogeschäft</string>
<string name="poi_fuel:diesel">Diesel</string>
<string name="poi_fuel:gtl_diesel">GtL-Diesel</string>
<string name="poi_fuel:hgv_diesel">Lkw-Diesel</string>
<string name="poi_fuel:biodiesel">Biodiesel</string>
<string name="poi_fuel:lpg">Autogas</string>
<string name="poi_fuel:octane_80">80 Oktan</string>
<string name="poi_fuel:octane_91">91 Oktan</string>
<string name="poi_fuel:octane_92">92 Oktan</string>
<string name="poi_fuel:octane_95">95 Oktan</string>
<string name="poi_fuel:octane_98">98 Oktan</string>
<string name="poi_fuel:octane_100">100 Oktan</string>
<string name="poi_fuel:cng">Komprimiertes Erdgas</string>
<string name="poi_fuel:1_25">Kraftstoffgemisch 1:25</string>
<string name="poi_fuel:1_50">Kraftstoffgemisch 1:50</string>
<string name="poi_fuel:ethanol">Ethanol</string>
<string name="poi_fuel:methanol">Methanol</string>
<string name="poi_fuel:e10">E10</string>
<string name="poi_fuel:e20">E20</string>
<string name="poi_fuel:e85">E85</string>
<string name="poi_fuel:biogas">E85</string>
<string name="poi_fuel:lh2">Flüssigwasserstoff</string>
<string name="poi_fuel:electricity">Strom</string>
<string name="poi_fuel_diesel">Diesel</string>
<string name="poi_fuel_gtl_diesel">GtL-Diesel</string>
<string name="poi_fuel_hgv_diesel">Lkw-Diesel</string>
<string name="poi_fuel_biodiesel">Biodiesel</string>
<string name="poi_fuel_lpg">Autogas</string>
<string name="poi_fuel_octane_80">80 Oktan</string>
<string name="poi_fuel_octane_91">91 Oktan</string>
<string name="poi_fuel_octane_92">92 Oktan</string>
<string name="poi_fuel_octane_95">95 Oktan</string>
<string name="poi_fuel_octane_98">98 Oktan</string>
<string name="poi_fuel_octane_100">100 Oktan</string>
<string name="poi_fuel_cng">Komprimiertes Erdgas</string>
<string name="poi_fuel_1_25">Kraftstoffgemisch 1:25</string>
<string name="poi_fuel_1_50">Kraftstoffgemisch 1:50</string>
<string name="poi_fuel_ethanol">Ethanol</string>
<string name="poi_fuel_methanol">Methanol</string>
<string name="poi_fuel_e10">E10</string>
<string name="poi_fuel_e20">E20</string>
<string name="poi_fuel_e85">E85</string>
<string name="poi_fuel_biogas">E85</string>
<string name="poi_fuel_lh2">Flüssigwasserstoff</string>
<string name="poi_fuel_electricity">Strom</string>
<string name="poi_public_transport_stop_position">ÖPNV-Halteposition</string>
<string name="poi_railway_buffer_stop">Eisenbahnprellbock</string>
<string name="poi_junction">Kreuzung</string>
@ -720,7 +720,7 @@
<string name="poi_forest">Forstwald</string>
<string name="poi_reservoir">Reservoir</string>
<string name="poi_general_tourist_attraction_yes">Allgemeine Attraktion</string>
<string name="poi_fuel:svo">Bio-Kraftstoff</string>
<string name="poi_fuel_svo">Bio-Kraftstoff</string>
<string name="poi_training">Übungsgelände</string>
<string name="poi_quarter">Quartier</string>
<string name="poi_hunting_lodge">Jagdhütte</string>

46
OsmAnd/res/values-es-rAR/phrases.xml
View file

@ -171,29 +171,29 @@
<string name="poi_vehicle_inspection">Inspección de vehículos</string>
<string name="poi_car_wash">Lavadero de autos</string>
<string name="poi_fuel">Estación de servicio</string>
<string name="poi_fuel:diesel">Diésel</string>
<string name="poi_fuel:gtl_diesel">Diésel GTL</string>
<string name="poi_fuel:hgv_diesel">Diésel de vehículos pesados</string>
<string name="poi_fuel:biodiesel">Biodiésel</string>
<string name="poi_fuel:lpg">GPL</string>
<string name="poi_fuel:octane_80">80 octanos</string>
<string name="poi_fuel:octane_91">91 octanos</string>
<string name="poi_fuel:octane_92">92 octanos</string>
<string name="poi_fuel:octane_95">95 octanos</string>
<string name="poi_fuel:octane_98">98 octanos</string>
<string name="poi_fuel:octane_100">100 octanos</string>
<string name="poi_fuel:cng">GNC</string>
<string name="poi_fuel:1_25">Combustible 1:25</string>
<string name="poi_fuel:1_50">Combustible 1:50</string>
<string name="poi_fuel:ethanol">Etanol</string>
<string name="poi_fuel:methanol">Metanol</string>
<string name="poi_fuel:svo">SVO</string>
<string name="poi_fuel:e10">E10</string>
<string name="poi_fuel:e20">E20</string>
<string name="poi_fuel:e85">E85</string>
<string name="poi_fuel:biogas">Biogás</string>
<string name="poi_fuel:lh2">Hidrógeno líquido</string>
<string name="poi_fuel:electricity">Electricidad</string>
<string name="poi_fuel_diesel">Diésel</string>
<string name="poi_fuel_gtl_diesel">Diésel GTL</string>
<string name="poi_fuel_hgv_diesel">Diésel de vehículos pesados</string>
<string name="poi_fuel_biodiesel">Biodiésel</string>
<string name="poi_fuel_lpg">GPL</string>
<string name="poi_fuel_octane_80">80 octanos</string>
<string name="poi_fuel_octane_91">91 octanos</string>
<string name="poi_fuel_octane_92">92 octanos</string>
<string name="poi_fuel_octane_95">95 octanos</string>
<string name="poi_fuel_octane_98">98 octanos</string>
<string name="poi_fuel_octane_100">100 octanos</string>
<string name="poi_fuel_cng">GNC</string>
<string name="poi_fuel_1_25">Combustible 1:25</string>
<string name="poi_fuel_1_50">Combustible 1:50</string>
<string name="poi_fuel_ethanol">Etanol</string>
<string name="poi_fuel_methanol">Metanol</string>
<string name="poi_fuel_svo">SVO</string>
<string name="poi_fuel_e10">E10</string>
<string name="poi_fuel_e20">E20</string>
<string name="poi_fuel_e85">E85</string>
<string name="poi_fuel_biogas">Biogás</string>
<string name="poi_fuel_lh2">Hidrógeno líquido</string>
<string name="poi_fuel_electricity">Electricidad</string>
<string name="poi_charging_station">Estación de carga</string>
<string name="poi_vehicle_ramp">Rampa de vehículos</string>
<string name="poi_compressed_air">Aire comprimido</string>

46
OsmAnd/res/values-es/phrases.xml
View file

@ -121,13 +121,13 @@
<string name="poi_vehicle_inspection">Inspección de vehículos</string>
<string name="poi_car_wash">Lavadero de automóviles</string>
<string name="poi_fuel">Gasolinera</string>
<string name="poi_fuel:diesel">Diésel</string>
<string name="poi_fuel:gtl_diesel">Diésel GTL</string>
<string name="poi_fuel:biodiesel">Biodiésel</string>
<string name="poi_fuel:cng">GNC</string>
<string name="poi_fuel:methanol">Metanol</string>
<string name="poi_fuel:lh2">Hidrógeno líquido</string>
<string name="poi_fuel:electricity">Electricidad</string>
<string name="poi_fuel_diesel">Diésel</string>
<string name="poi_fuel_gtl_diesel">Diésel GTL</string>
<string name="poi_fuel_biodiesel">Biodiésel</string>
<string name="poi_fuel_cng">GNC</string>
<string name="poi_fuel_methanol">Metanol</string>
<string name="poi_fuel_lh2">Hidrógeno líquido</string>
<string name="poi_fuel_electricity">Electricidad</string>
<string name="poi_charging_station">Estación de carga</string>
<string name="poi_vehicle_ramp">Rampa de vehículos</string>
<string name="poi_compressed_air">Aire comprimido</string>
@ -410,14 +410,14 @@
<string name="poi_traffic_calming_rumble_strip">Banda sonora</string>
<string name="poi_traffic_calming_choker">Gargantilla</string>
<string name="poi_service_tyres">Neumáticos</string>
<string name="poi_fuel:octane_80">80 octanos</string>
<string name="poi_fuel:octane_91">91 octanos</string>
<string name="poi_fuel:octane_92">92 octanos</string>
<string name="poi_fuel:octane_95">95 octanos</string>
<string name="poi_fuel:octane_98">98 octanos</string>
<string name="poi_fuel:octane_100">100 octanos</string>
<string name="poi_fuel:1_25">Combustible 1:25</string>
<string name="poi_fuel:ethanol">Etanol</string>
<string name="poi_fuel_octane_80">80 octanos</string>
<string name="poi_fuel_octane_91">91 octanos</string>
<string name="poi_fuel_octane_92">92 octanos</string>
<string name="poi_fuel_octane_95">95 octanos</string>
<string name="poi_fuel_octane_98">98 octanos</string>
<string name="poi_fuel_octane_100">100 octanos</string>
<string name="poi_fuel_1_25">Combustible 1:25</string>
<string name="poi_fuel_ethanol">Etanol</string>
<string name="poi_parking_entrance">Entrada al aparcamiento</string>
<string name="poi_garages">Garajes</string>
@ -450,14 +450,14 @@
<string name="poi_traffic_calming_hump">Tope</string>
<string name="poi_traffic_calming_chicane">Chicana</string>
<string name="poi_traffic_calming_table">Plataforma elevada</string>
<string name="poi_fuel:hgv_diesel">Diésel de vehículos pesados</string>
<string name="poi_fuel:lpg">GPL</string>
<string name="poi_fuel:1_50">Combustible 1:50</string>
<string name="poi_fuel:svo">SVO</string>
<string name="poi_fuel:e10">E10</string>
<string name="poi_fuel:e20">E20</string>
<string name="poi_fuel:e85">E85</string>
<string name="poi_fuel:biogas">Biogás</string>
<string name="poi_fuel_hgv_diesel">Diésel de vehículos pesados</string>
<string name="poi_fuel_lpg">GPL</string>
<string name="poi_fuel_1_50">Combustible 1:50</string>
<string name="poi_fuel_svo">SVO</string>
<string name="poi_fuel_e10">E10</string>
<string name="poi_fuel_e20">E20</string>
<string name="poi_fuel_e85">E85</string>
<string name="poi_fuel_biogas">Biogás</string>
<string name="poi_railway_buffer_stop">Topera</string>
<string name="poi_aerialway_t_bar">Telesquí (T)</string>
<string name="poi_aerialway_j_bar">Telesquí (J)</string>

46
OsmAnd/res/values-fr/phrases.xml
View file

@ -710,20 +710,20 @@
<string name="poi_water">Eau</string>
<string name="poi_wood">Bois</string>
<string name="poi_allotments">Lotissement</string>
<string name="poi_fuel:octane_80">Octane 80</string>
<string name="poi_fuel:octane_91">Octane 91</string>
<string name="poi_fuel:octane_92">Octane 92</string>
<string name="poi_fuel:octane_95">Octane 95</string>
<string name="poi_fuel:octane_98">Octane 98</string>
<string name="poi_fuel:octane_100">Octane 100</string>
<string name="poi_fuel:ethanol">Éthanol</string>
<string name="poi_fuel:methanol">Méthanol</string>
<string name="poi_fuel:e85">E85</string>
<string name="poi_fuel:biogas">E85</string>
<string name="poi_fuel:e20">E20</string>
<string name="poi_fuel:lh2">Hydrogène liquide</string>
<string name="poi_fuel:electricity">Électricité</string>
<string name="poi_fuel:e10">E10</string>
<string name="poi_fuel_octane_80">Octane 80</string>
<string name="poi_fuel_octane_91">Octane 91</string>
<string name="poi_fuel_octane_92">Octane 92</string>
<string name="poi_fuel_octane_95">Octane 95</string>
<string name="poi_fuel_octane_98">Octane 98</string>
<string name="poi_fuel_octane_100">Octane 100</string>
<string name="poi_fuel_ethanol">Éthanol</string>
<string name="poi_fuel_methanol">Méthanol</string>
<string name="poi_fuel_e85">E85</string>
<string name="poi_fuel_biogas">E85</string>
<string name="poi_fuel_e20">E20</string>
<string name="poi_fuel_lh2">Hydrogène liquide</string>
<string name="poi_fuel_electricity">Électricité</string>
<string name="poi_fuel_e10">E10</string>
<string name="poi_farmyard">Cour de ferme</string>
<string name="poi_meadow">Prairie</string>
<string name="poi_recreation_ground">Terrain de jeu</string>
@ -731,15 +731,15 @@
<string name="poi_residential">Zone résidentielle</string>
<string name="poi_landuse">Occupation du sol</string>
<string name="poi_fuel:diesel">Gazole</string>
<string name="poi_fuel:gtl_diesel">Gazole liquéfié</string>
<string name="poi_fuel:hgv_diesel">Gazole poids lourds</string>
<string name="poi_fuel:biodiesel">Bio-gazole</string>
<string name="poi_fuel:lpg">GPL</string>
<string name="poi_fuel:cng">Gaz naturel compressé</string>
<string name="poi_fuel:1_25">Carburant 1:25</string>
<string name="poi_fuel:1_50">Carburant 1:50</string>
<string name="poi_fuel:svo">Huile Végétale Brute (HVB)</string>
<string name="poi_fuel_diesel">Gazole</string>
<string name="poi_fuel_gtl_diesel">Gazole liquéfié</string>
<string name="poi_fuel_hgv_diesel">Gazole poids lourds</string>
<string name="poi_fuel_biodiesel">Bio-gazole</string>
<string name="poi_fuel_lpg">GPL</string>
<string name="poi_fuel_cng">Gaz naturel compressé</string>
<string name="poi_fuel_1_25">Carburant 1:25</string>
<string name="poi_fuel_1_50">Carburant 1:50</string>
<string name="poi_fuel_svo">Huile Végétale Brute (HVB)</string>
<string name="poi_junction">Carrefour</string>
<string name="poi_forest">Sylviculture</string>
<string name="poi_landuse_railway">Zone de chemins de fer</string>

46
OsmAnd/res/values-ja/phrases.xml
View file

@ -260,29 +260,29 @@
<string name="poi_power_generator">発電機(Power generator)</string>
<string name="poi_landuse">土地利用(Landuse)</string>
<string name="poi_fuel:diesel">ディーゼル(Diesel)</string>
<string name="poi_fuel:gtl_diesel">GTLディーゼル(GTL diesel)</string>
<string name="poi_fuel:hgv_diesel">HGVディーゼル(HGV diesel)</string>
<string name="poi_fuel:biodiesel">バイオディーゼル(Bio diesel)</string>
<string name="poi_fuel:lpg">液化石油ガス</string>
<string name="poi_fuel:octane_80">オクタン価80(Octane 80)</string>
<string name="poi_fuel:octane_91">オクタン価91(Octane 91)</string>
<string name="poi_fuel:octane_92">オクタン価92(Octane 92)</string>
<string name="poi_fuel:octane_95">オクタン価95(Octane 95)</string>
<string name="poi_fuel:octane_98">オクタン価98(Octane 98)</string>
<string name="poi_fuel:octane_100">オクタン価100(Octane 100)</string>
<string name="poi_fuel:cng">圧縮天然ガス</string>
<string name="poi_fuel:1_25">混合油 1:25(1:25 fuel)</string>
<string name="poi_fuel:1_50">混合油 1:50(1:50 fuel)</string>
<string name="poi_fuel:ethanol">エタノール(Ethanol)</string>
<string name="poi_fuel:methanol">メタノール(Methanol)</string>
<string name="poi_fuel:svo">植物油(SVO)</string>
<string name="poi_fuel:e10">E10・バイオエタノール10％混合ガソリン(E10)</string>
<string name="poi_fuel:e20">E20・バイオエタノール20％混合ガソリン(E20)</string>
<string name="poi_fuel:e85">E85・バイオエタノール85％混合ガソリン(E85)</string>
<string name="poi_fuel:biogas">E85・バイオエタノール85％混合ガソリン(E85)</string>
<string name="poi_fuel:lh2">液体水素(Liquid hydrogen)</string>
<string name="poi_fuel:electricity">電気(Electricity)</string>
<string name="poi_fuel_diesel">ディーゼル(Diesel)</string>
<string name="poi_fuel_gtl_diesel">GTLディーゼル(GTL diesel)</string>
<string name="poi_fuel_hgv_diesel">HGVディーゼル(HGV diesel)</string>
<string name="poi_fuel_biodiesel">バイオディーゼル(Bio diesel)</string>
<string name="poi_fuel_lpg">液化石油ガス</string>
<string name="poi_fuel_octane_80">オクタン価80(Octane 80)</string>
<string name="poi_fuel_octane_91">オクタン価91(Octane 91)</string>
<string name="poi_fuel_octane_92">オクタン価92(Octane 92)</string>
<string name="poi_fuel_octane_95">オクタン価95(Octane 95)</string>
<string name="poi_fuel_octane_98">オクタン価98(Octane 98)</string>
<string name="poi_fuel_octane_100">オクタン価100(Octane 100)</string>
<string name="poi_fuel_cng">圧縮天然ガス</string>
<string name="poi_fuel_1_25">混合油 1:25(1:25 fuel)</string>
<string name="poi_fuel_1_50">混合油 1:50(1:50 fuel)</string>
<string name="poi_fuel_ethanol">エタノール(Ethanol)</string>
<string name="poi_fuel_methanol">メタノール(Methanol)</string>
<string name="poi_fuel_svo">植物油(SVO)</string>
<string name="poi_fuel_e10">E10・バイオエタノール10％混合ガソリン(E10)</string>
<string name="poi_fuel_e20">E20・バイオエタノール20％混合ガソリン(E20)</string>
<string name="poi_fuel_e85">E85・バイオエタノール85％混合ガソリン(E85)</string>
<string name="poi_fuel_biogas">E85・バイオエタノール85％混合ガソリン(E85)</string>
<string name="poi_fuel_lh2">液体水素(Liquid hydrogen)</string>
<string name="poi_fuel_electricity">電気(Electricity)</string>
<string name="poi_junction">ジャンクション(Junction)</string>
<string name="poi_rest_area">PA・SA(Rest area)</string>

46
OsmAnd/res/values-ko/phrases.xml
View file

@ -731,29 +731,29 @@
<string name="poi_water">수로</string>
<string name="poi_wood">나무</string>
<string name="poi_landuse">사유지</string>
<string name="poi_fuel:diesel">디젤</string>
<string name="poi_fuel:gtl_diesel">GTL 디젤</string>
<string name="poi_fuel:hgv_diesel">HGV 디젤</string>
<string name="poi_fuel:biodiesel">바이오 디젤</string>
<string name="poi_fuel:lpg">LPG</string>
<string name="poi_fuel:octane_80">옥탄가 80</string>
<string name="poi_fuel:octane_91">옥탄가 91</string>
<string name="poi_fuel:octane_92">옥탄가 92</string>
<string name="poi_fuel:octane_95">옥탄가 95</string>
<string name="poi_fuel:octane_98">옥탄가 98</string>
<string name="poi_fuel:octane_100">옥탄가 100</string>
<string name="poi_fuel:cng">압축천연가스(CNG)</string>
<string name="poi_fuel:1_25">혼합유 1:25</string>
<string name="poi_fuel:1_50">혼합유 1:50</string>
<string name="poi_fuel:ethanol">에탄올</string>
<string name="poi_fuel:methanol">메탄올</string>
<string name="poi_fuel:svo">식물성 기름</string>
<string name="poi_fuel:e10">E10</string>
<string name="poi_fuel:e20">E20</string>
<string name="poi_fuel:e85">E85</string>
<string name="poi_fuel:biogas">E85</string>
<string name="poi_fuel:lh2">액체 수소</string>
<string name="poi_fuel:electricity">전기</string>
<string name="poi_fuel_diesel">디젤</string>
<string name="poi_fuel_gtl_diesel">GTL 디젤</string>
<string name="poi_fuel_hgv_diesel">HGV 디젤</string>
<string name="poi_fuel_biodiesel">바이오 디젤</string>
<string name="poi_fuel_lpg">LPG</string>
<string name="poi_fuel_octane_80">옥탄가 80</string>
<string name="poi_fuel_octane_91">옥탄가 91</string>
<string name="poi_fuel_octane_92">옥탄가 92</string>
<string name="poi_fuel_octane_95">옥탄가 95</string>
<string name="poi_fuel_octane_98">옥탄가 98</string>
<string name="poi_fuel_octane_100">옥탄가 100</string>
<string name="poi_fuel_cng">압축천연가스(CNG)</string>
<string name="poi_fuel_1_25">혼합유 1:25</string>
<string name="poi_fuel_1_50">혼합유 1:50</string>
<string name="poi_fuel_ethanol">에탄올</string>
<string name="poi_fuel_methanol">메탄올</string>
<string name="poi_fuel_svo">식물성 기름</string>
<string name="poi_fuel_e10">E10</string>
<string name="poi_fuel_e20">E20</string>
<string name="poi_fuel_e85">E85</string>
<string name="poi_fuel_biogas">E85</string>
<string name="poi_fuel_lh2">액체 수소</string>
<string name="poi_fuel_electricity">전기</string>
<string name="poi_junction">접합</string>
<string name="poi_industrial">산업 분야</string>
<string name="poi_farmyard">농장 구내</string>

44
OsmAnd/res/values-nl/phrases.xml
View file

@ -696,28 +696,28 @@
<string name="poi_charity">Goede doelen-winkel</string>
<string name="poi_medical_supply">Medische artikelen</string>
<string name="poi_photo">Fotowinkel</string>
<string name="poi_fuel:diesel">Diesel</string>
<string name="poi_fuel:gtl_diesel">GTL-diesel</string>
<string name="poi_fuel:hgv_diesel">Vrachtauto-diesel</string>
<string name="poi_fuel:biodiesel">Biodiesel</string>
<string name="poi_fuel:lpg">LPG</string>
<string name="poi_fuel:octane_80">Octaan 80</string>
<string name="poi_fuel:octane_91">Octaan 91</string>
<string name="poi_fuel:octane_92">Octaan 92</string>
<string name="poi_fuel:octane_95">Octaan 95</string>
<string name="poi_fuel:octane_98">Octaan 98</string>
<string name="poi_fuel:octane_100">Octaan 100</string>
<string name="poi_fuel:cng">CNG</string>
<string name="poi_fuel:1_25">Mengsmering 1:25</string>
<string name="poi_fuel:1_50">Mengsmering 1:50</string>
<string name="poi_fuel:ethanol">Ethanol</string>
<string name="poi_fuel:methanol">Methanol</string>
<string name="poi_fuel:e10">E10</string>
<string name="poi_fuel:e20">E20</string>
<string name="poi_fuel:e85">E85</string>
<string name="poi_fuel:biogas">E85</string>
<string name="poi_fuel:lh2">Vloeibare waterstof</string>
<string name="poi_fuel:electricity">Elektriciteit</string>
<string name="poi_fuel_diesel">Diesel</string>
<string name="poi_fuel_gtl_diesel">GTL-diesel</string>
<string name="poi_fuel_hgv_diesel">Vrachtauto-diesel</string>
<string name="poi_fuel_biodiesel">Biodiesel</string>
<string name="poi_fuel_lpg">LPG</string>
<string name="poi_fuel_octane_80">Octaan 80</string>
<string name="poi_fuel_octane_91">Octaan 91</string>
<string name="poi_fuel_octane_92">Octaan 92</string>
<string name="poi_fuel_octane_95">Octaan 95</string>
<string name="poi_fuel_octane_98">Octaan 98</string>
<string name="poi_fuel_octane_100">Octaan 100</string>
<string name="poi_fuel_cng">CNG</string>
<string name="poi_fuel_1_25">Mengsmering 1:25</string>
<string name="poi_fuel_1_50">Mengsmering 1:50</string>
<string name="poi_fuel_ethanol">Ethanol</string>
<string name="poi_fuel_methanol">Methanol</string>
<string name="poi_fuel_e10">E10</string>
<string name="poi_fuel_e20">E20</string>
<string name="poi_fuel_e85">E85</string>
<string name="poi_fuel_biogas">E85</string>
<string name="poi_fuel_lh2">Vloeibare waterstof</string>
<string name="poi_fuel_electricity">Elektriciteit</string>
<string name="poi_junction">Kruising</string>
<string name="poi_rest_area">Snelweg-parkeerplaats</string>

46
OsmAnd/res/values-pl/phrases.xml
View file

@ -505,9 +505,9 @@
<string name="poi_accomodation">Noclegi</string>
<string name="poi_club">Klub</string>
<string name="poi_cafe_and_restaurant">Kawiarnia i restauracja</string>
<string name="poi_fuel:biodiesel">Biodiesel</string>
<string name="poi_fuel:lpg">LPG</string>
<string name="poi_fuel:cng">CNG</string>
<string name="poi_fuel_biodiesel">Biodiesel</string>
<string name="poi_fuel_lpg">LPG</string>
<string name="poi_fuel_cng">CNG</string>
<string name="poi_public_transport_stop_position">"Przystanek transportu publicznego"</string>
<string name="poi_halt">Przystanek kolejowy</string>
<string name="poi_rest_area">Miejsce odpoczynku</string>
@ -520,26 +520,26 @@
<string name="poi_craft">Rzemieślnik</string>
<string name="poi_seamark">Wodny</string>
<string name="poi_medical_supply">Artykuły medyczne</string>
<string name="poi_fuel:diesel">Olej napędowy</string>
<string name="poi_fuel:gtl_diesel">Modyfikowany olej napędowy</string>
<string name="poi_fuel:hgv_diesel">Ulepszony olej napędowy</string>
<string name="poi_fuel:octane_80">Benzyna 80 oktanów</string>
<string name="poi_fuel:octane_91">Benzyna 91 oktanów</string>
<string name="poi_fuel:octane_92">Benzyna 92 oktany</string>
<string name="poi_fuel:octane_95">Benzyna 95 oktanów</string>
<string name="poi_fuel:octane_98">Benzyna 98 oktanów</string>
<string name="poi_fuel:octane_100">Benzyna 100 oktanów</string>
<string name="poi_fuel:1_25">Paliwo 1:25</string>
<string name="poi_fuel:1_50">Paliwo 1:50</string>
<string name="poi_fuel:ethanol">Paliwo: etanol</string>
<string name="poi_fuel:methanol">Paliwo: metanol</string>
<string name="poi_fuel:svo">Paliwo: SVO (olej roślinny)</string>
<string name="poi_fuel:e10">Paliwo: E10</string>
<string name="poi_fuel:e20">Paliwo: E20</string>
<string name="poi_fuel:e85">Paliwo: E85</string>
<string name="poi_fuel:biogas">Paliwo: biogaz</string>
<string name="poi_fuel:lh2">Paliwo: ciekły wodór</string>
<string name="poi_fuel:electricity">Paliwo: elektryczność</string>
<string name="poi_fuel_diesel">Olej napędowy</string>
<string name="poi_fuel_gtl_diesel">Modyfikowany olej napędowy</string>
<string name="poi_fuel_hgv_diesel">Ulepszony olej napędowy</string>
<string name="poi_fuel_octane_80">Benzyna 80 oktanów</string>
<string name="poi_fuel_octane_91">Benzyna 91 oktanów</string>
<string name="poi_fuel_octane_92">Benzyna 92 oktany</string>
<string name="poi_fuel_octane_95">Benzyna 95 oktanów</string>
<string name="poi_fuel_octane_98">Benzyna 98 oktanów</string>
<string name="poi_fuel_octane_100">Benzyna 100 oktanów</string>
<string name="poi_fuel_1_25">Paliwo 1:25</string>
<string name="poi_fuel_1_50">Paliwo 1:50</string>
<string name="poi_fuel_ethanol">Paliwo: etanol</string>
<string name="poi_fuel_methanol">Paliwo: metanol</string>
<string name="poi_fuel_svo">Paliwo: SVO (olej roślinny)</string>
<string name="poi_fuel_e10">Paliwo: E10</string>
<string name="poi_fuel_e20">Paliwo: E20</string>
<string name="poi_fuel_e85">Paliwo: E85</string>
<string name="poi_fuel_biogas">Paliwo: biogaz</string>
<string name="poi_fuel_lh2">Paliwo: ciekły wodór</string>
<string name="poi_fuel_electricity">Paliwo: elektryczność</string>
<string name="poi_railway_buffer_stop">Ogranicznik kolejowy</string>
<string name="poi_junction">Skrzyżowanie</string>
<string name="poi_lock_gate">Zamknięta brama</string>

46
OsmAnd/res/values-pt-rBR/phrases.xml
View file

@ -132,7 +132,7 @@
<string name="poi_craft_carpet_layer">Colocador de carpete</string>
<string name="poi_department_store">Loja de departamento</string>
<string name="poi_electronics">Loja de eletrônicos</string>
<string name="poi_fuel:octane_80">Octano 80</string>
<string name="poi_fuel_octane_80">Octano 80</string>
<string name="poi_public_transport_platform_trolleybus">Ponto de trólebus</string>
<string name="poi_tableware">Loja de utensílios de mesa</string>
<string name="poi_ticket">Bilheteria</string>
@ -178,28 +178,28 @@
<string name="poi_vehicle_inspection">Inspeção veicular</string>
<string name="poi_car_wash">Lavagem de carro</string>
<string name="poi_fuel">Posto de combustível</string>
<string name="poi_fuel:diesel">Diesel</string>
<string name="poi_fuel:gtl_diesel">Diesel GPL</string>
<string name="poi_fuel:hgv_diesel">Diesel de veículos pesados</string>
<string name="poi_fuel:biodiesel">Biodiesel</string>
<string name="poi_fuel:lpg">GPL</string>
<string name="poi_fuel:octane_91">Octano 91</string>
<string name="poi_fuel:octane_92">Octano 92</string>
<string name="poi_fuel:octane_95">Octano 95</string>
<string name="poi_fuel:octane_98">Octano 98</string>
<string name="poi_fuel:octane_100">Octano 100</string>
<string name="poi_fuel:cng">GNV</string>
<string name="poi_fuel:1_25">Combustível 1:25</string>
<string name="poi_fuel:1_50">Combustível 1:50</string>
<string name="poi_fuel:ethanol">Etanol</string>
<string name="poi_fuel:methanol">Metanol</string>
<string name="poi_fuel:svo">OVD</string>
<string name="poi_fuel:e10">E10</string>
<string name="poi_fuel:e20">E20</string>
<string name="poi_fuel:e85">E85</string>
<string name="poi_fuel:biogas">Biogás</string>
<string name="poi_fuel:lh2">Hidrogênio líquido</string>
<string name="poi_fuel:electricity">Eletricidade</string>
<string name="poi_fuel_diesel">Diesel</string>
<string name="poi_fuel_gtl_diesel">Diesel GPL</string>
<string name="poi_fuel_hgv_diesel">Diesel de veículos pesados</string>
<string name="poi_fuel_biodiesel">Biodiesel</string>
<string name="poi_fuel_lpg">GPL</string>
<string name="poi_fuel_octane_91">Octano 91</string>
<string name="poi_fuel_octane_92">Octano 92</string>
<string name="poi_fuel_octane_95">Octano 95</string>
<string name="poi_fuel_octane_98">Octano 98</string>
<string name="poi_fuel_octane_100">Octano 100</string>
<string name="poi_fuel_cng">GNV</string>
<string name="poi_fuel_1_25">Combustível 1:25</string>
<string name="poi_fuel_1_50">Combustível 1:50</string>
<string name="poi_fuel_ethanol">Etanol</string>
<string name="poi_fuel_methanol">Metanol</string>
<string name="poi_fuel_svo">OVD</string>
<string name="poi_fuel_e10">E10</string>
<string name="poi_fuel_e20">E20</string>
<string name="poi_fuel_e85">E85</string>
<string name="poi_fuel_biogas">Biogás</string>
<string name="poi_fuel_lh2">Hidrogênio líquido</string>
<string name="poi_fuel_electricity">Eletricidade</string>
<string name="poi_charging_station">Eletroposto</string>
<string name="poi_vehicle_ramp">Rampa de veículo</string>
<string name="poi_compressed_air">Ar comprimido</string>

6
OsmAnd/res/values-ru/phrases.xml
View file

@ -710,9 +710,9 @@
<string name="poi_piste_ice_skate">Ледовый каток</string>
<string name="poi_piste_snow_park">Снежный парк</string>
<string name="poi_fuel:diesel">Дизель</string>
<string name="poi_fuel:ethanol">Этанол</string>
<string name="poi_fuel:methanol">Метанол</string>
<string name="poi_fuel_diesel">Дизель</string>
<string name="poi_fuel_ethanol">Этанол</string>
<string name="poi_fuel_methanol">Метанол</string>
<string name="poi_photo">Фото магазин</string>
<string name="poi_power">Энергетика</string>
<string name="poi_landuse">Землепользование</string>

18
OsmAnd/res/values-sc/phrases.xml
View file

@ -645,15 +645,15 @@
<string name="poi_piste_playground">Parcu giogos</string>
<string name="poi_car_sharing"/>
<string name="poi_photo">Butega de fotografia</string>
<string name="poi_fuel:diesel">Diesel</string>
<string name="poi_fuel:gtl_diesel">GTL diesel</string>
<string name="poi_fuel:hgv_diesel">HGV diesel</string>
<string name="poi_fuel:biodiesel">Bio diesel</string>
<string name="poi_fuel:lpg">LPG</string>
<string name="poi_fuel:ethanol">Etanolo</string>
<string name="poi_fuel:methanol">Metanolo</string>
<string name="poi_fuel:lh2">Idrògenu lìcuidu</string>
<string name="poi_fuel:electricity">Eletritzidade</string>
<string name="poi_fuel_diesel">Diesel</string>
<string name="poi_fuel_gtl_diesel">GTL diesel</string>
<string name="poi_fuel_hgv_diesel">HGV diesel</string>
<string name="poi_fuel_biodiesel">Bio diesel</string>
<string name="poi_fuel_lpg">LPG</string>
<string name="poi_fuel_ethanol">Etanolo</string>
<string name="poi_fuel_methanol">Metanolo</string>
<string name="poi_fuel_lh2">Idrògenu lìcuidu</string>
<string name="poi_fuel_electricity">Eletritzidade</string>
<string name="poi_rest_area">Logu de pasada</string>
<string name="poi_industrial">Àrea industriale</string>

46
OsmAnd/res/values-sk/phrases.xml
View file

@ -558,29 +558,29 @@
<string name="poi_traffic_calming_chicane">Šikana</string>
<string name="poi_traffic_calming_rumble_strip">Zvukový retardér</string>
<string name="poi_traffic_calming_choker">Zúženie ulice</string>
<string name="poi_fuel:diesel">Nafta</string>
<string name="poi_fuel:gtl_diesel">GTL nafta</string>
<string name="poi_fuel:hgv_diesel">Nafta pre nákladné autá</string>
<string name="poi_fuel:biodiesel">Bionafta</string>
<string name="poi_fuel:lpg">LPG</string>
<string name="poi_fuel:octane_80">80-oktánový benzín</string>
<string name="poi_fuel:octane_91">91-oktánový benzín</string>
<string name="poi_fuel:octane_92">92-oktánový benzín</string>
<string name="poi_fuel:octane_95">95-oktánový benzín</string>
<string name="poi_fuel:octane_98">98-oktánový benzín</string>
<string name="poi_fuel:octane_100">100-oktánový benzín</string>
<string name="poi_fuel:cng">CNG (Stlačený zemný plyn)</string>
<string name="poi_fuel:1_25">Benzín 1:25</string>
<string name="poi_fuel:1_50">Benzín 1:50</string>
<string name="poi_fuel:ethanol">Etanol</string>
<string name="poi_fuel:methanol">Metanol</string>
<string name="poi_fuel:svo">SVO</string>
<string name="poi_fuel:e10">E10</string>
<string name="poi_fuel:e20">E20</string>
<string name="poi_fuel:e85">E85</string>
<string name="poi_fuel:biogas">E85</string>
<string name="poi_fuel:lh2">Tekutý vodík</string>
<string name="poi_fuel:electricity">Elektrina</string>
<string name="poi_fuel_diesel">Nafta</string>
<string name="poi_fuel_gtl_diesel">GTL nafta</string>
<string name="poi_fuel_hgv_diesel">Nafta pre nákladné autá</string>
<string name="poi_fuel_biodiesel">Bionafta</string>
<string name="poi_fuel_lpg">LPG</string>
<string name="poi_fuel_octane_80">80-oktánový benzín</string>
<string name="poi_fuel_octane_91">91-oktánový benzín</string>
<string name="poi_fuel_octane_92">92-oktánový benzín</string>
<string name="poi_fuel_octane_95">95-oktánový benzín</string>
<string name="poi_fuel_octane_98">98-oktánový benzín</string>
<string name="poi_fuel_octane_100">100-oktánový benzín</string>
<string name="poi_fuel_cng">CNG (Stlačený zemný plyn)</string>
<string name="poi_fuel_1_25">Benzín 1:25</string>
<string name="poi_fuel_1_50">Benzín 1:50</string>
<string name="poi_fuel_ethanol">Etanol</string>
<string name="poi_fuel_methanol">Metanol</string>
<string name="poi_fuel_svo">SVO</string>
<string name="poi_fuel_e10">E10</string>
<string name="poi_fuel_e20">E20</string>
<string name="poi_fuel_e85">E85</string>
<string name="poi_fuel_biogas">E85</string>
<string name="poi_fuel_lh2">Tekutý vodík</string>
<string name="poi_fuel_electricity">Elektrina</string>
<string name="poi_junction">Križovatka</string>
<string name="poi_standpipe">Vodná pumpa</string>
<string name="poi_industrial">Priemyselná oblasť</string>

46
OsmAnd/res/values-zh-rTW/phrases.xml
View file

@ -172,29 +172,29 @@
<string name="poi_vehicle_inspection">車輛檢修</string>
<string name="poi_car_wash">洗車場</string>
<string name="poi_fuel">加油站</string>
<string name="poi_fuel:diesel">柴油</string>
<string name="poi_fuel:gtl_diesel">GTL 柴油</string>
<string name="poi_fuel:hgv_diesel">HGV 柴油</string>
<string name="poi_fuel:biodiesel">Bio 柴油</string>
<string name="poi_fuel:lpg">液化石油瓦斯</string>
<string name="poi_fuel:octane_80">80 無鉛汽油</string>
<string name="poi_fuel:octane_91">91 無鉛汽油</string>
<string name="poi_fuel:octane_92">92 無鉛汽油</string>
<string name="poi_fuel:octane_95">95 無鉛汽油</string>
<string name="poi_fuel:octane_98">98 無鉛汽油</string>
<string name="poi_fuel:octane_100">100 無鉛汽油</string>
<string name="poi_fuel:cng">壓縮天然氣</string>
<string name="poi_fuel:1_25">1:25 混合油</string>
<string name="poi_fuel:1_50">1:50 混合油</string>
<string name="poi_fuel:ethanol">乙醇</string>
<string name="poi_fuel:methanol">甲醇</string>
<string name="poi_fuel:svo">植物油</string>
<string name="poi_fuel:e10">混合配方油 E10</string>
<string name="poi_fuel:e20">混合配方油 E20</string>
<string name="poi_fuel:e85">混合配方油 E85</string>
<string name="poi_fuel:biogas">混合配方油 E85</string>
<string name="poi_fuel:lh2">液態氫</string>
<string name="poi_fuel:electricity">電力</string>
<string name="poi_fuel_diesel">柴油</string>
<string name="poi_fuel_gtl_diesel">GTL 柴油</string>
<string name="poi_fuel_hgv_diesel">HGV 柴油</string>
<string name="poi_fuel_biodiesel">Bio 柴油</string>
<string name="poi_fuel_lpg">液化石油瓦斯</string>
<string name="poi_fuel_octane_80">80 無鉛汽油</string>
<string name="poi_fuel_octane_91">91 無鉛汽油</string>
<string name="poi_fuel_octane_92">92 無鉛汽油</string>
<string name="poi_fuel_octane_95">95 無鉛汽油</string>
<string name="poi_fuel_octane_98">98 無鉛汽油</string>
<string name="poi_fuel_octane_100">100 無鉛汽油</string>
<string name="poi_fuel_cng">壓縮天然氣</string>
<string name="poi_fuel_1_25">1:25 混合油</string>
<string name="poi_fuel_1_50">1:50 混合油</string>
<string name="poi_fuel_ethanol">乙醇</string>
<string name="poi_fuel_methanol">甲醇</string>
<string name="poi_fuel_svo">植物油</string>
<string name="poi_fuel_e10">混合配方油 E10</string>
<string name="poi_fuel_e20">混合配方油 E20</string>
<string name="poi_fuel_e85">混合配方油 E85</string>
<string name="poi_fuel_biogas">混合配方油 E85</string>
<string name="poi_fuel_lh2">液態氫</string>
<string name="poi_fuel_electricity">電力</string>
<string name="poi_charging_station">充電站</string>
<string name="poi_vehicle_ramp">車輛斜坡</string>
<string name="poi_compressed_air">壓縮空氣</string>

46
OsmAnd/res/values/phrases.xml
View file

@ -173,29 +173,29 @@
<string name="poi_vehicle_inspection">Vehicle inspection</string>
<string name="poi_car_wash">Car wash</string>
<string name="poi_fuel">Gas station</string>
<string name="poi_fuel:diesel">Diesel</string>
<string name="poi_fuel:gtl_diesel">GTL diesel</string>
<string name="poi_fuel:hgv_diesel">HGV diesel</string>
<string name="poi_fuel:biodiesel">Bio diesel</string>
<string name="poi_fuel:lpg">LPG</string>
<string name="poi_fuel:octane_80">Octane 80</string>
<string name="poi_fuel:octane_91">Octane 91</string>
<string name="poi_fuel:octane_92">Octane 92</string>
<string name="poi_fuel:octane_95">Octane 95</string>
<string name="poi_fuel:octane_98">Octane 98</string>
<string name="poi_fuel:octane_100">Octane 100</string>
<string name="poi_fuel:cng">CNG</string>
<string name="poi_fuel:1_25">1:25 fuel</string>
<string name="poi_fuel:1_50">1:50 fuel</string>
<string name="poi_fuel:ethanol">Ethanol</string>
<string name="poi_fuel:methanol">Methanol</string>
<string name="poi_fuel:svo">SVO</string>
<string name="poi_fuel:e10">E10</string>
<string name="poi_fuel:e20">E20</string>
<string name="poi_fuel:e85">E85</string>
<string name="poi_fuel:biogas">E85</string>
<string name="poi_fuel:lh2">Liquid hydrogen</string>
<string name="poi_fuel:electricity">Electricity</string>
<string name="poi_fuel_diesel">Diesel</string>
<string name="poi_fuel_gtl_diesel">GTL diesel</string>
<string name="poi_fuel_hgv_diesel">HGV diesel</string>
<string name="poi_fuel_biodiesel">Bio diesel</string>
<string name="poi_fuel_lpg">LPG</string>
<string name="poi_fuel_octane_80">Octane 80</string>
<string name="poi_fuel_octane_91">Octane 91</string>
<string name="poi_fuel_octane_92">Octane 92</string>
<string name="poi_fuel_octane_95">Octane 95</string>
<string name="poi_fuel_octane_98">Octane 98</string>
<string name="poi_fuel_octane_100">Octane 100</string>
<string name="poi_fuel_cng">CNG</string>
<string name="poi_fuel_1_25">1:25 fuel</string>
<string name="poi_fuel_1_50">1:50 fuel</string>
<string name="poi_fuel_ethanol">Ethanol</string>
<string name="poi_fuel_methanol">Methanol</string>
<string name="poi_fuel_svo">SVO</string>
<string name="poi_fuel_e10">E10</string>
<string name="poi_fuel_e20">E20</string>
<string name="poi_fuel_e85">E85</string>
<string name="poi_fuel_biogas">E85</string>
<string name="poi_fuel_lh2">Liquid hydrogen</string>
<string name="poi_fuel_electricity">Electricity</string>
<string name="poi_charging_station">Charging station</string>
<string name="poi_vehicle_ramp">Vehicle ramp</string>
<string name="poi_compressed_air">Compressed air</string>

4
OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java
View file

@ -18,7 +18,7 @@ import net.osmand.osm.PoiType;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.poi.PoiFiltersHelper;
import net.osmand.plus.poi.PoiLegacyFilter;
import net.osmand.plus.poi.PoiUIFilter;
import net.osmand.util.Algorithms;
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
@ -43,7 +43,7 @@ import android.widget.TextView;
*/
public class EditPOIFilterActivity extends OsmandListActivity {
public static final String AMENITY_FILTER = "net.osmand.amenity_filter"; //$NON-NLS-1$
private PoiLegacyFilter filter;
private PoiUIFilter filter;
private PoiFiltersHelper helper;
private static final int FILTER = 2;
public static final int EDIT_ACTIVITY_RESULT_OK = 20;

2
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -40,7 +40,7 @@ import net.osmand.plus.base.MapViewTrackingUtilities;
import net.osmand.plus.dashboard.DashboardOnMap;
import net.osmand.plus.helpers.GpxImportHelper;
import net.osmand.plus.helpers.WakeLockHelper;
import net.osmand.plus.poi.PoiLegacyFilter;
import net.osmand.plus.poi.PoiUIFilter;
import net.osmand.plus.render.RendererRegistry;
import net.osmand.plus.resources.ResourceManager;
import net.osmand.plus.routing.RoutingHelper;

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

@ -26,7 +26,7 @@ import net.osmand.plus.SQLiteTileSource;
import net.osmand.plus.activities.search.SearchActivity;
import net.osmand.plus.helpers.GpxUiHelper;
import net.osmand.plus.poi.PoiFiltersHelper;
import net.osmand.plus.poi.PoiLegacyFilter;
import net.osmand.plus.poi.PoiUIFilter;
import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
import net.osmand.plus.render.MapVectorLayer;
import net.osmand.plus.render.RenderingIcons;
@ -245,14 +245,14 @@ public class MapActivityLayers {
}
public AlertDialog selectPOIFilterLayer(final OsmandMapTileView mapView, final PoiLegacyFilter[] selected){
public AlertDialog selectPOIFilterLayer(final OsmandMapTileView mapView, final PoiUIFilter[] selected){
OsmandApplication app = (OsmandApplication) getApplication();
final PoiFiltersHelper poiFilters = app.getPoiFilters();
final ContextMenuAdapter adapter = new ContextMenuAdapter(activity);
adapter.item(R.string.shared_string_search).iconColor(R.drawable.ic_action_search_dark).reg();
final List<PoiLegacyFilter> list = new ArrayList<PoiLegacyFilter>();
final List<PoiUIFilter> list = new ArrayList<PoiUIFilter>();
list.add(poiFilters.getCustomPOIFilter());
for (PoiLegacyFilter f : poiFilters.getTopDefinedPoiFilters()) {
for (PoiUIFilter f : poiFilters.getTopDefinedPoiFilters()) {
addFilterToList(adapter, list, f);
}
@ -261,9 +261,9 @@ public class MapActivityLayers {
builder.setAdapter(listAdapter, new DialogInterface.OnClickListener(){
@Override
public void onClick(DialogInterface dialog, int which) {
PoiLegacyFilter pf = list.get(which);
PoiUIFilter pf = list.get(which);
String filterId = pf.getFilterId();
if(filterId.equals(PoiLegacyFilter.CUSTOM_FILTER_ID)){
if(filterId.equals(PoiUIFilter.CUSTOM_FILTER_ID)){
Intent search = new Intent(activity, SearchActivity.class);
search.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
activity.getMyApplication().getSettings().SEARCH_TAB.set(SearchActivity.POI_TAB_INDEX);
@ -286,7 +286,7 @@ public class MapActivityLayers {
return builder.show();
}
private void addFilterToList(final ContextMenuAdapter adapter, final List<PoiLegacyFilter> list, PoiLegacyFilter f) {
private void addFilterToList(final ContextMenuAdapter adapter, final List<PoiUIFilter> list, PoiUIFilter f) {
list.add(f);
Item it = adapter.item(f.getName());
if (RenderingIcons.containsBigIcon(f.getSimplifiedId())) {

20
OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
View file

@ -36,8 +36,8 @@ import net.osmand.plus.activities.OsmandListActivity;
import net.osmand.plus.dashboard.DashLocationFragment;
import net.osmand.plus.dialogs.DirectionsDialogs;
import net.osmand.plus.poi.NominatimPoiFilter;
import net.osmand.plus.poi.PoiLegacyFilter;
import net.osmand.plus.poi.PoiLegacyFilter.AmenityNameFilter;
import net.osmand.plus.poi.PoiUIFilter;
import net.osmand.plus.poi.PoiUIFilter.AmenityNameFilter;
import net.osmand.plus.render.RenderingIcons;
import net.osmand.plus.views.DirectionDrawable;
import net.osmand.plus.views.POIMapLayer;
@ -101,7 +101,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
private static final int SAVE_FILTER = 6;
private PoiLegacyFilter filter;
private PoiUIFilter filter;
private AmenityAdapter amenityAdapter;
private EditText searchFilter;
private View searchFilterLayout;
@ -338,13 +338,13 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
IconsCache iconsCache = getMyApplication().getIconsCache();
final PopupMenu optionsMenu = new PopupMenu(this, v);
final PoiLegacyFilter f = this.filter;
final PoiUIFilter f = this.filter;
MenuItem item = optionsMenu.getMenu().add(R.string.shared_string_edit)
.setIcon(iconsCache.getContentIcon(R.drawable.ic_action_edit_dark));
item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
PoiLegacyFilter custom = getMyApplication().getPoiFilters().getCustomPOIFilter();
PoiUIFilter custom = getMyApplication().getPoiFilters().getCustomPOIFilter();
custom.updateTypesToAccept(f);
showEditActivity(custom);
return true;
@ -356,8 +356,10 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
if(poiAdditionals != null) {
TreeMap<String, PoiType> adds = new TreeMap<String, PoiType>();
for(PoiType vtype : poiAdditionals.values()) {
if(vtype.isTopVisible()) {
adds.put(vtype.getTranslation().replace(' ', ':').toLowerCase(), vtype);
}
}
for(String vtype : adds.keySet()) {
addFilter(optionsMenu, vtype);
}
@ -382,7 +384,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
});
}
private void showEditActivity(PoiLegacyFilter poi) {
private void showEditActivity(PoiUIFilter poi) {
Intent newIntent = new Intent(this, EditPOIFilterActivity.class);
// folder selected
newIntent.putExtra(EditPOIFilterActivity.AMENITY_FILTER, poi.getFilterId());
@ -399,7 +401,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == RESULT_REQUEST_CODE && resultCode == EditPOIFilterActivity.EDIT_ACTIVITY_RESULT_OK) {
PoiLegacyFilter custom = app.getPoiFilters().getCustomPOIFilter();
PoiUIFilter custom = app.getPoiFilters().getCustomPOIFilter();
if (this.filter.isStandardFilter()) {
this.filter = custom;
if (!Algorithms.isEmpty(searchFilter.getText().toString())) {
@ -462,7 +464,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
}
public boolean isOfflineSearchByNameFilter() {
return filter != null && PoiLegacyFilter.BY_NAME_FILTER_ID.equals(filter.getFilterId());
return filter != null && PoiUIFilter.BY_NAME_FILTER_ID.equals(filter.getFilterId());
}
public boolean isNameSearch() {
@ -922,7 +924,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
builder.setPositiveButton(R.string.shared_string_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
PoiLegacyFilter nFilter = new PoiLegacyFilter(editText.getText().toString(),
PoiUIFilter nFilter = new PoiUIFilter(editText.getText().toString(),
null,
filter.getAcceptedTypes(), (OsmandApplication) getApplication());
if(searchFilter.getText().toString().length() > 0) {

24
OsmAnd/src/net/osmand/plus/activities/search/SearchPoiFilterFragment.java
View file

@ -21,7 +21,7 @@ import net.osmand.plus.activities.OsmAndListFragment;
import net.osmand.plus.activities.search.SearchActivity.SearchActivityChild;
import net.osmand.plus.poi.NominatimPoiFilter;
import net.osmand.plus.poi.PoiFiltersHelper;
import net.osmand.plus.poi.PoiLegacyFilter;
import net.osmand.plus.poi.PoiUIFilter;
import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
import net.osmand.plus.render.RenderingIcons;
import net.osmand.plus.resources.ResourceManager;
@ -125,7 +125,7 @@ public class SearchPoiFilterFragment extends OsmAndListFragment implements Searc
if (Algorithms.isEmpty(s)) {
filters.addAll(poiFilters.getTopDefinedPoiFilters());
} else {
for(PoiLegacyFilter pf : poiFilters.getTopDefinedPoiFilters()) {
for(PoiUIFilter pf : poiFilters.getTopDefinedPoiFilters()) {
if(!pf.isStandardFilter() && pf.getName().toLowerCase().startsWith(s.toLowerCase())) {
filters.add(pf);
}
@ -177,9 +177,9 @@ public class SearchPoiFilterFragment extends OsmAndListFragment implements Searc
AccessibleToast.makeText(getActivity(), R.string.data_to_search_poi_not_available, Toast.LENGTH_LONG);
return;
}
if (item instanceof PoiLegacyFilter) {
PoiLegacyFilter model = ((PoiLegacyFilter) item);
if (PoiLegacyFilter.BY_NAME_FILTER_ID.equals(model.getFilterId())
if (item instanceof PoiUIFilter) {
PoiUIFilter model = ((PoiUIFilter) item);
if (PoiUIFilter.BY_NAME_FILTER_ID.equals(model.getFilterId())
|| model instanceof NominatimPoiFilter) {
model.setFilterByName(searchEditText.getText().toString());
} else {
@ -187,9 +187,13 @@ public class SearchPoiFilterFragment extends OsmAndListFragment implements Searc
}
showFilterActivity(model.getFilterId());
} else {
PoiLegacyFilter custom = getApp().getPoiFilters().getFilterById(PoiLegacyFilter.STD_PREFIX + ((AbstractPoiType) item).getKeyName());
PoiUIFilter custom = getApp().getPoiFilters().getFilterById(PoiUIFilter.STD_PREFIX + ((AbstractPoiType) item).getKeyName());
if(custom != null) {
if(item instanceof PoiType && ((PoiType) item).isAdditional()) {
// it is already set
} else {
custom.setFilterByName(null);
}
custom.updateTypesToAccept(((AbstractPoiType) item));
showFilterActivity(custom.getFilterId());
}
@ -248,11 +252,11 @@ public class SearchPoiFilterFragment extends OsmAndListFragment implements Searc
ImageView icon = (ImageView) row.findViewById(R.id.folder_icon);
Object item = getItem(position);
String name;
if (item instanceof PoiLegacyFilter) {
final PoiLegacyFilter model = (PoiLegacyFilter) item;
if (item instanceof PoiUIFilter) {
final PoiUIFilter model = (PoiUIFilter) item;
if (RenderingIcons.containsBigIcon(model.getSimplifiedId())) {
icon.setImageDrawable(RenderingIcons.getBigIcon(getActivity(), model.getSimplifiedId()));
} else if(PoiLegacyFilter.BY_NAME_FILTER_ID.equals(model.getFilterId()) ||
} else if(PoiUIFilter.BY_NAME_FILTER_ID.equals(model.getFilterId()) ||
model instanceof NominatimPoiFilter){
icon.setImageResource(R.drawable.mx_name_finder);
} else {
@ -288,7 +292,7 @@ public class SearchPoiFilterFragment extends OsmAndListFragment implements Searc
item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
PoiLegacyFilter filter = getApp().getPoiFilters().getCustomPOIFilter();
PoiUIFilter filter = getApp().getPoiFilters().getCustomPOIFilter();
filter.clearFilter();
showFilterActivity(filter.getFilterId());
return true;

4
OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
View file

@ -21,7 +21,7 @@ import net.osmand.plus.activities.PluginActivity;
import net.osmand.plus.activities.SettingsActivity;
import net.osmand.plus.activities.TransportRouteHelper;
import net.osmand.plus.dashboard.DashboardOnMap.DashboardType;
import net.osmand.plus.poi.PoiLegacyFilter;
import net.osmand.plus.poi.PoiUIFilter;
import net.osmand.plus.rastermaps.OsmandRasterMapsPlugin;
import net.osmand.plus.render.RendererRegistry;
import net.osmand.plus.views.OsmandMapTileView;
@ -149,7 +149,7 @@ public class ConfigureMapMenu {
}
protected void selectPOILayer(final OsmandSettings settings) {
final PoiLegacyFilter[] selected = new PoiLegacyFilter[1];
final PoiUIFilter[] selected = new PoiUIFilter[1];
AlertDialog dlg = ma.getMapLayers().selectPOIFilterLayer(ma.getMapView(), selected);
dlg.setOnDismissListener(new DialogInterface.OnDismissListener() {

8
OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
View file

@ -13,7 +13,7 @@ import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.helpers.WaypointHelper.LocationPointWrapper;
import net.osmand.plus.poi.PoiLegacyFilter;
import net.osmand.plus.poi.PoiUIFilter;
import net.osmand.plus.views.AnimateDraggingMapThread;
import net.osmand.util.MapUtils;
import android.app.Activity;
@ -219,7 +219,7 @@ public class WaypointDialogHelper {
running[0] = position;
thisAdapter.notifyDataSetInvalidated();
MapActivity map = (MapActivity) ctx;
final PoiLegacyFilter[] selected = new PoiLegacyFilter[1];
final PoiUIFilter[] selected = new PoiUIFilter[1];
AlertDialog dlg = map.getMapLayers().selectPOIFilterLayer(map.getMapView(), selected);
dlg.setOnDismissListener(new OnDismissListener() {
@Override
@ -238,9 +238,9 @@ public class WaypointDialogHelper {
private void selectPoi(final int[] running, final ArrayAdapter<Object> listAdapter, final int type,
final boolean enable, Activity ctx) {
if (ctx instanceof MapActivity &&
!PoiLegacyFilter.CUSTOM_FILTER_ID.equals(app.getSettings().SELECTED_POI_FILTER_FOR_MAP.get())) {
!PoiUIFilter.CUSTOM_FILTER_ID.equals(app.getSettings().SELECTED_POI_FILTER_FOR_MAP.get())) {
MapActivity map = (MapActivity) ctx;
final PoiLegacyFilter[] selected = new PoiLegacyFilter[1];
final PoiUIFilter[] selected = new PoiUIFilter[1];
AlertDialog dlg = map.getMapLayers().selectPOIFilterLayer(map.getMapView(), selected);
dlg.setOnDismissListener(new OnDismissListener() {

6
OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
View file

@ -27,7 +27,7 @@ import net.osmand.plus.R;
import net.osmand.plus.TargetPointsHelper.TargetPoint;
import net.osmand.plus.activities.IntermediatePointsDialog;
import net.osmand.plus.base.FavoriteImageDrawable;
import net.osmand.plus.poi.PoiLegacyFilter;
import net.osmand.plus.poi.PoiUIFilter;
import net.osmand.plus.render.RenderingIcons;
import net.osmand.plus.routing.AlarmInfo;
import net.osmand.plus.routing.AlarmInfo.AlarmInfoType;
@ -524,7 +524,7 @@ public class WaypointHelper {
protected void calculatePoi(RouteCalculationResult route, List<LocationPointWrapper> locationPoints) {
PoiLegacyFilter pf = getPoiFilter();
PoiUIFilter pf = getPoiFilter();
if (pf != null) {
final List<Location> locs = route.getImmutableAllLocations();
List<Amenity> amenities = pf.searchAmenitiesOnThePath(locs, poiSearchDeviationRadius);
@ -591,7 +591,7 @@ public class WaypointHelper {
///
public PoiLegacyFilter getPoiFilter() {
public PoiUIFilter getPoiFilter() {
return app.getPoiFilters().getFilterById(app.getSettings().SELECTED_POI_FILTER_FOR_MAP.get());
}
public boolean showPOI() {

2
OsmAnd/src/net/osmand/plus/osmedit/EditingPOIDialogProvider.java
View file

@ -108,7 +108,7 @@ public class EditingPOIDialogProvider implements DialogProvider {
private void prepareProvider() {
poiTypes = ((OsmandApplication) activity.getApplication()).getPoiTypes();
allTranslatedSubTypes = poiTypes.getAllTranslatedNames(false);
allTranslatedSubTypes = poiTypes.getAllTranslatedNames();
settings = ((OsmandApplication) activity.getApplication()).getSettings();
isLocalEdit = true;
if (settings.OFFLINE_EDITION.get() || !settings.isInternetConnectionAvailable(true)) {

2
OsmAnd/src/net/osmand/plus/poi/NominatimPoiFilter.java
View file

@ -23,7 +23,7 @@ import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
public class NominatimPoiFilter extends PoiLegacyFilter {
public class NominatimPoiFilter extends PoiUIFilter {
private static final String FILTER_ID = "name_finder"; //$NON-NLS-1$
private static final Log log = PlatformUtil.getLog(NominatimPoiFilter.class);

105
OsmAnd/src/net/osmand/plus/poi/PoiFiltersHelper.java
View file

@ -30,10 +30,10 @@ public class PoiFiltersHelper {
private NominatimPoiFilter nominatimPOIFilter;
private NominatimPoiFilter nominatimAddresFilter;
private PoiLegacyFilter searchByNamePOIFilter;
private PoiLegacyFilter customPOIFilter;
private PoiLegacyFilter showAllPOIFilter;
private List<PoiLegacyFilter> cacheTopStandardFilters;
private PoiUIFilter searchByNamePOIFilter;
private PoiUIFilter customPOIFilter;
private PoiUIFilter showAllPOIFilter;
private List<PoiUIFilter> cacheTopStandardFilters;
private static final String UDF_CAR_AID = "car_aid";
private static final String UDF_FOR_TOURISTS = "for_tourists";
@ -69,28 +69,28 @@ public class PoiFiltersHelper {
return nominatimAddresFilter;
}
public PoiLegacyFilter getSearchByNamePOIFilter() {
public PoiUIFilter getSearchByNamePOIFilter() {
if(searchByNamePOIFilter == null){
PoiLegacyFilter filter = new SearchByNameFilter(application);
PoiUIFilter filter = new SearchByNameFilter(application);
filter.setStandardFilter(true);
searchByNamePOIFilter = filter;
}
return searchByNamePOIFilter;
}
public PoiLegacyFilter getCustomPOIFilter() {
public PoiUIFilter getCustomPOIFilter() {
if(customPOIFilter == null){
PoiLegacyFilter filter = new PoiLegacyFilter(application.getString(R.string.poi_filter_custom_filter),
PoiLegacyFilter.CUSTOM_FILTER_ID, new LinkedHashMap<PoiCategory, LinkedHashSet<String>>(), application); //$NON-NLS-1$
PoiUIFilter filter = new PoiUIFilter(application.getString(R.string.poi_filter_custom_filter),
PoiUIFilter.CUSTOM_FILTER_ID, new LinkedHashMap<PoiCategory, LinkedHashSet<String>>(), application); //$NON-NLS-1$
filter.setStandardFilter(true);
customPOIFilter = filter;
}
return customPOIFilter;
}
public PoiLegacyFilter getShowAllPOIFilter() {
public PoiUIFilter getShowAllPOIFilter() {
if(showAllPOIFilter == null){
PoiLegacyFilter filter = new PoiLegacyFilter(null, application); //$NON-NLS-1$
PoiUIFilter filter = new PoiUIFilter(null, application); //$NON-NLS-1$
filter.setStandardFilter(true);
showAllPOIFilter = filter;
}
@ -98,8 +98,8 @@ public class PoiFiltersHelper {
}
private PoiLegacyFilter getFilterById(String filterId, PoiLegacyFilter... filters){
for(PoiLegacyFilter pf : filters) {
private PoiUIFilter getFilterById(String filterId, PoiUIFilter... filters){
for(PoiUIFilter pf : filters) {
if(pf.getFilterId().equals(filterId)){
return pf;
}
@ -107,26 +107,35 @@ public class PoiFiltersHelper {
return null;
}
public PoiLegacyFilter getFilterById(String filterId){
public PoiUIFilter getFilterById(String filterId){
if(filterId == null){
return null;
}
for(PoiLegacyFilter f : getTopDefinedPoiFilters()) {
for(PoiUIFilter f : getTopDefinedPoiFilters()) {
if(f.getFilterId().equals(filterId)){
return f;
}
}
PoiLegacyFilter ff = getFilterById(filterId, getCustomPOIFilter(), getSearchByNamePOIFilter(),
PoiUIFilter ff = getFilterById(filterId, getCustomPOIFilter(), getSearchByNamePOIFilter(),
getShowAllPOIFilter(), getNominatimPOIFilter(), getNominatimAddressFilter());
if (ff != null) {
return ff;
}
if(filterId.startsWith(PoiLegacyFilter.STD_PREFIX)) {
String typeId = filterId.substring(PoiLegacyFilter.STD_PREFIX.length());
if(filterId.startsWith(PoiUIFilter.STD_PREFIX)) {
String typeId = filterId.substring(PoiUIFilter.STD_PREFIX.length());
AbstractPoiType tp = application.getPoiTypes().getAnyPoiTypeByKey(typeId);
if(tp != null) {
PoiLegacyFilter lf = new PoiLegacyFilter(tp, application);
ArrayList<PoiLegacyFilter> copy = new ArrayList<PoiLegacyFilter>(cacheTopStandardFilters);
PoiUIFilter lf = new PoiUIFilter(tp, application);
ArrayList<PoiUIFilter> copy = new ArrayList<PoiUIFilter>(cacheTopStandardFilters);
copy.add(lf);
sortListOfFilters(copy);
cacheTopStandardFilters = copy;
return lf;
}
AbstractPoiType lt = application.getPoiTypes().getAnyPoiAdditionalTypeByKey(typeId);
if(lt != null) {
PoiUIFilter lf = new PoiUIFilter(lt, application);
ArrayList<PoiUIFilter> copy = new ArrayList<PoiUIFilter>(cacheTopStandardFilters);
copy.add(lf);
sortListOfFilters(copy);
cacheTopStandardFilters = copy;
@ -145,43 +154,43 @@ public class PoiFiltersHelper {
}
private List<PoiLegacyFilter> getUserDefinedPoiFilters() {
ArrayList<PoiLegacyFilter> userDefinedFilters = new ArrayList<PoiLegacyFilter>();
private List<PoiUIFilter> getUserDefinedPoiFilters() {
ArrayList<PoiUIFilter> userDefinedFilters = new ArrayList<PoiUIFilter>();
PoiFilterDbHelper helper = openDbHelper();
if (helper != null) {
List<PoiLegacyFilter> userDefined = helper.getFilters(helper.getReadableDatabase());
List<PoiUIFilter> userDefined = helper.getFilters(helper.getReadableDatabase());
userDefinedFilters.addAll(userDefined);
helper.close();
}
return userDefinedFilters;
}
public void sortListOfFilters(List<PoiLegacyFilter> list) {
public void sortListOfFilters(List<PoiUIFilter> list) {
final Collator instance = Collator.getInstance();
Collections.sort(list, new Comparator<PoiLegacyFilter>() {
Collections.sort(list, new Comparator<PoiUIFilter>() {
@Override
public int compare(PoiLegacyFilter lhs, PoiLegacyFilter rhs) {
public int compare(PoiUIFilter lhs, PoiUIFilter rhs) {
return instance.compare(lhs.getName(), rhs.getName());
}
});
}
public List<PoiLegacyFilter> getTopDefinedPoiFilters() {
public List<PoiUIFilter> getTopDefinedPoiFilters() {
if (cacheTopStandardFilters == null) {
List<PoiLegacyFilter> top = new ArrayList<PoiLegacyFilter>();
List<PoiUIFilter> top = new ArrayList<PoiUIFilter>();
// user defined
top.addAll(getUserDefinedPoiFilters());
// default
MapPoiTypes poiTypes = application.getPoiTypes();
for (PoiFilter t : poiTypes.getTopVisibleFilters()) {
top.add(new PoiLegacyFilter(t, application));
top.add(new PoiUIFilter(t, application));
}
sortListOfFilters(top);
cacheTopStandardFilters = top;
}
List<PoiLegacyFilter> result = new ArrayList<PoiLegacyFilter>();
List<PoiUIFilter> result = new ArrayList<PoiUIFilter>();
if(OsmandPlugin.getEnabledPlugin(AccessibilityPlugin.class) != null) {
result.add(getShowAllPOIFilter());
}
@ -196,10 +205,10 @@ public class PoiFiltersHelper {
return new PoiFilterDbHelper(application.getPoiTypes(), application);
}
public boolean removePoiFilter(PoiLegacyFilter filter){
if(filter.getFilterId().equals(PoiLegacyFilter.CUSTOM_FILTER_ID) ||
filter.getFilterId().equals(PoiLegacyFilter.BY_NAME_FILTER_ID) ||
filter.getFilterId().startsWith(PoiLegacyFilter.STD_PREFIX)){
public boolean removePoiFilter(PoiUIFilter filter){
if(filter.getFilterId().equals(PoiUIFilter.CUSTOM_FILTER_ID) ||
filter.getFilterId().equals(PoiUIFilter.BY_NAME_FILTER_ID) ||
filter.getFilterId().startsWith(PoiUIFilter.STD_PREFIX)){
return false;
}
PoiFilterDbHelper helper = openDbHelper();
@ -208,7 +217,7 @@ public class PoiFiltersHelper {
}
boolean res = helper.deleteFilter(helper.getWritableDatabase(), filter);
if(res){
ArrayList<PoiLegacyFilter> copy = new ArrayList<>(cacheTopStandardFilters);
ArrayList<PoiUIFilter> copy = new ArrayList<>(cacheTopStandardFilters);
copy.remove(filter);
cacheTopStandardFilters = copy;
}
@ -216,13 +225,13 @@ public class PoiFiltersHelper {
return res;
}
public boolean createPoiFilter(PoiLegacyFilter filter){
public boolean createPoiFilter(PoiUIFilter filter){
PoiFilterDbHelper helper = openDbHelper();
if(helper == null){
return false;
}
boolean res = helper.deleteFilter(helper.getWritableDatabase(), filter);
Iterator<PoiLegacyFilter> it = cacheTopStandardFilters.iterator();
Iterator<PoiUIFilter> it = cacheTopStandardFilters.iterator();
while(it.hasNext()) {
if(it.next().getFilterId().equals(filter.getFilterId())) {
it.remove();
@ -230,7 +239,7 @@ public class PoiFiltersHelper {
}
res = helper.addFilter(filter, helper.getWritableDatabase(), false);
if(res){
ArrayList<PoiLegacyFilter> copy = new ArrayList<>(cacheTopStandardFilters);
ArrayList<PoiUIFilter> copy = new ArrayList<>(cacheTopStandardFilters);
copy.add(filter);
sortListOfFilters(copy);
cacheTopStandardFilters = copy;
@ -241,9 +250,9 @@ public class PoiFiltersHelper {
public boolean editPoiFilter(PoiLegacyFilter filter) {
if (filter.getFilterId().equals(PoiLegacyFilter.CUSTOM_FILTER_ID) ||
filter.getFilterId().equals(PoiLegacyFilter.BY_NAME_FILTER_ID) || filter.getFilterId().startsWith(PoiLegacyFilter.STD_PREFIX)) {
public boolean editPoiFilter(PoiUIFilter filter) {
if (filter.getFilterId().equals(PoiUIFilter.CUSTOM_FILTER_ID) ||
filter.getFilterId().equals(PoiUIFilter.BY_NAME_FILTER_ID) || filter.getFilterId().startsWith(PoiUIFilter.STD_PREFIX)) {
return false;
}
PoiFilterDbHelper helper = openDbHelper();
@ -335,7 +344,7 @@ public class PoiFiltersHelper {
}
}
protected boolean addFilter(PoiLegacyFilter p, SQLiteConnection db, boolean addOnlyCategories){
protected boolean addFilter(PoiUIFilter p, SQLiteConnection db, boolean addOnlyCategories){
if(db != null){
if(!addOnlyCategories){
db.execSQL("INSERT INTO " + FILTER_NAME + " VALUES (?, ?, ?)",new Object[]{p.getName(), p.getFilterId(), p.getFilterByName()}); //$NON-NLS-1$ //$NON-NLS-2$
@ -363,8 +372,8 @@ public class PoiFiltersHelper {
return false;
}
protected List<PoiLegacyFilter> getFilters(SQLiteConnection conn){
ArrayList<PoiLegacyFilter> list = new ArrayList<PoiLegacyFilter>();
protected List<PoiUIFilter> getFilters(SQLiteConnection conn){
ArrayList<PoiUIFilter> list = new ArrayList<PoiUIFilter>();
if(conn != null){
SQLiteCursor query = conn.rawQuery("SELECT " + CATEGORIES_FILTER_ID +", " + CATEGORIES_COL_CATEGORY +"," + CATEGORIES_COL_SUBCATEGORY +" FROM " + //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
CATEGORIES_NAME, null);
@ -396,7 +405,7 @@ public class PoiFiltersHelper {
do {
String filterId = query.getString(0);
if(map.containsKey(filterId)){
PoiLegacyFilter filter = new PoiLegacyFilter(query.getString(1), filterId,
PoiUIFilter filter = new PoiUIFilter(query.getString(1), filterId,
map.get(filterId), application);
filter.setSavedFilterByName(query.getString(2));
list.add(filter);
@ -408,7 +417,7 @@ public class PoiFiltersHelper {
return list;
}
protected boolean editFilter(SQLiteConnection conn, PoiLegacyFilter filter) {
protected boolean editFilter(SQLiteConnection conn, PoiUIFilter filter) {
if (conn != null) {
conn.execSQL("DELETE FROM " + CATEGORIES_NAME + " WHERE " + CATEGORIES_FILTER_ID + " = ?", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
new Object[] { filter.getFilterId() });
@ -419,12 +428,12 @@ public class PoiFiltersHelper {
return false;
}
private void updateName(SQLiteConnection db, PoiLegacyFilter filter) {
private void updateName(SQLiteConnection db, PoiUIFilter filter) {
db.execSQL("UPDATE " + FILTER_NAME + " SET " + FILTER_COL_FILTERBYNAME + " = ?, " + FILTER_COL_NAME + " = ? " + " WHERE " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ FILTER_COL_ID + "= ?", new Object[] { filter.getFilterByName(), filter.getName(), filter.getFilterId() }); //$NON-NLS-1$
}
protected boolean deleteFilter(SQLiteConnection db, PoiLegacyFilter p){
protected boolean deleteFilter(SQLiteConnection db, PoiUIFilter p){
String key = p.getFilterId();
return deleteFilter(db, key);
}

17
OsmAnd/src/net/osmand/plus/poi/PoiLegacyFilter.java → OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
View file

@ -34,7 +34,7 @@ import net.osmand.util.OpeningHoursParser;
import net.osmand.util.OpeningHoursParser.OpeningHours;
import android.content.Context;
public class PoiLegacyFilter implements SearchPoiTypeFilter {
public class PoiUIFilter implements SearchPoiTypeFilter {
public final static String STD_PREFIX = "std_"; //$NON-NLS-1$
public final static String USER_PREFIX = "user_"; //$NON-NLS-1$
@ -62,7 +62,7 @@ public class PoiLegacyFilter implements SearchPoiTypeFilter {
protected List<Amenity> currentSearchResult = null;
// constructor for standard filters
public PoiLegacyFilter(AbstractPoiType type, OsmandApplication application) {
public PoiUIFilter(AbstractPoiType type, OsmandApplication application) {
this.app = application;
isStandardFilter = true;
filterId = STD_PREFIX + (type == null ? null : type.getKeyName());
@ -72,12 +72,15 @@ public class PoiLegacyFilter implements SearchPoiTypeFilter {
initSearchAll();
updatePoiAdditionals();
} else {
if(type.isAdditional()) {
setSavedFilterByName(type.getKeyName().replace('_', ':'));
}
updateTypesToAccept(type);
}
}
// search by name standard
protected PoiLegacyFilter(OsmandApplication application) {
protected PoiUIFilter(OsmandApplication application) {
this.app = application;
isStandardFilter = true;
filterId = STD_PREFIX; // overridden
@ -85,7 +88,7 @@ public class PoiLegacyFilter implements SearchPoiTypeFilter {
}
// constructor for user defined filters
public PoiLegacyFilter(String name, String filterId,
public PoiUIFilter(String name, String filterId,
Map<PoiCategory, LinkedHashSet<String>> acceptedTypes, OsmandApplication app){
this.app = app;
isStandardFilter = false;
@ -449,8 +452,12 @@ public class PoiLegacyFilter implements SearchPoiTypeFilter {
acceptedTypes.clear();
pt.putTypes(acceptedTypes);
poiAdditionals.clear();
if (pt instanceof PoiType && ((PoiType) pt).isAdditional() && ((PoiType) pt).getParentType() != null) {
fillPoiAdditionals(((PoiType) pt).getParentType());
} else {
fillPoiAdditionals(pt);
}
}
private void fillPoiAdditionals(AbstractPoiType pt) {
for (PoiType add : pt.getPoiAdditionals()) {
@ -481,7 +488,7 @@ public class PoiLegacyFilter implements SearchPoiTypeFilter {
}
}
public void updateTypesToAccept(PoiLegacyFilter f) {
public void updateTypesToAccept(PoiUIFilter f) {
acceptedTypes.clear();
acceptedTypes.putAll(f.acceptedTypes);
poiAdditionals.clear();

4
OsmAnd/src/net/osmand/plus/poi/SearchByNameFilter.java
View file

@ -12,9 +12,9 @@ import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.util.MapUtils;
public class SearchByNameFilter extends PoiLegacyFilter {
public class SearchByNameFilter extends PoiUIFilter {
public static final String FILTER_ID = PoiLegacyFilter.BY_NAME_FILTER_ID; //$NON-NLS-1$
public static final String FILTER_ID = PoiUIFilter.BY_NAME_FILTER_ID; //$NON-NLS-1$
public SearchByNameFilter(OsmandApplication application) {
super(application);

2
OsmAnd/src/net/osmand/plus/resources/AmenityIndexRepositoryBinary.java
View file

@ -15,7 +15,7 @@ import net.osmand.binary.BinaryMapIndexReader.SearchPoiTypeFilter;
import net.osmand.binary.BinaryMapIndexReader.SearchRequest;
import net.osmand.data.Amenity;
import net.osmand.osm.PoiCategory;
import net.osmand.plus.poi.PoiLegacyFilter;
import net.osmand.plus.poi.PoiUIFilter;
import net.osmand.util.MapUtils;
import org.apache.commons.logging.Log;

4
OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
View file

@ -25,7 +25,7 @@ import net.osmand.plus.download.DownloadActivity;
import net.osmand.plus.helpers.FileNameTranslationHelper;
import net.osmand.plus.osmo.OsMoService;
import net.osmand.plus.poi.PoiFiltersHelper;
import net.osmand.plus.poi.PoiLegacyFilter;
import net.osmand.plus.poi.PoiUIFilter;
import net.osmand.plus.render.RenderingIcons;
import net.osmand.plus.resources.ResourceManager;
import net.osmand.plus.routing.RoutingHelper;
@ -85,7 +85,7 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
private ResourceManager resourceManager;
private RoutingHelper routingHelper;
private PoiLegacyFilter filter;
private PoiUIFilter filter;
private MapTextLayer mapTextLayer;
/// cache for displayed POI