Merge branch 'master' of https://github.com/Bars107/osmand
This commit is contained in:
Denis
commit
f4e0b8f652
29 changed files with 294 additions and 63 deletions
|
|
@ -65,15 +65,15 @@ public class BinaryInspector {
|
|||
// test cases show info
|
||||
if(args.length == 1 && "test".equals(args[0])) {
|
||||
in.inspector(new String[]{
|
||||
// "-vpoi",
|
||||
"-vmap",// "-vmapobjects",
|
||||
"-vpoi",
|
||||
// "-vmap",// "-vmapobjects",
|
||||
// "-vrouting",
|
||||
// "-vaddress", "-vcities","-vstreetgroups",
|
||||
// "-vstreets", "-vbuildings", "-vintersections",
|
||||
"-zoom=16",
|
||||
// "-bbox=1.74,51.17,1.75,51.16",
|
||||
"-vstats",
|
||||
"/Users/victorshcherb/osmand/maps/Netherlands_europe_2.obf"
|
||||
// "-vstats",
|
||||
// "/Users/victorshcherb/osmand/maps/Netherlands_europe_2.obf"
|
||||
// "/Users/victorshcherb/osmand/maps/World_basemap_2.obf"
|
||||
});
|
||||
} else {
|
||||
|
|
@ -1047,7 +1047,7 @@ public class BinaryInspector {
|
|||
PoiSubType st = p.subTypes.get(i);
|
||||
println("\t\t\t" + st.name + " " + (st.text ? "text":(" encoded " + st.possibleValues.size())));
|
||||
}
|
||||
req.poiTypeFilter = null;//for test only
|
||||
// req.poiTypeFilter = null;//for test only
|
||||
index.searchPoi(p, req);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,16 @@
|
|||
package net.osmand.osm;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public abstract class AbstractPoiType {
|
||||
|
||||
protected final String keyName;
|
||||
protected final MapPoiTypes registry;
|
||||
private List<PoiType> poiAdditionals = null;
|
||||
|
||||
public AbstractPoiType(String keyName, MapPoiTypes registry) {
|
||||
this.keyName = keyName;
|
||||
|
|
@ -20,6 +24,20 @@ public abstract class AbstractPoiType {
|
|||
public String getTranslation() {
|
||||
return registry.getTranslation(this);
|
||||
}
|
||||
|
||||
public void addPoiAdditional(PoiType tp) {
|
||||
if(poiAdditionals == null) {
|
||||
poiAdditionals = new ArrayList<PoiType>();
|
||||
}
|
||||
poiAdditionals.add(tp);
|
||||
}
|
||||
|
||||
public List<PoiType> getPoiAdditionals() {
|
||||
if(poiAdditionals == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
return poiAdditionals;
|
||||
}
|
||||
|
||||
public abstract Map<PoiCategory, LinkedHashSet<String>> putTypes(Map<PoiCategory, LinkedHashSet<String>> acceptedTypes);
|
||||
|
||||
|
|
|
|||
|
|
@ -258,6 +258,10 @@ public class MapPoiTypes {
|
|||
tp.setOsmValue2(parser.getAttributeValue("","value2"));
|
||||
if(lastType != null) {
|
||||
lastType.addPoiAdditional(tp);
|
||||
} else if(lastFilter != null) {
|
||||
lastFilter.addPoiAdditional(tp);
|
||||
} else if(lastCategory != null) {
|
||||
lastCategory.addPoiAdditional(tp);
|
||||
}
|
||||
} else if(name.equals("poi_type")){
|
||||
PoiType tp = new PoiType(this,
|
||||
|
|
|
|||
|
|
@ -1,9 +1,6 @@
|
|||
package net.osmand.osm;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class PoiType extends AbstractPoiType {
|
||||
|
|
@ -14,7 +11,7 @@ public class PoiType extends AbstractPoiType {
|
|||
private String osmTag2;
|
||||
private String osmValue;
|
||||
private String osmValue2;
|
||||
private List<PoiType> poiAdditionals = null;
|
||||
|
||||
|
||||
public PoiType(MapPoiTypes poiTypes, PoiCategory category, String name) {
|
||||
super(name, poiTypes);
|
||||
|
|
@ -81,20 +78,6 @@ public class PoiType extends AbstractPoiType {
|
|||
return category;
|
||||
}
|
||||
|
||||
public void addPoiAdditional(PoiType tp) {
|
||||
if(poiAdditionals == null) {
|
||||
poiAdditionals = new ArrayList<PoiType>();
|
||||
}
|
||||
poiAdditionals.add(tp);
|
||||
}
|
||||
|
||||
public List<PoiType> getPoiAdditionals() {
|
||||
if(poiAdditionals == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
return poiAdditionals;
|
||||
}
|
||||
|
||||
public Map<PoiCategory, LinkedHashSet<String>> putTypes(Map<PoiCategory, LinkedHashSet<String>> acceptedTypes) {
|
||||
PoiType rt = getReferenceType();
|
||||
PoiType poiType = rt != null ? rt : this;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/color_distance"
|
||||
android:background="@color/osmand_orange"
|
||||
android:orientation="vertical"
|
||||
android:paddingBottom="@dimen/list_content_padding"
|
||||
android:paddingLeft="@dimen/list_content_padding"
|
||||
|
|
@ -56,17 +56,22 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:paddingBottom="12dp"
|
||||
android:paddingTop="12dp"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/welcome_select_region"/>
|
||||
android:text="@string/welcome_select_region"
|
||||
android:textSize="@dimen/download_descr_text_size"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/region"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="@dimen/dash_parking_big_text_size"
|
||||
android:layout_marginTop="@dimen/dashPadding"
|
||||
tools:text="@string/driving_region"/>
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
|||
|
|
@ -1921,4 +1921,7 @@ s často kladenými otázkami.</string>
|
|||
<string name="shared_string_address">Adresa</string>
|
||||
<string name="shared_string_places">Místa</string>
|
||||
<string name="shared_string_search">Hledat</string>
|
||||
</resources>
|
||||
<string name="shared_string_manage">Spravovat</string>
|
||||
<string name="shared_string_edit">Upravit</string>
|
||||
<string name="shared_string_open">Otevřít</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -704,7 +704,7 @@
|
|||
<string name="poi_wine">Vinhandel</string>
|
||||
|
||||
<string name="poi_shop_food">Fødevarebutik</string>
|
||||
<string name="poi_road_obstacle">Vejspæring</string>
|
||||
<string name="poi_road_obstacle">Vejhindring</string>
|
||||
<string name="poi_filling_station">Tankstation</string>
|
||||
<string name="poi_personal_transport">Personlig transport</string>
|
||||
<string name="poi_public_transport">Kollektivtrafik</string>
|
||||
|
|
|
|||
|
|
@ -1993,7 +1993,7 @@
|
|||
<string name="shared_string_show_description">Vis beskrivelse</string>
|
||||
<string name="shared_string_search">Søg</string>
|
||||
<string name="shared_string_places">Steder</string>
|
||||
<string name="rendering_attr_OSMMapperAssistant_name">OSM kortlægger assistent</string>
|
||||
<string name="rendering_attr_OSMMapperAssistant_name">OSM kortassistent</string>
|
||||
<string name="shared_string_open">Åben</string>
|
||||
<string name="shared_string_manage">Administrer</string>
|
||||
<string name="shared_string_edit">Rediger</string>
|
||||
|
|
|
|||
|
|
@ -747,7 +747,7 @@
|
|||
<string name="poi_fuel_1_25_yes">Carburant 1:25</string>
|
||||
<string name="poi_fuel_1_50_yes">Carburant 1:50</string>
|
||||
<string name="poi_fuel_svo_yes">Huile Végétale Brute (HVB)</string>
|
||||
<string name="poi_junction">Jonction</string>
|
||||
<string name="poi_junction">Carrefour</string>
|
||||
<string name="poi_forest">Sylviculture</string>
|
||||
<string name="poi_landuse_railway">Zone de chemins de fer</string>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources><string name="bidforfix_loading">Betöltés</string>
|
||||
<string name="bidforfix_supporters">%1$d Támogatók</string>
|
||||
<string name="bidforfix_supporters">%1$d támogató</string>
|
||||
<string name="bidforfix_funded">felajánlás: %d%%</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@
|
|||
<string name="poi_pitch">Pálya</string>
|
||||
<string name="poi_raceway">Versenypálya</string>
|
||||
<string name="poi_museum">Múzeum</string>
|
||||
<string name="poi_attraction">Turistalátványosság</string>
|
||||
<string name="poi_attraction">Turista látványosság</string>
|
||||
<string name="poi_memorial">Emlékmű</string>
|
||||
<string name="poi_artwork">Műalkotás</string>
|
||||
<string name="poi_castle">Kastély</string>
|
||||
|
|
|
|||
|
|
@ -833,11 +833,11 @@
|
|||
|
||||
<string name="osmand_rastermaps_plugin_description">"Ezzel a bővítménnyel az online (úgynevezett csempés vagy raszteres) térképek több típusához is hozzáférhet az előre meghatározott Openstreetmap csempéktől kezdve (mint például a Mapnik) a műholdképekig és a speciális célú rétegekig, úgymint időjárási térképek, éghajlati térképek, földtani térképek, hegyárnyékolási rétegek, stb.\n\nEzen térképek bármelyike használható az OsmAnd térkép képernyőjén megjelenítendő fő (alap) térképként, vagy egy másik alaptérkép borításaként vagy alátétjeként (mint például az OsmAnd szokásos kapcsolat nélküli térképei). Bármely alátét térkép jobban láthatóbbá tételének érdekében az OsmAnd vektoros térképeinek bizonyos elemei igény szerint könnyedén elrejthetők a „Térkép beállítása” menün keresztül.\n\nA csempés térképek internetes forrásokon keresztül szerezhetők be, vagy előkészíthetők kapcsolat nélküli használathoz (és kézzel átmásolva az OsmAnd adatmappájába) egy olyan sqlite adatbázisként, amelyet különféle harmadik féltől származó térkép-előkészítő eszközök állíthatnak elő. "</string>
|
||||
<string name="osmand_background_plugin_description">Megjeleníti az útvonal követéséhez és a navigációhoz engedélyezett beállításokat alvó üzemmódban (kikapcsolt képernyővel) úgy, hogy bizonyos időközönként felébreszti a GPS eszközt.</string>
|
||||
<string name="osmand_accessibility_description">Megjeleníti a beállításokat a speciális akadálymentesítési lehetőségek aktiválásához.</string>
|
||||
<string name="osmand_accessibility_description">Ez a bővítmény elérhetővé teszi az eszköz akadálymentesítési lehetőségeit közvetlenül az OsmAnd programban. Ez megkönnyíti például a TTS hangok beszédsebességének állítását, az irányító gombok képernyő navigációjának beállítását, egy görgető használatát a nagyítás vezérléséhez, vagy szövegfelolvasó visszajelzés használatát, mint például a pozíció automatikus bejelentésénél.</string>
|
||||
|
||||
|
||||
|
||||
<string name="osmand_development_plugin_description">Megjeleníti a beállításokat a fejlesztéshez és szolgáltatások hibakereséséhez, mint például útvonal szimuláció vagy megjelenítési teljesítmény kijelzés.</string>
|
||||
<string name="osmand_development_plugin_description">Ez a bővítmény beállításokat jelenít meg olyan fejlesztői és hibakeresési szolgáltatásokhoz, mint például útvonaltervezés tesztelése vagy szimulálása, a képernyő megjelenítésének teljesítménye, vagy hangalapú figyelmeztetések. Ezeket a beállításokat fejlesztőknek szánják, és nem szükségesek az átlagos felhasználónak.</string>
|
||||
<string name="plugins_screen">Bővítménykezelő</string>
|
||||
|
||||
<string name="prefs_plugins_descr">A bővítmények további funkciókkal és beállításokkal bővítik az alkalmazást</string>
|
||||
|
|
@ -895,7 +895,7 @@
|
|||
<string name="osmand_parking_pm">du.</string>
|
||||
<string name="osmand_parking_am">de.</string>
|
||||
<string name="osmand_parking_position_name">Parkolási pont</string>
|
||||
<string name="osmand_parking_plugin_description">Ezt a bővítményt azért fejlesztették, hogy az OsmAnd használatával könnyedén megjegyezhesse, hogy hol parkolta le az autóját.</string>
|
||||
<string name="osmand_parking_plugin_description">A parkolási hely bővítmény könnyen megjegyezhetővé teszi, hogy mikor parkolt le az autójával, és mennyi idő van még hátra, ha a parkolás időben korlátozott. A vezérlőpult kártyáján és a térkép felületi elemen megtalálható a parkolási hely és idő.\nÉrtesítést ad hozzá a naptárhoz abban az esetben, ha emlékeztetőt szeretne kérni erről.</string>
|
||||
<string name="osmand_parking_plugin_name">Parkolási hely</string>
|
||||
<string name="context_menu_item_add_parking_point">Megjelölés parkolási helyként</string>
|
||||
<string name="context_menu_item_delete_parking_point">Parkolásjelölő törlése</string>
|
||||
|
|
@ -1225,7 +1225,7 @@
|
|||
<string name="plugin_distance_point">Pont</string>
|
||||
<string name="gpx_file_name">GPX fájlnév</string>
|
||||
<string name="gpx_saved_sucessfully">GPX fájl sikeresen elmentve ide: {0}</string>
|
||||
<string name="osmand_distance_planning_plugin_description">A pontok közti távolság méréséhez készíts egy útvonalat. Nyiss meg egy meglévő GPX fájlt szerkesztésre és mentsd el. Használhatod GPX alapú útvonaltervezésre is.</string>
|
||||
<string name="osmand_distance_planning_plugin_description">Ez a bővítmény egy térkép képernyő felületi elemet biztosít, amely lehetővé teszi útvonalak létrehozását a térképen való koppintással, vagy meglévő GPX fájlok használatát vagy módosítását egy út megtervezéséhez és a pontok közötti távolság méréséhez. Az eredmény elmenthető GPX fájlként, amely később használható a vezetéshez.</string>
|
||||
<string name="osmand_distance_planning_plugin_name">Távolságszámító és tervezőeszköz</string>
|
||||
<string name="use_distance_measurement_help">* Pont lerakásához koppints.\n * Nyomd meg hosszan a térképet az előző pont törléséhez.\n * Nyomd meg hosszan a pontot leírás csatolásához és megtekintéséhez.\n * További műveletekért kattints a vezérlőgombra.</string>
|
||||
<string name="shared_string_do_not_show_again">Ne mutassa újra</string>
|
||||
|
|
@ -1923,4 +1923,7 @@
|
|||
<string name="shared_string_do_not_use">Ne használja</string>
|
||||
<string name="shared_string_address">Cím</string>
|
||||
<string name="rendering_attr_OSMMapperAssistant_name">OSM térképező segéd</string>
|
||||
<string name="shared_string_open">Megnyitás</string>
|
||||
<string name="shared_string_manage">Kezelés</string>
|
||||
<string name="shared_string_edit">Szerkesztés</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1132,7 +1132,7 @@ POIの更新は利用できません</string>
|
|||
<string name="av_camera_focus_macro">マクロ(近距離)フォーカスモード</string>
|
||||
<string name="osmand_srtm_long_description_1000_chars">"このプラグインは、等高線のオーバーレイと陰影起伏層(補助)の両方がOsmAndのオフラインマップ上に表示出来るように用意されています。\nこの機能は地形の構造を知る必要のある、アスリート、ハイカー、登山者、そしてその他の多くの人々の助けになるでしょう。
|
||||
\n\nこのグローバルデータ(北緯70°から南緯70°の間)はSRTM(スペースシャトル立体地形データ)とASTER(資源探査用将来型センサ)、NASAの地球観測システムである、テラ上のオンボードイメージング機器をベースにしたものです。 ASTERはNASAと日本の経済産業省(METI)、そして宇宙システム開発利用推進機構(J-spacesystems)の共同作業によるものです。 "</string>
|
||||
<string name="audionotes_location_not_defined">メモに関連付ける場所が未定義です。 指定された場所にメモをとるためには\"場所を利用…\"を利用します</string>
|
||||
<string name="audionotes_location_not_defined">メモを取る地点が指定されていません。メモをとるためには\'マップ中心地点を使用\'からメニューを呼び出してください。</string>
|
||||
<string name="map_widget_audionotes">音声メモ</string>
|
||||
<string name="audionotes_plugin_description">音声/ビデオメモプラグインは、旅行中の音声/写真/ビデオに関するメモ機能を提供します。マップ画面上のボタンまたはコンテキストメニューから使用出来ます。</string>
|
||||
<string name="audionotes_plugin_name">音声/ビデオメモ</string>
|
||||
|
|
|
|||
|
|
@ -518,4 +518,66 @@
|
|||
<string name="poi_rest_area">Miejsce odpoczynku</string>
|
||||
|
||||
<string name="poi_industrial">Tereny przemysłowe</string>
|
||||
<string name="poi_emergency">SOR</string>
|
||||
<string name="poi_aerialway_transport">Transport w powietrzu</string>
|
||||
<string name="poi_landuse">Przeznaczenie obszaru</string>
|
||||
<string name="poi_service">Usługi</string>
|
||||
<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_yes">Olej napędowy</string>
|
||||
<string name="poi_fuel_gtl_diesel_yes">Modyfikowany olej napędowy</string>
|
||||
<string name="poi_fuel_hgv_diesel_yes">Ulepszony olej napędowy</string>
|
||||
<string name="poi_fuel_octane_80_yes">Benzyna 80 oktanów</string>
|
||||
<string name="poi_fuel_octane_91_yes">Benzyna 91 oktanów</string>
|
||||
<string name="poi_fuel_octane_92_yes">Benzyna 92 oktany</string>
|
||||
<string name="poi_fuel_octane_95_yes">Benzyna 95 oktanów</string>
|
||||
<string name="poi_fuel_octane_98_yes">Benzyna 98 oktanów</string>
|
||||
<string name="poi_fuel_octane_100_yes">Benzyna 100 oktanów</string>
|
||||
<string name="poi_fuel_1_25_yes">Paliwo 1:25</string>
|
||||
<string name="poi_fuel_1_50_yes">Paliwo 1:50</string>
|
||||
<string name="poi_fuel_ethanol_yes">Paliwo: etanol</string>
|
||||
<string name="poi_fuel_methanol_yes">Paliwo: metanol</string>
|
||||
<string name="poi_fuel_svo_yes">Paliwo: SVO (olej roślinny)</string>
|
||||
<string name="poi_fuel_e10_yes">Paliwo: E10</string>
|
||||
<string name="poi_fuel_e20_yes">Paliwo: E20</string>
|
||||
<string name="poi_fuel_e85_yes">Paliwo: E85</string>
|
||||
<string name="poi_fuel_biogas_yes">Paliwo: biogaz</string>
|
||||
<string name="poi_fuel_LH2_yes">Paliwo: ciekły wodór</string>
|
||||
<string name="poi_fuel_electricity_yes">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>
|
||||
<string name="poi_allotments">Ogródki działkowe</string>
|
||||
<string name="poi_forest">Las</string>
|
||||
<string name="poi_farmyard">Farma</string>
|
||||
<string name="poi_meadow">Łąka</string>
|
||||
<string name="poi_landuse_railway">Obszar kolejowy</string>
|
||||
|
||||
<string name="poi_canal">Kanał</string>
|
||||
<string name="poi_survey_point">Punkt geodezyjny</string>
|
||||
<string name="poi_salt_pond">Solanka</string>
|
||||
<string name="poi_reservoir">Rezerwuar</string>
|
||||
<string name="poi_cricket_nets">Siatki do krykieta</string>
|
||||
<string name="poi_gasometer">Miernik gazu</string>
|
||||
<string name="poi_silo">Silos</string>
|
||||
<string name="poi_storage_tank">Kontener</string>
|
||||
|
||||
<string name="poi_training">Urządzenie treningowe</string>
|
||||
<string name="poi_migration">Migracja</string>
|
||||
<string name="poi_isolated_dwelling">Chatka</string>
|
||||
<string name="poi_suburb">Przedmieście</string>
|
||||
<string name="poi_quarter">Kwatera</string>
|
||||
<string name="poi_neighbourhood">Sąsiedztwo</string>
|
||||
<string name="poi_locality">Miejscowość</string>
|
||||
<string name="poi_place_allotments">Ogródki działkowe</string>
|
||||
<string name="poi_place_farm">Farma</string>
|
||||
<string name="poi_residential">Dzielnica mieszkaniowa</string>
|
||||
|
||||
<string name="poi_podiatrist">Podiatra (od stóp)</string>
|
||||
<string name="poi_it">Biuro IT</string>
|
||||
<string name="poi_architect">Biuro architekta</string>
|
||||
<string name="poi_leisure_track">Tor sportowy</string>
|
||||
<string name="poi_bicycle_track">Tor rowerowy</string>
|
||||
<string name="poi_9pin">Bowling</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2090,4 +2090,8 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
|
|||
<string name="shared_string_show_description">Pokaż opis</string>
|
||||
<string name="shared_string_places">Miejsca</string>
|
||||
<string name="shared_string_search">Szukaj</string>
|
||||
<string name="shared_string_open">Otwórz</string>
|
||||
<string name="rendering_attr_OSMMapperAssistant_name">Asystent OSM</string>
|
||||
<string name="shared_string_manage">Zarządzaj</string>
|
||||
<string name="shared_string_edit">Edytuj</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -714,4 +714,7 @@
|
|||
<string name="piste_ice_skate">Ледовый каток</string>
|
||||
|
||||
<string name="piste_snow_park">Снежный парк</string>
|
||||
<string name="poi_fuel_diesel_yes">Дизель</string>
|
||||
<string name="poi_fuel_ethanol_yes">Этанол</string>
|
||||
<string name="poi_fuel_methanol_yes">Метанол</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1956,4 +1956,8 @@
|
|||
<string name="shared_string_show_description">Показать описание</string>
|
||||
<string name="shared_string_places">Места</string>
|
||||
<string name="shared_string_search">Поиск</string>
|
||||
<string name="shared_string_open">Открыть</string>
|
||||
<string name="rendering_attr_OSMMapperAssistant_name">OSM помощник картографа</string>
|
||||
<string name="shared_string_manage">Управление</string>
|
||||
<string name="shared_string_edit">Редактировать</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1940,4 +1940,8 @@
|
|||
<string name="shared_string_show_description">Ammustra descritzione</string>
|
||||
<string name="shared_string_places">Logos</string>
|
||||
<string name="shared_string_search">Chirca</string>
|
||||
<string name="shared_string_open">Abertu</string>
|
||||
<string name="shared_string_manage">Amministra</string>
|
||||
<string name="shared_string_edit">Modìfica</string>
|
||||
<string name="rendering_attr_OSMMapperAssistant_name">Assistente mapadura OSM</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -550,4 +550,5 @@
|
|||
<string name="poi_attraction_summer_toboggan">Suchá bobová dráha</string>
|
||||
<string name="poi_attraction_swing_carousel">Kolotoč s hojdačkami</string>
|
||||
<string name="poi_smoking_area">Fajčiarsky priestor</string>
|
||||
<string name="poi_landuse">Využitie územia</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2145,4 +2145,8 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
|
|||
<string name="shared_string_show_description">Zobraziť popis</string>
|
||||
<string name="shared_string_places">Miesta</string>
|
||||
<string name="shared_string_search">Hľadať</string>
|
||||
<string name="shared_string_open">Otvoriť</string>
|
||||
<string name="rendering_attr_OSMMapperAssistant_name">Asistent mapera OSM</string>
|
||||
<string name="shared_string_manage">Spravovať</string>
|
||||
<string name="shared_string_edit">Upraviť</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1833,7 +1833,7 @@
|
|||
<string name="osm_edits">OSM-redigeringar</string>
|
||||
<string name="osmand_parking_hour">h</string><string name="osmand_parking_minute">min</string><string name="osmand_parking_time_left">kvar</string> <string name="parking_place_limited">Tidsbegränsad parkering till</string>
|
||||
<string name="your_edits">Dina redigeringar</string>
|
||||
<string name="osmand_parking_overdue">Föråldrad</string>
|
||||
<string name="osmand_parking_overdue">över tiden</string>
|
||||
<string name="delay_to_start_navigation_descr">Ange väntetid att bli kvar på ruttplaneringsskärmen</string>
|
||||
<string name="delay_to_start_navigation">Börja sväng-efter-sväng-navigering efter …</string>
|
||||
<string name="shared_string_go">Kör</string>
|
||||
|
|
@ -1857,4 +1857,7 @@
|
|||
<string name="shared_string_search">Sök</string>
|
||||
<string name="shared_string_places">Platser</string>
|
||||
<string name="rendering_attr_OSMMapperAssistant_name">OSM kartassistent</string>
|
||||
<string name="shared_string_open">Öppna</string>
|
||||
<string name="shared_string_manage">Hantera</string>
|
||||
<string name="shared_string_edit">Redigera</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<color name="osmand_orange">#ff8f00</color>
|
||||
<color name="app_mode_icon_color">#33B4E4</color>
|
||||
|
||||
<color name="dash_search_icon_light">#536DFE</color>
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ import java.util.LinkedHashMap;
|
|||
import java.util.LinkedHashSet;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.StringTokenizer;
|
||||
|
|
@ -657,6 +658,24 @@ public class OsmandSettings {
|
|||
}
|
||||
return super.setValue(prefs, val);
|
||||
};
|
||||
|
||||
protected DrivingRegion getDefaultValue() {
|
||||
Locale df = Locale.getDefault();
|
||||
if(df == null) {
|
||||
return DrivingRegion.EUROPE_ASIA;
|
||||
}
|
||||
if(df.getCountry().equalsIgnoreCase(Locale.US.getCountry())) {
|
||||
return DrivingRegion.US;
|
||||
} else if(df.getCountry().equalsIgnoreCase(Locale.CANADA.getCountry())) {
|
||||
return DrivingRegion.CANADA;
|
||||
} else if(df.getCountry().equalsIgnoreCase(Locale.JAPAN.getCountry())) {
|
||||
return DrivingRegion.JAPAN;
|
||||
// potentially wrong in europe
|
||||
// } else if(df.getCountry().equalsIgnoreCase(Locale.UK.getCountry())) {
|
||||
// return DrivingRegion.UK_AND_OTHERS;
|
||||
}
|
||||
return DrivingRegion.EUROPE_ASIA;
|
||||
};
|
||||
}.makeGlobal().cache();
|
||||
|
||||
// this value string is synchronized with settings_pref.xml preference name
|
||||
|
|
|
|||
|
|
@ -201,12 +201,14 @@ public class FavoritesListFragment extends ListFragment implements SearchActivit
|
|||
TextView distanceText = (TextView) row.findViewById(R.id.distance);
|
||||
ImageView icon = (ImageView) row.findViewById(R.id.favourite_icon);
|
||||
ImageView direction = (ImageView) row.findViewById(R.id.direction);
|
||||
ImageView giImage= (ImageView)row.findViewById(R.id.group_image);
|
||||
direction.setVisibility(View.VISIBLE);
|
||||
final FavouritePoint favorite = getItem(position);
|
||||
if (!favorite.getCategory().isEmpty()) {
|
||||
row.findViewById(R.id.group_image).setVisibility(View.VISIBLE);
|
||||
giImage.setVisibility(View.VISIBLE);
|
||||
giImage.setImageDrawable(app.getIconsCache().getContentIcon(R.drawable.ic_small_group));
|
||||
} else {
|
||||
row.findViewById(R.id.group_image).setVisibility(View.GONE);
|
||||
giImage.setVisibility(View.GONE);
|
||||
}
|
||||
((TextView) row.findViewById(R.id.group_name)).setText(favorite.getCategory());
|
||||
|
||||
|
|
@ -216,7 +218,7 @@ public class FavoritesListFragment extends ListFragment implements SearchActivit
|
|||
|
||||
name.setText(getName(favorite));
|
||||
final CheckBox ch = (CheckBox) row.findViewById(R.id.check_item);
|
||||
row.findViewById(R.id.favourite_icon).setVisibility(View.VISIBLE);
|
||||
icon.setVisibility(View.VISIBLE);
|
||||
ch.setVisibility(View.GONE);
|
||||
return row;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ import java.util.Calendar;
|
|||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.TreeMap;
|
||||
|
||||
import net.osmand.Location;
|
||||
import net.osmand.ResultMatcher;
|
||||
|
|
@ -342,6 +344,16 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
|
|||
});
|
||||
addFilter(optionsMenu, getString(R.string.shared_string_open).toLowerCase());
|
||||
addFilter(optionsMenu, "24/7");
|
||||
Map<String, PoiType> poiAdditionals = f.getPoiAdditionals();
|
||||
if(poiAdditionals != null) {
|
||||
TreeMap<String, PoiType> adds = new TreeMap<String, PoiType>();
|
||||
for(PoiType vtype : poiAdditionals.values()) {
|
||||
adds.put(vtype.getTranslation().replace(' ', ':').toLowerCase(), vtype);
|
||||
}
|
||||
for(String vtype : adds.keySet()) {
|
||||
addFilter(optionsMenu, vtype);
|
||||
}
|
||||
}
|
||||
|
||||
optionsMenu.show();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -101,7 +101,8 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
|
|||
private int mFlexibleSpaceImageHeight;
|
||||
private int mFlexibleBlurSpaceHeight;
|
||||
private boolean portrait;
|
||||
|
||||
|
||||
int baseColor;
|
||||
|
||||
private WaypointDialogHelper waypointDialogHelper;
|
||||
private final int[] running = new int[] { -1 };
|
||||
|
|
@ -125,6 +126,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
|
|||
|
||||
|
||||
public void createDashboardView() {
|
||||
baseColor = mapActivity.getResources().getColor(R.color.osmand_orange) & 0x00ffffff;
|
||||
waypointDialogHelper = new WaypointDialogHelper(mapActivity);
|
||||
landscape = !ScreenOrientationHelper.isOrientationPortrait(mapActivity);
|
||||
dashboardView = (FrameLayout) mapActivity.findViewById(R.id.dashboard);
|
||||
|
|
@ -626,7 +628,6 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
|
|||
|
||||
|
||||
private void addOrUpdateDashboardFragments(boolean firstTime) {
|
||||
|
||||
// boolean showCards = mapActivity.getMyApplication().getSettings().USE_DASHBOARD_INSTEAD_OF_DRAWER.get();
|
||||
boolean showCards = !firstTime;
|
||||
|
||||
|
|
@ -807,7 +808,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
|
|||
float sh = mFlexibleSpaceImageHeight - mFlexibleBlurSpaceHeight;
|
||||
float t = sh == 0 ? 1 : (1 - Math.max(0, -scrollY + sh) / sh);
|
||||
t = Math.max(0, t);
|
||||
int baseColor = 0xff8f00;
|
||||
|
||||
int alpha = (int) (t * 255);
|
||||
// in order to have proper fast scroll down
|
||||
int malpha = t == 1 ? alpha = 0 : alpha;
|
||||
|
|
|
|||
|
|
@ -1325,6 +1325,15 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
|
|||
} else {
|
||||
v.findViewById(R.id.read_section).setVisibility(View.VISIBLE);
|
||||
v.findViewById(R.id.unknown_section).setVisibility(View.GONE);
|
||||
ImageView distanceI = (ImageView) v.findViewById(R.id.distance_icon);
|
||||
distanceI.setVisibility(View.VISIBLE);
|
||||
distanceI.setImageDrawable(app.getIconsCache().getContentIcon(R.drawable.ic_small_distance));
|
||||
ImageView pointsI = (ImageView) v.findViewById(R.id.points_icon);
|
||||
pointsI.setVisibility(View.VISIBLE);
|
||||
pointsI.setImageDrawable(app.getIconsCache().getContentIcon(R.drawable.ic_small_point));
|
||||
ImageView timeI = (ImageView) v.findViewById(R.id.time_icon);
|
||||
timeI.setVisibility(View.VISIBLE);
|
||||
timeI.setImageDrawable(app.getIconsCache().getContentIcon(R.drawable.ic_small_time));
|
||||
TextView time = (TextView) v.findViewById(R.id.time);
|
||||
TextView distance = (TextView) v.findViewById(R.id.distance);
|
||||
TextView pointsCount = (TextView) v.findViewById(R.id.points_count);
|
||||
|
|
|
|||
|
|
@ -435,6 +435,19 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
|
|||
private OsMoGroup group;
|
||||
private Menu menu;
|
||||
|
||||
private MenuItem createActionModeMenuItem(final ActionMode actionMode, Menu m, int id, int titleRes, int icon, int menuItemType){
|
||||
final MenuItem menuItem = createMenuItem(m, id, titleRes, icon,
|
||||
menuItemType);
|
||||
menuItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
|
||||
@Override
|
||||
public boolean onMenuItemClick(MenuItem item) {
|
||||
onActionItemClicked(actionMode, menuItem);
|
||||
return true;
|
||||
}
|
||||
});
|
||||
return menuItem;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCreateActionMode(ActionMode mode, Menu menu) {
|
||||
selectedObject = o;
|
||||
|
|
@ -449,34 +462,37 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
|
|||
group = (OsMoGroup) (o instanceof OsMoGroup ? o : null);
|
||||
MenuItem mi = null;
|
||||
if (device != null) {
|
||||
mi = createMenuItem(menu, ON_OFF_ACTION_ID, R.string.shared_string_ok, 0, 0,
|
||||
mi = createActionModeMenuItem(actionMode, menu, ON_OFF_ACTION_ID, R.string.shared_string_ok, 0,
|
||||
MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
|
||||
mode.setTitle(device.getVisibleName());
|
||||
}
|
||||
if (device != null && device.getLastLocation() != null) {
|
||||
createMenuItem(menu, SHOW_ON_MAP_ID, R.string.shared_string_show_on_map, R.drawable.ic_action_marker_dark,
|
||||
createActionModeMenuItem(actionMode, menu, SHOW_ON_MAP_ID, R.string.shared_string_show_on_map, R.drawable.ic_action_marker_dark,
|
||||
MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
|
||||
|
||||
}
|
||||
createMenuItem(menu, SHARE_ID, R.string.shared_string_share, R.drawable.ic_action_gshare_dark,
|
||||
createActionModeMenuItem(actionMode, menu, SHARE_ID, R.string.shared_string_share, R.drawable.ic_action_gshare_dark,
|
||||
// there is a bug in Android 4.2 layout
|
||||
device != null && device.getLastLocation() != null ? MenuItemCompat.SHOW_AS_ACTION_NEVER : MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
|
||||
///
|
||||
if (device != null) {
|
||||
createMenuItem(menu, SETTINGS_DEV_ID, R.string.shared_string_settings, R.drawable.ic_action_settings_enabled_dark,
|
||||
createActionModeMenuItem(actionMode, menu, SETTINGS_DEV_ID, R.string.shared_string_settings, R.drawable.ic_action_settings_enabled_dark,
|
||||
// there is a bug in Android 4.2 layout
|
||||
device.getLastLocation() != null ? MenuItemCompat.SHOW_AS_ACTION_NEVER : MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
|
||||
}
|
||||
if (device != null && device.getLastLocation() != null) {
|
||||
MenuItem menuItem = createMenuItem(menu, TRACK_DEV_ID, R.string.osmo_set_moving_target, R.drawable.ic_action_flage_dark,
|
||||
MenuItem menuItem = createActionModeMenuItem(actionMode, menu, TRACK_DEV_ID, R.string.osmo_set_moving_target, R.drawable.ic_action_flage_dark,
|
||||
// there is a bug in Android 4.2 layout
|
||||
device.getLastLocation() != null ? MenuItemCompat.SHOW_AS_ACTION_NEVER : MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
|
||||
menuItem.setTitleCondensed(getString(R.string.osmo_follow));
|
||||
}
|
||||
if (group != null) {
|
||||
createMenuItem(menu, GROUP_INFO, R.string.osmo_group_info, R.drawable.ic_action_gabout_dark,
|
||||
mode.setTitle(group.getVisibleName(OsMoGroupsActivity.this));
|
||||
createActionModeMenuItem(actionMode, menu, GROUP_INFO, R.string.osmo_group_info, R.drawable.ic_action_gabout_dark,
|
||||
MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
|
||||
}
|
||||
if ((group != null && !group.isMainGroup()) || (device != null && device.getGroup().isMainGroup())) {
|
||||
createMenuItem(menu, DELETE_ACTION_ID, R.string.shared_string_delete,
|
||||
createActionModeMenuItem(actionMode, menu, DELETE_ACTION_ID, R.string.shared_string_delete,
|
||||
R.drawable.ic_action_delete_dark,
|
||||
MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
|
||||
}
|
||||
|
|
@ -981,7 +997,8 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
|
|||
public void onClick(DialogInterface dialog, int which) {
|
||||
final String nameUser = name.getText().toString();
|
||||
final String id = tracker.getText().toString();
|
||||
final String nick = nickname.getText().toString();
|
||||
String nick = nickname.getText().toString().isEmpty() ? "user" : nickname.getText().toString();
|
||||
|
||||
if(id.length() == 0) {
|
||||
app.showToastMessage(R.string.osmo_specify_tracker_id);
|
||||
connectToDevice();
|
||||
|
|
|
|||
|
|
@ -4,10 +4,13 @@ package net.osmand.plus.poi;
|
|||
import java.util.ArrayList;
|
||||
import java.util.Calendar;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.Set;
|
||||
|
||||
import net.osmand.CollatorStringMatcher;
|
||||
|
|
@ -20,6 +23,7 @@ import net.osmand.data.LatLon;
|
|||
import net.osmand.osm.AbstractPoiType;
|
||||
import net.osmand.osm.MapPoiTypes;
|
||||
import net.osmand.osm.PoiCategory;
|
||||
import net.osmand.osm.PoiFilter;
|
||||
import net.osmand.osm.PoiType;
|
||||
import net.osmand.plus.OsmAndFormatter;
|
||||
import net.osmand.plus.OsmandApplication;
|
||||
|
|
@ -39,6 +43,7 @@ public class PoiLegacyFilter implements SearchPoiTypeFilter {
|
|||
|
||||
private Map<PoiCategory, LinkedHashSet<String>> acceptedTypes = new LinkedHashMap<PoiCategory,
|
||||
LinkedHashSet<String>>();
|
||||
private Map<String, PoiType> poiAdditionals = new HashMap<String, PoiType>();
|
||||
|
||||
protected String filterId;
|
||||
protected String name;
|
||||
|
|
@ -65,8 +70,9 @@ public class PoiLegacyFilter implements SearchPoiTypeFilter {
|
|||
name = type == null ? application.getString(R.string.poi_filter_closest_poi) : type.getTranslation(); //$NON-NLS-1$
|
||||
if (type == null) {
|
||||
initSearchAll();
|
||||
updatePoiAdditionals();
|
||||
} else {
|
||||
type.putTypes(acceptedTypes);
|
||||
updateTypesToAccept(type);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -94,8 +100,11 @@ public class PoiLegacyFilter implements SearchPoiTypeFilter {
|
|||
} else {
|
||||
this.acceptedTypes.putAll(acceptedTypes);
|
||||
}
|
||||
updatePoiAdditionals();
|
||||
}
|
||||
|
||||
|
||||
|
||||
public String getFilterByName() {
|
||||
return filterByName;
|
||||
}
|
||||
|
|
@ -245,6 +254,7 @@ public class PoiLegacyFilter implements SearchPoiTypeFilter {
|
|||
String[] items = filter.split(" ");
|
||||
boolean allTime = false;
|
||||
boolean open = false;
|
||||
Map<PoiType, String> poiAdditionalsFilter = null;
|
||||
for(String s : items) {
|
||||
s = s.trim();
|
||||
if(!Algorithms.isEmpty(s)){
|
||||
|
|
@ -252,16 +262,21 @@ public class PoiLegacyFilter implements SearchPoiTypeFilter {
|
|||
allTime = true;
|
||||
} else if(getNameTokenOpen().equalsIgnoreCase(s)){
|
||||
open = true;
|
||||
} else if(poiAdditionals.containsKey(s.toLowerCase())) {
|
||||
if(poiAdditionalsFilter == null) {
|
||||
poiAdditionalsFilter = new LinkedHashMap<PoiType, String>();
|
||||
}
|
||||
poiAdditionalsFilter.put(poiAdditionals.get(s.toLowerCase()), null);
|
||||
} else {
|
||||
nmFilter.append(s).append(" ");
|
||||
}
|
||||
}
|
||||
}
|
||||
return getNameFilterInternal(nmFilter, allTime, open);
|
||||
return getNameFilterInternal(nmFilter, allTime, open, poiAdditionalsFilter);
|
||||
}
|
||||
|
||||
private AmenityNameFilter getNameFilterInternal(StringBuilder nmFilter,
|
||||
final boolean allTime, final boolean open) {
|
||||
final boolean allTime, final boolean open, final Map<PoiType, String> poiAdditionals) {
|
||||
final CollatorStringMatcher sm =
|
||||
nmFilter.length() > 0 ?
|
||||
new CollatorStringMatcher(nmFilter.toString().trim(), StringMatcherMode.CHECK_CONTAINS) : null;
|
||||
|
|
@ -276,6 +291,18 @@ public class PoiLegacyFilter implements SearchPoiTypeFilter {
|
|||
return false;
|
||||
}
|
||||
}
|
||||
if(poiAdditionals != null) {
|
||||
Iterator<Entry<PoiType, String>> it = poiAdditionals.entrySet().iterator();
|
||||
while(it.hasNext()) {
|
||||
Entry<PoiType, String> e = it.next();
|
||||
String inf = a.getAdditionalInfo(e.getKey().getKeyName());
|
||||
if(inf == null) {
|
||||
return false;
|
||||
} else if(e.getValue() != null && !e.getValue().equalsIgnoreCase(inf)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (allTime) {
|
||||
if (!"24/7".equalsIgnoreCase(a.getOpeningHours())) {
|
||||
return false;
|
||||
|
|
@ -388,6 +415,7 @@ public class PoiLegacyFilter implements SearchPoiTypeFilter {
|
|||
|
||||
public void clearFilter() {
|
||||
acceptedTypes = new LinkedHashMap<PoiCategory, LinkedHashSet<String>>();
|
||||
poiAdditionals.clear();
|
||||
}
|
||||
|
||||
public boolean areAllTypesAccepted(){
|
||||
|
|
@ -403,22 +431,45 @@ public class PoiLegacyFilter implements SearchPoiTypeFilter {
|
|||
}
|
||||
|
||||
|
||||
public void setTypeToAccept(PoiCategory type, boolean accept){
|
||||
if(accept){
|
||||
acceptedTypes.put(type, new LinkedHashSet<String>());
|
||||
} else {
|
||||
acceptedTypes.remove(type);
|
||||
}
|
||||
}
|
||||
|
||||
public void updateTypesToAccept(AbstractPoiType pt) {
|
||||
acceptedTypes.clear();
|
||||
pt.putTypes(acceptedTypes);
|
||||
poiAdditionals.clear();
|
||||
fillPoiAdditionals(pt);
|
||||
}
|
||||
|
||||
private void fillPoiAdditionals(AbstractPoiType pt) {
|
||||
for(PoiType add : pt.getPoiAdditionals()) {
|
||||
poiAdditionals.put(add.getKeyName().replace('_', ':').replace(' ', ':'), add);
|
||||
poiAdditionals.put(add.getTranslation().replace(' ', ':').toLowerCase(), add);
|
||||
}
|
||||
if(pt instanceof PoiFilter && !(pt instanceof PoiCategory)) {
|
||||
for(PoiType ps : ((PoiFilter) pt).getPoiTypes()) {
|
||||
fillPoiAdditionals(ps);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void updatePoiAdditionals() {
|
||||
Iterator<Entry<PoiCategory, LinkedHashSet<String>>> e = acceptedTypes.entrySet().iterator();
|
||||
poiAdditionals.clear();
|
||||
while(e.hasNext()) {
|
||||
Entry<PoiCategory, LinkedHashSet<String>> pc = e.next();
|
||||
fillPoiAdditionals(pc.getKey());
|
||||
if(pc.getValue() != null) {
|
||||
for(String s : pc.getValue()) {
|
||||
PoiType subtype = poiTypes.getPoiTypeByKey(s);
|
||||
fillPoiAdditionals(subtype);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void updateTypesToAccept(PoiLegacyFilter f) {
|
||||
acceptedTypes.clear();
|
||||
acceptedTypes.putAll(f.acceptedTypes);
|
||||
poiAdditionals.clear();
|
||||
poiAdditionals.putAll(f.poiAdditionals);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -428,12 +479,27 @@ public class PoiLegacyFilter implements SearchPoiTypeFilter {
|
|||
|
||||
public void selectSubTypesToAccept(PoiCategory t, LinkedHashSet<String> accept){
|
||||
acceptedTypes.put(t, accept);
|
||||
fillPoiAdditionals(t);
|
||||
}
|
||||
|
||||
public void setTypeToAccept(PoiCategory poiCategory, boolean b) {
|
||||
if(b) {
|
||||
acceptedTypes.put(poiCategory, null);
|
||||
} else {
|
||||
acceptedTypes.remove(poiCategory);
|
||||
}
|
||||
updatePoiAdditionals();
|
||||
|
||||
}
|
||||
|
||||
public String getFilterId(){
|
||||
return filterId;
|
||||
}
|
||||
|
||||
public Map<String, PoiType> getPoiAdditionals() {
|
||||
return poiAdditionals;
|
||||
}
|
||||
|
||||
public String getSimplifiedId(){
|
||||
if(filterId.startsWith(STD_PREFIX)) {
|
||||
return filterId.substring(STD_PREFIX.length()).toLowerCase();
|
||||
|
|
@ -483,4 +549,7 @@ public class PoiLegacyFilter implements SearchPoiTypeFilter {
|
|||
|
||||
public boolean accept(Amenity a) ;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue