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

Merge branch 'master' of ssh://github.com/osmandapp/Osmand into markers_with_map_objects

Browse source 
# Conflicts:
#	OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
This commit is contained in:
Alexander Sytnyk 2017-12-14 16:02:50 +02:00
commit bd544be590
37 changed files with 540 additions and 327 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values-be-rBY/strings.xml
View file

@ -2888,7 +2888,7 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
<string name="import_as_gpx">Impartavać jak GPX-fajł</string>
<string name="import_as_favorites">Impartavać jak Ulubionyja</string>
<string name="import_file">Impartavać fajł</string>
<string name="tap_on_map_to_hide_interface_descr">Dotyk na mapie pieramykaje knopki kiravannia i vidžety.</string>
<string name="tap_on_map_to_hide_interface_descr">Dotyk na mapie chavaje knopki kiravannia i vidžety.</string>
<string name="tap_on_map_to_hide_interface">Poŭnyekranny režym</string>
<string name="show_on_top_bar">Pakazać na vierchniaj paneli</string>
<string name="mark_passed">Adznačyć prajdzienyja</string>

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

@ -3690,4 +3690,12 @@
<string name="poi_depot">Дэпо</string>
<string name="poi_letter_box">Паштовая скрыня</string>
<string name="poi_post_street">Вуліца</string>
<string name="poi_post_housenumber">Нумар дома</string>
<string name="poi_post_flats">Кватэра</string>
<string name="poi_payment_centre">Плацёжны цэнтр</string>
<string name="poi_money_transfer">Грашовы перавод</string>
</resources>

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

@ -2937,7 +2937,7 @@
<string name="import_as_gpx">Імпартаваць як GPX-файл</string>
<string name="import_as_favorites">Імпартаваць як Улюбёныя</string>
<string name="import_file">Імпартаваць файл</string>
<string name="tap_on_map_to_hide_interface_descr">Дотык на мапе перамыкае кнопкі кіравання і віджэты.</string>
<string name="tap_on_map_to_hide_interface_descr">Дотык на мапе хавае кнопкі кіравання і віджэты.</string>
<string name="tap_on_map_to_hide_interface">Поўныэкранны рэжым</string>
<string name="show_on_top_bar">Паказаць на верхняй панэлі</string>
<string name="mark_passed">Адзначыць прайдзеныя</string>

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

@ -3735,4 +3735,9 @@
<string name="poi_depot">Depot</string>
<string name="poi_letter_box">Postkasse</string>
<string name="poi_post_street">Gade</string>
<string name="poi_post_housenumber">Husnummer</string>
<string name="poi_post_flats">Lejlighed</string>
</resources>

8
OsmAnd/res/values-eo/phrases.xml
View file

@ -3655,4 +3655,12 @@
<string name="poi_depot">Aŭtobusejo/tramejo</string>
<string name="poi_letter_box">Leterkesto</string>
<string name="poi_post_street">Strato</string>
<string name="poi_post_housenumber">Numero de domo</string>
<string name="poi_post_flats">Apartamento</string>
<string name="poi_payment_centre">Centro de pago</string>
<string name="poi_money_transfer">Centro de mon-transfero</string>
</resources>

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

@ -2851,7 +2851,7 @@ Indikas lokon: %1$s x %2$s"</string>
<string name="import_as_gpx">Enporti kiel GPX-dosieron</string>
<string name="import_as_favorites">Enporti kiel ŝatatajn</string>
<string name="import_file">Enporti dosieron</string>
<string name="tap_on_map_to_hide_interface_descr">Frapeti la mapon por baskuli butonojn kaj fenestraĵojn.</string>
<string name="tap_on_map_to_hide_interface_descr">Frapetu la mapon por kaŝi kontrol-butonojn kaj fenestraĵojn.</string>
<string name="tap_on_map_to_hide_interface">Plenekrana reĝimo</string>
<string name="show_on_top_bar">Montri en supra breto</string>
<string name="mark_passed">Marki kiel pasigitan</string>

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

@ -3701,4 +3701,12 @@
<string name="poi_depot">Depósito</string>
<string name="poi_letter_box">Buzón postal</string>
<string name="poi_post_street">Calle</string>
<string name="poi_post_housenumber">Número de portal</string>
<string name="poi_post_flats">Plano</string>
<string name="poi_payment_centre">Centro de pagos</string>
<string name="poi_money_transfer">Transferencia de dinero</string>
</resources>

2
OsmAnd/res/values-es-rAR/strings.xml
View file

@ -2812,7 +2812,7 @@ Proporciona un código completo</string>
<string name="import_as_gpx">Importar como archivo GPX</string>
<string name="import_as_favorites">Importar como favoritos</string>
<string name="import_file">Importar archivo</string>
<string name="tap_on_map_to_hide_interface_descr">Una pulsación en el mapa alterna la vista de la interfaz y los controles.</string>
<string name="tap_on_map_to_hide_interface_descr">Una pulsación en el mapa oculta los botones de la interfaz y los controles.</string>
<string name="tap_on_map_to_hide_interface">Modo de pantalla completa</string>
<string name="show_on_top_bar">Mostrar en la barra superior</string>
<string name="mark_passed">Descartar marcador</string>

8
OsmAnd/res/values-es-rUS/phrases.xml
View file

@ -3463,4 +3463,12 @@
<string name="poi_depot">Depósito</string>
<string name="poi_letter_box">Buzón postal</string>
<string name="poi_post_street">Calle</string>
<string name="poi_post_housenumber">Número de portal</string>
<string name="poi_post_flats">Plano</string>
<string name="poi_payment_centre">Centro de pagos</string>
<string name="poi_money_transfer">Transferencia de dinero</string>
</resources>

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

@ -575,7 +575,7 @@
<string name="use_compass_navigation_descr">اگر جهت شناسایی نمی‌شود از قطب‌نما استفاده کن.</string>
<string name="avoid_motorway">اجتناب از آزادراه‌ها</string>
<string name="snap_to_road_descr">در طول راهبری، موقعیت را به جاده‌ها بچسبان.</string>
<string name="snap_to_road">چسبیدن به جاده</string>
<string name="snap_to_road">چسبیدن به راه</string>
<string name="osmand_play_title_30_chars">نقشه و مسیریابی با OsmAnd</string>
<string name="osmand_short_description_80_chars">برنامهٔ همراه برای مشاهدهٔ نقشه جهانی و راهبری با نقشه‌های آفلاین و آنلاین OSM</string>
<string name="osmand_plus_play_title_30_chars">نقشه و مسیریابی با OsmAnd+‎</string>
@ -2794,7 +2794,7 @@
<string name="osmand_extended_description_part3">نقشه • نقاط محبوب (POI یا Points of interest) اطرافتان را نشان می‌دهد • نقشه را در راستای حرکتتان (یا قطب‌نما) تنظیم می‌کند • موقعیتتان یا جایی را که جست‌وجو کرده‌اید، نشانتان می‌دهد • موقعیتتان را با دوستانتان به‌اشتراک بگذارید تا شما را پیدا کنند • جاهایی را که دوست دارید در قسمت نقاط برگزیده ذخیره کنید • شیوهٔ نمایش نام‌های روی نقشه را انتخاب کنید: انگلیسی، محلی یا نویسه‌گردانی‌شده • نمایش نقشه‌های تخصصی آنلاین، تصاویر ماهواره‌ای (بینگ) و رولایه‌های مختلف مانند مسیرهای گردشگردی یا راهبری GPX با امکان تنظیم شفافیت</string>
<string name="release_2_8">• نشانه‌های نقشه را به‌صورت کامل بازسازی کردیم و قابلیت‌های خطوط راهنما و طرح‌ریزی مسیر نیز به آن افزوده شد
\n
\n • قابلیت چسبیدن به جاده و ذخیره‌کردن نقاط به‌عنوان مسیر، به ابزار مسافت‌سنج اضافه شد
\n • قابلیت چسبیدن به راه و ذخیره‌کردن نقاط به‌عنوان مسیر، به ابزار مسافت‌سنج اضافه شد
\n
\n • به‌روزرسانی پویا (OsmAnd Live): رفع ایرادات - داده‌های سرور هر ۳۰ دقیقه به‌روز می‌شود - به‌روزرسانی‌ها در مسیریابی استفاده می‌شود
\n

209
OsmAnd/res/values-id/strings.xml
View file

@ -125,7 +125,7 @@
<string name="coordinate_input_accuracy">1$d digit</string>
<string name="go_to_next_field">Lanjut ke bidang selanjutnya</string>
<string name="rename_marker">Ubah nama penanda</string>
<string name="tap_on_map_to_hide_interface_descr">Sentuh pada peta akan menampilkan tombol kontrol dan widget.</string>
<string name="tap_on_map_to_hide_interface_descr">Sentuh pada peta akan menyembunyikan tombol kontrol dan widget.</string>
<string name="tap_on_map_to_hide_interface">Mode layar penuh</string>
<string name="mark_passed">Tanda telah lewat</string>
<string name="import_gpx_file_description">bisa diimpor sebagai Favorites points, atau sebagai track file.</string>
@ -331,4 +331,211 @@
<string name="points_delete_multiple_succesful">Titik berhasil dihapus.</string>
<string name="points_delete_multiple">Anda akan menghapus %1$d point (s). Apakah kamu yakin?</string>
<string name="route_points_category_name">Turn untuk meneruskan rute ini</string>
<string name="track_points_category_name">Poin penting pada rute ini</string>
<string name="gpx_track">Trek</string>
<string name="max_speed">Kecepatan maksimal</string>
<string name="average_speed">Kecepatan rata-rata</string>
<string name="shared_string_time_moving">Waktu berpindah</string>
<string name="shared_string_time_span">rentang waktu</string>
<string name="shared_string_max">Maksimum</string>
<string name="shared_string_start_time">Waktu Mulai</string>
<string name="shared_string_end_time">Waktu Akhir</string>
<string name="shared_string_color">Warna</string>
<string name="select_gpx_folder">Pilih Folder Trek</string>
<string name="file_can_not_be_moved">File tidak bisa dipindahkan.</string>
<string name="shared_string_move">Pindah</string>
<string name="shared_string_tracks">Jalur</string>
<string name="routing_attr_driving_style_name">Gaya Berkendara</string>
<string name="route_altitude">Ketinggian Rute</string>
<string name="altitude_descent">Turun</string>
<string name="altitude_ascent">Naik</string>
<string name="altitude_range">Ketinggian Jangkauan</string>
<string name="average_altitude">Jangkauan Rata-rata</string>
<string name="shared_string_time">Waktu</string>
<string name="total_distance">Jarak Total</string>
<string name="routing_attr_relief_smoothness_factor_name">Pilih fluktuasi ketinggian</string>
<string name="routing_attr_height_obstacles_name">Gunakan Data Ketinggian</string>
<string name="routing_attr_height_obstacles_description">Gunakan data elevasi medan yang disediakan oleh SRTM, ASTER, dan EU-DEM.</string>
<string name="rendering_attr_depthContours_description">Tampilkan kontur dan titik kedalaman.</string>
<string name="rendering_attr_depthContours_name">Kontur kedalaman bahari</string>
<string name="release_2_6">\\ 022 Fitur baru: Tombol tindakan cepat
\n
\n • Respons gerakan layar sentuh yang ditingkatkan (misalnya panning dan pembesaran bersamaan)
\n
\n • Font peta baru yang mencakup lebih banyak tempat
\n
\n • Mendukung TTS untuk varian bahasa daerah (dan aksen)
\n
\n • Visibilitas perangkat tambahan dalam beberapa gaya peta dan wikipedia
\n
\n • Mendukung Open Location Code (OLC)
\n
\n • Ketinggian tampilan, kemiringan, dan profil kecepatan untuk trek GPX yang tercatat dan rute yang dihitung
\n
\n • Pengaturan \"Gaya Mengemudi\" dan perbaikan logika dalam perutean sepeda
\n
\n • Pengaturan untuk menggunakan data ketinggian dalam perutean sepeda
\n
\n • Beberapa perbaikan dan perbaikan bug lainnya
\n
\n dan banyak lagi …</string>
<string name="release_2_7">\\ 022 Mapillary plugin dengan citra tingkat jalan
\n
\n • Ruler widget untuk pengukuran jarak jauh
\n
\n • interval split GPX dengan info rinci tentang trek Anda
\n
\n • Perbaikan dan perbaikan bug lainnya
\n
\n</string>
<string name="release_2_8">\\ 022 Mapillary plugin dengan citra tingkat jalan
\n
\n • Ruler widget untuk pengukuran jarak jauh
\n
\n • interval split GPX dengan info rinci tentang trek Anda
\n
\n • Perbaikan dan perbaikan bug lainnya
\n
\n</string>
<string name="auto_split_recording_title">Rekaman split otomatis setelah jeda</string>
<string name="auto_split_recording_descr">Mulai segmen baru setelah jeda 6 menit, lintasan baru setelah jeda 2 jam, atau file baru setelah jeda lebih lama jika tanggalnya sudah berubah.</string>
<string name="rendering_attr_contourDensity_description">Kerapatan garis kontur</string>
<string name="rendering_attr_contourDensity_name">Kerapatan garis kontur</string>
<string name="rendering_value_high_name">Tinggi</string>
<string name="rendering_value_medium_w_name">Sedang</string>
<string name="rendering_value_low_name">Rendah</string>
<string name="rendering_attr_contourWidth_description">Garis kontur lebar</string>
<string name="rendering_attr_contourWidth_name">Lebar Garis kontur</string>
<string name="rendering_attr_hideWaterPolygons_description">Air</string>
<string name="rendering_attr_hideWaterPolygons_name">Sembunyikan air</string>
<string name="legacy_search">Pencarian lawas</string>
<string name="show_legacy_search">Tampilkan Pencarian lama</string>
<string name="show_legacy_search_desc">Tambahkan pencarian lama ke daftar laci.</string>
<string name="routing_attr_allow_motorway_name">Izinkan jalan raya</string>
<string name="routing_attr_allow_motorway_description">Izinkan jalan raya.</string>
<string name="upload_osm_note_description">Anda dapat mengunggah Catatan OSM Anda secara anonim atau menggunakan profil OpenStreetMap.org Anda.</string>
<string name="wiki_around">Artikel Wikipedia Terdekat</string>
<string name="search_map_hint">Cari Kota atau daerah</string>
<string name="route_roundabout_short">Ambil %1$d keluar dan pergi</string>
<string name="upload_poi">Unggah POI</string>
<string name="route_calculation">Perhitungan Rute</string>
<string name="gpx_no_tracks_title">Anda belum memiliki trek</string>
<string name="gpx_no_tracks_title_folder">Anda juga dapat menambahkan trek ke folder</string>
<string name="gpx_add_track">Tambah Rute</string>
<string name="gpx_appearance">Tampilan</string>
<string name="osmo_share_location">Bagikan</string>
<string name="osmo_pause_location">Jeda</string>
<string name="osmo_service_running">Servis OsMo sedang berjalan</string>
<string name="trip_rec_notification_settings">Aktifkan rekaman mulai cepat</string>
<string name="trip_rec_notification_settings_desc">Tampilkan pemberitahuan sistem yang memungkinkan untuk memulai perekaman perjalanan.</string>
<string name="shared_string_notifications">Pemberitahuan</string>
<string name="shared_string_continue">Lanjutkan</string>
<string name="shared_string_pause">Jeda</string>
<string name="shared_string_paused">Telah di jeda</string>
<string name="shared_string_trip">Perjalanan</string>
<string name="shared_string_recorded">Terekam</string>
<string name="shared_string_record">Merekam</string>
<string name="gpx_logging_no_data">Tidak ada Data</string>
<string name="release_2_5">\\ 022 Ikon yang dapat disentuh di peta
\n
\n • Penelusuran filter POI yang kuat: Cari, mis. restoran dengan masakan, atau tempat perkemahan dengan fasilitas khusus
\n
\n • Gaya New Topo Map untuk pengendara sepeda dan pejalan kaki
\n
\n • Rekaman perjalanan yang disempurnakan
\n
\n • Pemberitahuan navigasi yang ditingkatkan (Android Wear)
\n
\n • Banyak perbaikan dan perbaikan bug lainnya
\n
\n dan banyak lagi …</string>
<string name="rendering_attr_contourColorScheme_description">Garis warna berkontur skema</string>
<string name="save_track_min_speed">Logging kecepatan minimum</string>
<string name="save_track_min_speed_descr">Filter: Tetapkan kecepatan minimum untuk satu titik yang akan dicatat.</string>
<string name="save_track_min_distance">Pemindahan minimum logging</string>
<string name="save_track_min_distance_descr">Filter: Tetapkan jarak minimum dari posisi terakhir agar titik yang akan dicatat.</string>
<string name="save_track_precision">Ketepatan minimum logging</string>
<string name="save_track_precision_descr">Filter: Tetapkan jarak minimum dari ketepatan agar titik yang akan dicatat.</string>
<string name="christmas_poi">POI Natal</string>
<string name="christmas_desc">Mengantisipasi liburan Natal dan Tahun Baru, Anda dapat memilih untuk menampilkan POI yang terkait dengan Natal: pohon natal, pasar, dll.</string>
<string name="christmas_desc_q">Tampilkan Natal POI?</string>
<string name="rendering_value_light_brown_name">Coklat Muda</string>
<string name="rendering_value_dark_brown_name">Cokelat Tua</string>
<string name="rendering_attr_contourColorScheme_name">Skema warna garis kontur</string>
<string name="rendering_attr_surfaceIntegrity_name">Integritas permukaan jalan</string>
<string name="search_hint">Ketik kota, alamat, nama poi</string>
<string name="translit_name_if_miss">Menerjemahkan jika nama %1$s hilang</string>
<string name="translit_names">Menerjemahkan nama</string>
<string name="edit_filter">Edit Kategori</string>
<string name="subcategories">Sub-kategori</string>
<string name="selected_categories">Pilih Kategori</string>
<string name="create_custom_poi">Buat Filter Khusus</string>
<string name="custom_search">Pencarian Khusus</string>
<string name="shared_string_filters">Filter</string>
<string name="apply_filters">Terapkan Filter</string>
<string name="save_filter">Simpan Filter</string>
<string name="delete_filter">Hapus Filter</string>
<string name="new_filter">Filter Baru</string>
<string name="new_filter_desc">Harap masukkan nama untuk filter baru, ini akan ditambahkan ke tab Kategori Anda.</string>
<string name="osm_live_payment_desc">Biaya berlangganan akan dibebankan setiap bulan. Anda dapat membatalkan langganan di Google Play kapan saja.</string>
<string name="donation_to_osm">Donasi untuk Komunitas OpenStreetMap</string>
<string name="donation_to_osm_desc">Sebagian donasi Anda akan dikirim ke pengguna OSM yang mengirimkan perubahan ke OpenStreetMap. Biaya berlangganan tetap sama.</string>
<string name="osm_live_subscription_desc">Langganan memungkinkan pembaruan per jam, harian, mingguan, dan unduhan tak terbatas untuk semua peta secara global.</string>
<string name="get_it">Mendapatkan</string>
<string name="get_for">Dapatkan untuk %1$s</string>
<string name="get_for_month">Dapatkan untuk %1$s sebulan</string>
<string name="osm_live_banner_desc">Dapatkan download peta tak terbatas, dan update peta lebih dari sebulan sekali: mingguan, harian, atau per jam.</string>
<string name="osmand_plus_banner_desc">Download unduhan, pembaruan, dan plugin tak terbatas.</string>
<string name="si_mi_meters">Mil/Meter</string>
<string name="skip_map_downloading">Lewati download peta</string>
<string name="skip_map_downloading_desc">Anda tidak memiliki peta offline yang terpasang Anda dapat memilih peta dari daftar atau mendownload peta nanti melalui Menu -%1$s.</string>
<string name="search_another_country">Pilih Daerah lain</string>
<string name="search_map">Mencari Peta…</string>
<string name="first_usage_wizard_desc">Biarkan OsmAnd menentukan lokasi Anda dan menyarankan peta untuk diunduh di wilayah tersebut.</string>
<string name="location_not_found">Lokasi tidak ditemukan</string>
<string name="no_inet_connection">Tidak ada koneksi internet</string>
<string name="no_inet_connection_desc_map">Diperlukan untuk mendownload peta.</string>
<string name="search_location">Mencari lokasi…</string>
<string name="storage_free_space">Ruang Bebas</string>
<string name="storage_place_description">Penyimpanan data OsmAnd (untuk peta, jalur, dll.):%1$s.</string>
<string name="give_permission">Beri Izin</string>
<string name="allow_access_location">Izinkan akses untuk lokasi</string>
<string name="first_usage_greeting">Dapatkan petunjuk arah dan temukan tempat baru tanpa koneksi internet</string>
<string name="search_my_location">Temukan Posisi saya</string>
<string name="no_update_info_desc">Jangan cek untuk update versi atau diskon terkait OsmAnd.</string>
<string name="no_update_info">Jangan Tampilkan Pembaruan</string>
<string name="update_all_maps_now">Apakah anda ingin memperbahurui semua peta sekarang?</string>
<string name="clear_tile_data">Bersihkan Semua ubin</string>
<string name="routing_attr_short_way_name">Cara hemat bahan bakar</string>
<string name="routing_attr_short_way_description">Gunakan cara hemat bahan bakar (biasanya lebih pendek).</string>
<string name="replace_favorite_confirmation">Apakah kamu yakin kamu ingin mengganti favorit %1$s?</string>
<string name="rendering_attr_hideOverground_name">Benda-benda di atas tanah</string>
<string name="shared_string_change">Ganti</string>
<string name="get_started">Memulai</string>
<string name="route_stops_before">%1$s berhenti sebelum</string>
<string name="coords_search">Cari Koordinat</string>
<string name="advanced_coords_search">Pencarian koordinat lanjutan</string>
<string name="back_to_search">Kembali ke pencarian</string>
<string name="confirmation_to_delete_history_items">Apakah Anda ingin menghapus item yang dipilih dari riwayat?</string>
<string name="show_something_on_map">Tampilkan %1$s di peta</string>
<string name="release_2_4">\\ 022 Pencarian teks gratis yang sangat kuat
\n
\n • Car audio system / speaker phone integration via Bluetooth
\n
\n • Panduan rute yang ditingkatkan, dorongan suara, dan indikasi jalur putar
\n
\n • Lapisan transport yang ditingkatkan dengan rendering rute
\n
\n • Menambahkan lebih banyak lokasi dan sekarang mendukung daerah setempat
\n
\n • Banyak perbaikan dan perbaikan bug lainnya
\n
\n dan banyak lagi …</string>
<string name="dist_away_from_my_location">Cari %1$s pergi</string>
<string name="share_history_subject">Bagikan melalui OsmAnd</string>
<string name="search_categories">Kategori-kategori</string>
<string name="postcode">Kode Pos</string>
<string name="shared_string_from">Dari</string>
<string name="city_type_district">Distrik/Kabupaten</string>
<string name="city_type_neighbourhood">lingkungan</string>
</resources>

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

@ -2954,7 +2954,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
<string name="import_as_gpx">Importa come file GPX</string>
<string name="import_as_favorites">Importa come Preferito</string>
<string name="import_file">Importa file</string>
<string name="tap_on_map_to_hide_interface_descr">Un tap sulla mappa per visualizzare o meno i pulsanti di controllo e i widgets.</string>
<string name="tap_on_map_to_hide_interface_descr">Un tap sulla mappa per nascondere i pulsanti di controllo e i widgets.</string>
<string name="tap_on_map_to_hide_interface">Modalità a schermo intero</string>
<string name="show_on_top_bar">Mostra nella barra superiore</string>
<string name="mark_passed">Marcatore superato</string>

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

File diff suppressed because it is too large Load diff

42
OsmAnd/res/values-nb/phrases.xml
View file

@ -696,7 +696,7 @@
<string name="poi_operational_status">Driftsstatus</string>
<string name="poi_water_supply_type">Vannforsyningstype</string>
<string name="poi_water_purification">Vannrenseanlegg</string>
<string name="poi_traffic_enforcement">Trafikkhåndtering</string>
<string name="poi_traffic_enforcement">Trafikkhåndhevelse</string>
<string name="poi_power">Energi</string>
<string name="poi_administrative">Administrativt</string>
<string name="poi_club">Klubb</string>
@ -763,7 +763,7 @@
<string name="poi_perfumery">Parfymeri</string>
<string name="poi_spices">Krydderbasar</string>
<string name="poi_honey">Honningutsalg</string>
<string name="poi_religion">Religiøse nips</string>
<string name="poi_religion">Religiøse artikler</string>
<string name="poi_fire_hose">Brannslange</string>
<string name="poi_grit_bin">Grusbeholder</string>
@ -846,7 +846,7 @@
<string name="poi_country">Land</string>
<string name="poi_doctors">Doktorer</string>
<string name="poi_nursing_home">Pleiehjem</string>
<string name="poi_veterinary">Vetrinær</string>
<string name="poi_veterinary">Veterinær</string>
<string name="poi_audiologist">Audiolog</string>
<string name="poi_blood_bank">Blodbank</string>
<string name="poi_midwife">Jordmor</string>
@ -877,7 +877,7 @@
<string name="poi_base">Basehopp</string>
<string name="poi_basketball">Kurvball</string>
<string name="poi_beachvolleyball">Sandvolleyball</string>
<string name="poi_bmx">Triksesykkel</string>
<string name="poi_bmx">BMX</string>
<string name="poi_canoe">Kano</string>
<string name="poi_chess">Sjakk</string>
<string name="poi_climbing">Klatring</string>
@ -956,7 +956,7 @@
<string name="poi_craft_dressmaker">Skredder</string>
<string name="poi_craft_electrician">Elektriker</string>
<string name="poi_craft_gardener">Gartner</string>
<string name="poi_craft_handicraft">Kunsthåndtverk</string>
<string name="poi_craft_handicraft">Håndtverk</string>
<string name="poi_craft_insulation">Isolering</string>
<string name="poi_craft_locksmith">Låsesmed</string>
<string name="poi_craft_key_cutter">Nøkkelfiler</string>
@ -1046,7 +1046,7 @@
<string name="poi_wiki_lang_pnb">Punjab wiki</string>
<string name="poi_wiki_lang_my">Burmesisk wiki</string>
<string name="poi_wiki_lang_ne">Nepalsk wiki</string>
<string name="poi_wiki_lang_bar">Bavarisk wiki</string>
<string name="poi_wiki_lang_bar">Bayersk wiki</string>
<string name="poi_wiki_lang_mn">Mongolsk wiki</string>
<string name="poi_wiki_lang_nap">Napolitansk wiki</string>
@ -1085,11 +1085,11 @@
<string name="poi_crossing_unmarked">Umarkert</string>
<string name="poi_wholesale">Engros</string>
<string name="poi_access_private">Privat tilkomst</string>
<string name="poi_access_private">Privat tilgang</string>
<string name="poi_access_no">Ingen adgang</string>
<string name="poi_access_customers">Kundeadgang</string>
<string name="poi_access_delivery">Leveringsadgang</string>
<string name="poi_access_agricultural">Adgang for lan</string>
<string name="poi_access_agricultural">Landbrukstilgang</string>
<string name="poi_content_water">Innhold: Vann</string>
<string name="poi_content_oil">Innhold: Olje</string>
@ -1110,7 +1110,7 @@
<string name="poi_nudism_permissive">Med tillatelse</string>
<string name="poi_trade_building_supplies">Byggematerialer</string>
<string name="poi_trade_wood">Tømmer</string>
<string name="poi_trade_wood">Trehandel</string>
<string name="poi_population">Befolkning</string>
<string name="poi_bicycle_parking_shed">Sykkelskur</string>
<string name="poi_bicycle_parking_informal">Uformell</string>
@ -1144,21 +1144,21 @@
<string name="poi_animal_shelter_cat">Katter</string>
<string name="poi_animal_shelter_dog_cat">Hunder, katter</string>
<string name="poi_animal_shelter_bird">Fulger</string>
<string name="poi_animal_shelter_wildlife">Skogsdyr</string>
<string name="poi_animal_shelter_wildlife">Dyreliv</string>
<string name="poi_animal_shelter_horse">Hester</string>
<string name="poi_animal_shelter_mammal">Pattedyr</string>
<string name="poi_animal_shelter_fish">Fisker</string>
<string name="poi_seats">Seter</string>
<string name="poi_generator_source_coal">Energikilde: Kull</string>
<string name="poi_generator_source_gas">Energikulde: Gass</string>
<string name="poi_generator_source_nuclear">Energikulde: Atomkraft</string>
<string name="poi_generator_source_solar">Energikulde: Solkraft</string>
<string name="poi_generator_source_hydro">Energikulde: Vannkraft</string>
<string name="poi_generator_source_wind">Energikulde: Vindmøller</string>
<string name="poi_generator_source_geothermal">Energikulde: Geotermisk</string>
<string name="poi_generator_source_oil">Energikulde: Olje</string>
<string name="poi_generator_source_diesel">Energikulde: Diesel</string>
<string name="poi_generator_source_gas">Energikilde: Gass</string>
<string name="poi_generator_source_nuclear">Energikilde: Atomkraft</string>
<string name="poi_generator_source_solar">Energikilde: Solkraft</string>
<string name="poi_generator_source_hydro">Energikilde: Vannkraft</string>
<string name="poi_generator_source_wind">Energikilde: Vind</string>
<string name="poi_generator_source_geothermal">Energikilde: Geotermisk</string>
<string name="poi_generator_source_oil">Energikilde: Olje</string>
<string name="poi_generator_source_diesel">Energikilde: Diesel</string>
<string name="poi_int_name">Internasjonalt navn</string>
<string name="poi_loc_name">Lokalt navn</string>
@ -1167,8 +1167,8 @@
<string name="poi_pump_no">Ingen pumpe</string>
<string name="poi_information_sign">Skilt</string>
<string name="poi_information_tactile_model">Inget ildsted</string>
<string name="poi_information_tactile_map"></string>
<string name="poi_information_tactile_model">Taktil modell</string>
<string name="poi_information_tactile_map">Taktilt kart</string>
<string name="poi_fireplace_no">Inget ildsted</string>
<string name="poi_grass">Gress</string>
@ -1262,4 +1262,6 @@
<string name="poi_diet_kosher_yes">Kosher</string>
<string name="poi_charging_station_filter">Ladestasjon</string>
<string name="poi_nat_name">Nasjonalt navn</string>
<string name="poi_reg_name">Regionalt navn</string>
</resources>

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

@ -1791,7 +1791,7 @@
<string name="allow_access_location">Gi tilgang til plassering</string>
<string name="no_update_info_desc">Ikke se etter oppdateringer om nye versjoner eller rabatter relatert til OsmAnd.</string>
<string name="shared_string_change">Endre</string>
<string name="access_disable_offroute_recalc">Ikke endre ruten når du har forlatt veien</string>
<string name="access_disable_offroute_recalc">Ingen ny beregning etter å ha forlatt ruten</string>
<string name="access_disable_wrong_direction_recalc">Ingen ny ruteberegning ved motsatt retning</string>
<string name="access_disable_wrong_direction_recalc_descr">Forhindre automatisk omregning av rute når du beveger deg i feil retning.</string>
<string name="access_smart_autoannounce">Smart auto-meddelelse</string>
@ -1892,7 +1892,7 @@
<string name="map_widget_magnetic_bearing">Magnetisk peiling</string>
<string name="map_widget_bearing">Relativ peiling</string>
<string name="access_disable_offroute_recalc_descr">Forhindre automatisk ruteutregning når du er ganske langt unna rett vei.</string>
<string name="access_smart_autoannounce_descr">Varsle bare når retningen til målpunktet endres</string>
<string name="access_smart_autoannounce_descr">Varsle bare når retningen til målpunktet endres.</string>
<string name="access_autoannounce_period">Periode for automatisk annonsering</string>
<string name="access_autoannounce_period_descr">Minimumstid mellom meddelelser</string>
<string name="osmo_connect_to_device_tracker_id">Sporings-ID</string>
@ -2634,7 +2634,7 @@ Representerer området: %1$s x %2$s</string>
<string name="subscribe_email_desc">Abonner på vår e-postliste om programrabatter og få tre kartnedlastinger til!</string>
<string name="index_item_depth_points_southern_hemisphere">Havdybdepunkter for sørlig halvkule</string>
<string name="index_item_depth_points_northern_hemisphere">Havdybdepunkter for nordlig halvkule</string>
<string name="download_files_error_not_enough_space">Ikke nok plass. Trenger {3} MB midlertidig, {1} MB permanent. Kun {2} MB tilgjengelig.</string>
<string name="download_files_error_not_enough_space">Ikke nok plass! Lagringsplass som trengs er {3} MB midlertidig, {1} MB permanent. Tilgjengelig plass er kun {2} MB.</string>
<string name="download_files_question_space_with_temp">Laste ned {0} fil(er)? Brukt lagringsplass er {3} MB midlertidig, {1} MB permanent. (Tilgjengelig plass er {2} MB.)</string>
<string name="simulate_initial_startup_descr">Setter flagget som indikerer første programoppstart, alle andre innstillinger forblir uendret.</string>
<string name="local_osm_changes_backup_successful">OSM-endringsfil opprettet uten problem %1$s</string>
@ -2674,7 +2674,7 @@ Representerer området: %1$s x %2$s</string>
<string name="depth_contour_descr">Knippe kart som inneholder havdybdekotelinjer og sjømerker.</string>
<string name="do_not_send_anonymous_app_usage_desc">OsmAnd samler inn informasjon om hvilke deler av programmet du åpner. Plasseringen din blir aldri sendt, ei heller noe du måtte skrive inn i programmet eller detaljer om områder som vises, søkes etter, eller lastes ned.</string>
<string name="do_not_show_startup_messages_desc">Skrur av visning av programrabatter og spesielle lokale hendelsesmeldinger.</string>
<string name="routing_attr_driving_style_safety_name">Foretrekk småveier</string>
<string name="routing_attr_driving_style_safety_name">Foretrekk sideveier</string>
<string name="osm_live_header">Dette abonnementet skrur på timevise oppdateringer av alle kart verden over. Deler av inntekten går tilbake til OSM-gemenskapen, og er betalt for hvert OSM-bidrag. Hvis du elsker OsmAnd og OSM, og ønsker å støtte opp, dette er den perfekte måten å gjøre det.</string>
<string name="m_s">m/s</string>
<string name="lang_ber">Berber</string>

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

@ -2837,7 +2837,7 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="import_as_gpx">Importa comente documentu GPX</string>
<string name="import_as_favorites">Importa comente Preferidu</string>
<string name="import_file">Importa documentu</string>
<string name="tap_on_map_to_hide_interface_descr">Un\'incarcada in sa mapa allughet o istudat sos butones e sos widgets de controllu.</string>
<string name="tap_on_map_to_hide_interface_descr">Un\'incarcada in sa mapa istichit sos butones e sos widgets de controllu.</string>
<string name="tap_on_map_to_hide_interface">Modalidade a ischermu intreu</string>
<string name="show_on_top_bar">Ammustra in sa barra superiore</string>
<string name="mark_passed">Sinna comente coladu</string>

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

@ -136,7 +136,7 @@ public class MapActivityLayers {
mapView.addLayer(downloadedRegionsLayer, 0.5f);
// 0.9 gpx layer
gpxLayer = new GPXLayer(activity);
gpxLayer = new GPXLayer();
mapView.addLayer(gpxLayer, 0.9f);
// 1. route layer
@ -148,7 +148,7 @@ public class MapActivityLayers {
poiMapLayer = new POIMapLayer(activity);
mapView.addLayer(poiMapLayer, 3);
// 4. favorites layer
mFavouritesLayer = new FavouritesLayer(activity);
mFavouritesLayer = new FavouritesLayer();
mapView.addLayer(mFavouritesLayer, 4);
// 4.6 measurement tool layer
measurementToolLayer = new MeasurementToolLayer();

2
OsmAnd/src/net/osmand/plus/audionotes/AudioNotesLayer.java
View file

@ -188,7 +188,7 @@ public class AudioNotesLayer extends OsmandMapLayer implements
}
@Override
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> objects) {
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> objects, boolean unknownLocation) {
if (tileBox.getZoom() >= startZoom) {
getRecordingsFromPoint(point, tileBox, objects);
}

4
OsmAnd/src/net/osmand/plus/distancecalculator/DistanceCalculatorPlugin.java
View file

@ -499,7 +499,7 @@ public class DistanceCalculatorPlugin extends OsmandPlugin {
public boolean onLongPressEvent(PointF point, RotatedTileBox tileBox) {
List<Object> s = new ArrayList<>();
collectObjectsFromPoint(point, tileBox, s);
collectObjectsFromPoint(point, tileBox, s, true);
if (s.size() == 0 && distanceMeasurementMode == 1 && measurementPoints.size() > 0) {
LinkedList<WptPt> lt = measurementPoints.get(measurementPoints.size() - 1);
@ -595,7 +595,7 @@ public class DistanceCalculatorPlugin extends OsmandPlugin {
}
@Override
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o) {
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o, boolean unknownLocation) {
getMPointsFromPoint(tileBox, point, o);
}

2
OsmAnd/src/net/osmand/plus/mapillary/MapillaryVectorLayer.java
View file

@ -313,7 +313,7 @@ class MapillaryVectorLayer extends MapTileLayer implements MapillaryLayer, ICont
}
@Override
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> objects) {
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> objects, boolean unknownLocation) {
if (map != null && tileBox.getZoom() >= map.getMinimumZoomSupported()) {
getImagesFromPoint(tileBox, point, objects);
}

2
OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolLayer.java
View file

@ -380,7 +380,7 @@ public class MeasurementToolLayer extends OsmandMapLayer implements ContextMenuL
}
@Override
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o) {
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o, boolean unknownLocation) {
}

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

@ -518,7 +518,7 @@ public class OsmBugsLayer extends OsmandMapLayer implements IContextMenuProvider
}
@Override
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> res) {
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> res, boolean unknownLocation) {
if (tileBox.getZoom() >= startZoom) {
getBugFromPoint(tileBox, point, res);
}

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

@ -166,7 +166,7 @@ public class OsmEditsLayer extends OsmandMapLayer implements ContextMenuLayer.IC
}
@Override
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o) {
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o, boolean unknownLocation) {
if (tileBox.getZoom() >= startZoom) {
getOsmEditsFromPoint(point, tileBox, o);
}

2
OsmAnd/src/net/osmand/plus/osmo/OsMoPositionLayer.java
View file

@ -218,7 +218,7 @@ public class OsMoPositionLayer extends OsmandMapLayer implements ContextMenuLaye
}
@Override
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o) {
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o, boolean unknownLocation) {
getOsmoFromPoint(tileBox, point, o);
}

2
OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionLayer.java
View file

@ -141,7 +141,7 @@ public class ParkingPositionLayer extends OsmandMapLayer implements
}
@Override
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o) {
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o, boolean unknownLocation) {
getParkingFromPoint(tileBox, point, o);
}

2
OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsLayer.java
View file

@ -48,7 +48,7 @@ public class RoutePointsLayer extends OsmandMapLayer implements ContextMenuLaye
}
@Override
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o) {
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o, boolean unknownLocation) {
}

2
OsmAnd/src/net/osmand/plus/views/AidlMapLayer.java
View file

@ -134,7 +134,7 @@ public class AidlMapLayer extends OsmandMapLayer implements IContextMenuProvider
}
@Override
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o) {
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o, boolean unknownLocation) {
getFromPoint(tileBox, point, o);
}

11
OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
View file

@ -573,7 +573,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
private boolean showContextMenu(PointF point, RotatedTileBox tileBox, boolean showUnknownLocation) {
LatLon objectLatLon = null;
Map<Object, IContextMenuProvider> selectedObjects = selectObjectsForContextMenu(tileBox, point, false);
Map<Object, IContextMenuProvider> selectedObjects = selectObjectsForContextMenu(tileBox, point, false, showUnknownLocation);
NativeOsmandLibrary nativeLib = NativeOsmandLibrary.getLoadedLibrary();
if (nativeLib != null) {
MapRenderRepositories maps = activity.getMyApplication().getResourceManager().getRenderer();
@ -728,7 +728,8 @@ public class ContextMenuLayer extends OsmandMapLayer {
}
private Map<Object, IContextMenuProvider> selectObjectsForContextMenu(RotatedTileBox tileBox,
PointF point, boolean acquireObjLatLon) {
PointF point, boolean acquireObjLatLon,
boolean unknownLocation) {
List<LatLon> pressedLatLonFull = new ArrayList<>();
List<LatLon> pressedLatLonSmall = new ArrayList<>();
Map<Object, IContextMenuProvider> selectedObjects = new HashMap<>();
@ -737,7 +738,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
if (lt instanceof ContextMenuLayer.IContextMenuProvider) {
s.clear();
final IContextMenuProvider l = (ContextMenuLayer.IContextMenuProvider) lt;
l.collectObjectsFromPoint(point, tileBox, s);
l.collectObjectsFromPoint(point, tileBox, s, unknownLocation);
for (Object o : s) {
selectedObjects.put(o, l);
if (acquireObjLatLon && l.isObjectClickable(o)) {
@ -856,7 +857,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
switch (event.getAction()) {
case MotionEvent.ACTION_DOWN:
if (!mInChangeMarkerPositionMode && !mInGpxDetailsMode) {
selectObjectsForContextMenu(tileBox, new PointF(event.getX(), event.getY()), true);
selectObjectsForContextMenu(tileBox, new PointF(event.getX(), event.getY()), true, true);
if (pressedLatLonFull.size() > 0 || pressedLatLonSmall.size() > 0) {
view.refreshMap();
}
@ -875,7 +876,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
public interface IContextMenuProvider {
void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o);
void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o, boolean unknownLocation);
LatLon getObjectLocation(Object o);

2
OsmAnd/src/net/osmand/plus/views/DownloadedRegionsLayer.java
View file

@ -410,7 +410,7 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
// IContextMenuProvider
@Override
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> objects) {
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> objects, boolean unknownLocation) {
boolean isMenuVisible = false;
if (view.getContext() instanceof MapActivity) {
MapActivity mapActivity = (MapActivity) view.getContext();

31
OsmAnd/src/net/osmand/plus/views/FavouritesLayer.java
View file

@ -11,9 +11,7 @@ import android.graphics.PorterDuffColorFilter;
import android.support.annotation.ColorInt;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.Snackbar;
import android.support.v4.content.ContextCompat;
import android.view.View;
import net.osmand.data.FavouritePoint;
import net.osmand.data.LatLon;
@ -23,10 +21,8 @@ import net.osmand.data.QuadTree;
import net.osmand.data.RotatedTileBox;
import net.osmand.plus.FavouritesDbHelper;
import net.osmand.plus.MapMarkersHelper;
import net.osmand.plus.MapMarkersHelper.MapMarker;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.base.FavoriteImageDrawable;
import net.osmand.plus.views.ContextMenuLayer.ApplyMovedObjectCallback;
import net.osmand.plus.views.MapTextLayer.MapTextProvider;
@ -37,8 +33,6 @@ import java.util.List;
public class FavouritesLayer extends OsmandMapLayer implements ContextMenuLayer.IContextMenuProvider,
ContextMenuLayer.IMoveObjectProvider, MapTextProvider<FavouritePoint> {
private MapActivity mapActivity;
protected int startZoom = 6;
protected OsmandMapTileView view;
@ -63,10 +57,6 @@ public class FavouritesLayer extends OsmandMapLayer implements ContextMenuLayer.
return favorites.getFavouritePoints();
}
public FavouritesLayer(MapActivity mapActivity) {
this.mapActivity = mapActivity;
}
@Override
public void initLayer(OsmandMapTileView view) {
this.view = view;
@ -234,30 +224,11 @@ public class FavouritesLayer extends OsmandMapLayer implements ContextMenuLayer.
@Override
public boolean runExclusiveAction(Object o, boolean unknownLocation) {
if (unknownLocation || o == null || !(o instanceof FavouritePoint)
|| !view.getApplication().getSettings().SELECT_MARKER_ON_SINGLE_TAP.get()) {
return false;
}
MapMarker marker = mapMarkersHelper.getMapMarker((FavouritePoint) o);
if (marker != null) {
final MapMarker old = mapMarkersHelper.getMapMarkers().get(0);
mapMarkersHelper.moveMarkerToTop(marker);
String title = mapActivity.getString(R.string.marker_activated, mapMarkersHelper.getMapMarkers().get(0).getName(mapActivity));
Snackbar.make(mapActivity.findViewById(R.id.bottomFragmentContainer), title, Snackbar.LENGTH_LONG)
.setAction(R.string.shared_string_cancel, new View.OnClickListener() {
@Override
public void onClick(View v) {
mapMarkersHelper.moveMarkerToTop(old);
}
})
.show();
return true;
}
return false;
}
@Override
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> res) {
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> res, boolean unknownLocation) {
if (this.settings.SHOW_FAVORITES.get() && tileBox.getZoom() >= startZoom) {
getFavoriteFromPoint(tileBox, point, res);
}

30
OsmAnd/src/net/osmand/plus/views/GPXLayer.java
View file

@ -18,9 +18,7 @@ import android.os.AsyncTask;
import android.support.annotation.ColorInt;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.Snackbar;
import android.support.v4.content.ContextCompat;
import android.view.View;
import net.osmand.AndroidUtils;
import net.osmand.data.LatLon;
@ -38,12 +36,10 @@ import net.osmand.plus.GpxSelectionHelper.GpxDisplayGroup;
import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
import net.osmand.plus.MapMarkersHelper;
import net.osmand.plus.MapMarkersHelper.MapMarker;
import net.osmand.plus.MapMarkersHelper.MarkersSyncGroup;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings.CommonPreference;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.base.FavoriteImageDrawable;
import net.osmand.plus.mapcontextmenu.other.TrackDetailsMenu.TrackChartPoints;
import net.osmand.plus.render.OsmandRenderer;
@ -63,7 +59,6 @@ import java.util.Map;
public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContextMenuProvider,
ContextMenuLayer.IMoveObjectProvider, MapTextProvider<WptPt> {
private MapActivity mapActivity;
private OsmandMapTileView view;
private Paint paint;
@ -111,10 +106,6 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
@ColorInt
private int defPointColor;
public GPXLayer(MapActivity mapActivity) {
this.mapActivity = mapActivity;
}
@Override
public void initLayer(OsmandMapTileView view) {
this.view = view;
@ -588,30 +579,11 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
@Override
public boolean runExclusiveAction(Object o, boolean unknownLocation) {
if (unknownLocation || o == null || !(o instanceof WptPt)
|| !view.getApplication().getSettings().SELECT_MARKER_ON_SINGLE_TAP.get()) {
return false;
}
MapMarker marker = mapMarkersHelper.getMapMarker((WptPt) o);
if (marker != null) {
final MapMarker old = mapMarkersHelper.getMapMarkers().get(0);
mapMarkersHelper.moveMarkerToTop(marker);
String title = mapActivity.getString(R.string.marker_activated, mapMarkersHelper.getMapMarkers().get(0).getName(mapActivity));
Snackbar.make(mapActivity.findViewById(R.id.bottomFragmentContainer), title, Snackbar.LENGTH_LONG)
.setAction(R.string.shared_string_cancel, new View.OnClickListener() {
@Override
public void onClick(View v) {
mapMarkersHelper.moveMarkerToTop(old);
}
})
.show();
return true;
}
return false;
}
@Override
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> res) {
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> res, boolean unknownLocation) {
if (tileBox.getZoom() >= startZoom) {
getWptFromPoint(tileBox, point, res);
}

2
OsmAnd/src/net/osmand/plus/views/ImpassableRoadsLayer.java
View file

@ -167,7 +167,7 @@ public class ImpassableRoadsLayer extends OsmandMapLayer implements
}
@Override
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o) {
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o, boolean unknownLocation) {
if (tileBox.getZoom() >= startZoom) {
int ex = (int) point.x;
int ey = (int) point.y;

26
OsmAnd/src/net/osmand/plus/views/MapMarkersLayer.java
View file

@ -21,7 +21,6 @@ import android.view.MotionEvent;
import android.view.View;
import net.osmand.Location;
import net.osmand.data.Amenity;
import net.osmand.data.LatLon;
import net.osmand.data.PointDescription;
import net.osmand.data.QuadPoint;
@ -31,6 +30,7 @@ import net.osmand.plus.MapMarkersHelper;
import net.osmand.plus.MapMarkersHelper.MapMarker;
import net.osmand.plus.OsmAndConstants;
import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.TargetPointsHelper.TargetPoint;
@ -43,7 +43,6 @@ import net.osmand.plus.views.mapwidgets.MapMarkersWidgetsFactory;
import net.osmand.util.MapUtils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import gnu.trove.list.array.TIntArrayList;
@ -512,34 +511,21 @@ public class MapMarkersLayer extends OsmandMapLayer implements IContextMenuProvi
}
@Override
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o) {
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o, boolean unknownLocation) {
if (tileBox.getZoom() < 3 || !map.getMyApplication().getSettings().USE_MAP_MARKERS.get()) {
return;
}
MapMarkersHelper markersHelper = map.getMyApplication().getMapMarkersHelper();
List<MapMarker> markers = markersHelper.getMapMarkers();
OsmandApplication app = map.getMyApplication();
int r = getRadiusPoi(tileBox);
for (int i = 0; i < markers.size(); i++) {
MapMarker marker = markers.get(i);
if (!isSynced(marker)) {
for (MapMarker marker : app.getMapMarkersHelper().getMapMarkers()) {
if ((!unknownLocation && app.getSettings().SELECT_MARKER_ON_SINGLE_TAP.get()) || !isSynced(marker)) {
LatLon latLon = marker.point;
if (latLon != null) {
int ex = (int) point.x;
int ey = (int) point.y;
int x = (int) tileBox.getPixXFromLatLon(latLon.getLatitude(), latLon.getLongitude());
int y = (int) tileBox.getPixYFromLatLon(latLon.getLatitude(), latLon.getLongitude());
if (calculateBelongs(ex, ey, x, y, r)) {
if (map.getMyApplication().getSettings().SELECT_MARKER_ON_SINGLE_TAP.get()) {
if (calculateBelongs((int) point.x, (int) point.y, x, y, r)) {
o.add(marker);
} else {
Amenity mapObj = null;
if (marker.mapObjectName != null && marker.point != null) {
mapObj = findAmenity(map.getMyApplication(), -1,
Collections.singletonList(marker.mapObjectName), marker.point);
}
o.add(mapObj == null ? marker : mapObj);
}
}
}
}

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

@ -544,7 +544,7 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
}
@Override
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> objects) {
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> objects, boolean unknownLocation) {
if (tileBox.getZoom() >= startZoom) {
getAmenityFromPoint(tileBox, point, objects);
}

2
OsmAnd/src/net/osmand/plus/views/PointLocationLayer.java
View file

@ -182,7 +182,7 @@ public class PointLocationLayer extends OsmandMapLayer implements ContextMenuLay
@Override
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o) {
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o, boolean unknownLocation) {
if (tileBox.getZoom() >= 3) {
getMyLocationFromPoint(tileBox, point, o);
}

2
OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java
View file

@ -184,7 +184,7 @@ public class PointNavigationLayer extends OsmandMapLayer implements
}
@Override
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o) {
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> o, boolean unknownLocation) {
if (tileBox.getZoom() >= 3) {
TargetPointsHelper tg = map.getMyApplication().getTargetPointsHelper();
List<TargetPoint> intermediatePoints = tg.getAllPoints();

2
OsmAnd/src/net/osmand/plus/views/TransportStopsLayer.java
View file

@ -285,7 +285,7 @@ public class TransportStopsLayer extends OsmandMapLayer implements ContextMenuLa
}
@Override
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> res) {
public void collectObjectsFromPoint(PointF point, RotatedTileBox tileBox, List<Object> res, boolean unknownLocation) {
if(tileBox.getZoom() >= startZoomRoute && route != null) {
getFromPoint(tileBox, point, res, route.getForwardStops());
} else if (tileBox.getZoom() >= startZoom && data.getResults() != null) {