Merge branch 'master' of ssh://github.com/osmandapp/Osmand into measurement_tools
This commit is contained in:
Alexander Sytnyk
commit
40bfd45dd1
43 changed files with 919 additions and 382 deletions
17
LICENSE
17
LICENSE
|
|
@ -151,3 +151,20 @@
|
|||
- Lyon: "Métro-M-Lyon" by Otourly - Own work. Licensed under CC BY-SA 3.0 via Wikimedia Commons - https://commons.wikimedia.org/wiki/File:M%C3%A9tro-M-Lyon.svg#/media/File:M%C3%A9tro-M-Lyon.svg
|
||||
- Washington: "WMATA Metro Logo" by Noclip - Own work. Licensed under Public Domain via Commons - https://commons.wikimedia.org/wiki/File:WMATA_Metro_Logo.svg#/media/File:WMATA_Metro_Logo.svg
|
||||
- Los Angeles: "Lametro" by Los Angeles County Metropolitan Transportation Authority. Original uploader was Cheeselouise at en.wikipedia - Metro materials at http://www.metro.net/riding_metro/pocket_guide_cambodian_printers.pdf. Licensed under Public Domain via Commons - https://commons.wikimedia.org/wiki/File:Lametro.svg#/media/File:Lametro.svg
|
||||
|
||||
* Depth maps
|
||||
- The GEBCO_2014 Grid, version 20150318, www.gebco.net
|
||||
- U.S. Bureau of Ocean Energy Management (24 may 2017,12m per pixel)
|
||||
- South_Padre_Island_DEM_4133: Grothe, P.G., L.A. Taylor, B.W. Eakins, K.S. Carignan, D.Z. Friday, and M. Love, 2012. Digital Elevation Models of South Padre Island, Texas: Procedures, Data Sources and Analysis, NOAA National Geophysical Data Center technical report, Boulder, CO, 15 pp.
|
||||
- Corpus_Christi_DEM_1035: Taylor, L.A., B.W. Eakins, K.S. Carignan, R.R. Warnken, T. Sazonova, and D.C. Schoolcraft, 2008. Digital Elevation Model of Corpus Christi, Texas: Procedures, Data Sources and Analysis, NOAA Technical Memorandum NESDIS NGDC-11, National Geophysical Data Center, Boulder, CO, 19 pp.
|
||||
- western_gom_crm_v1: National Geophysical Data Center, 2001. U.S. Coastal Relief Model - Western Gulf of Mexico. National Geophysical Data Center, NOAA. doi:10.7289/V5QJ7F79 [access date].
|
||||
- central_gom_crm_v1: National Geophysical Data Center, 2001. U.S. Coastal Relief Model - Central Gulf of Mexico. National Geophysical Data Center, NOAA. doi:10.7289/V54Q7RW0 [access date].
|
||||
- Galveston_DEM_1072: Taylor, L.A., B.W. Eakins, K.S. Carignan, R.R. Warnken, T. Sazonova, and D.C. Schoolcraft, 2008. Digital Elevation Model of Galveston, Texas: Procedures, Data Sources and Analysis, NOAA Technical Memorandum NESDIS NGDC-12, National Geophysical Data Center, Boulder, CO, 20 pp.
|
||||
- Southern_Louisiana_DEM_3722 1/3 arc-second: Love, M.R., R.J. Caldwell, K.S. Carignan, B.W. Eakins, and L.A. Taylor, 2010. Digital Elevation Models of Southern Louisiana: Procedures, Data Sources and Analysis, NOAA National Geophysical Data Center technical report, Boulder, CO, 40 pp.
|
||||
- New_Orleans_DEM_1264: Love, M.R., C.J. Amante, L.A. Taylor, and B.W. Eakins, 2011. Digital Elevation Models of New Orleans, Louisiana: Procedures, Data Sources and Analysis, NOAA Technical Memorandum NESDIS NGDC-49, U.S. Dept. of Commerce, Boulder, CO, 46 pp.
|
||||
- Southern_Louisiana_DEM_4350: Love, M.R., R.J. Caldwell, K.S. Carignan, B.W. Eakins, and L.A. Taylor, 2010. Digital Elevation Models of Southern Louisiana: Procedures, Data Sources and Analysis, NOAA National Geophysical Data Center technical report, Boulder, CO, 40 pp.
|
||||
- Biloxi_DEM_1009: Taylor, L.A., B.W. Eakins, K.S. Carignan, R.R. Warnken, T. Sazonova, and D.C. Schoolcraft, 2008. Digital Elevation Model of Biloxi, Mississippi: Procedures, Data Sources and Analysis, NOAA Technical Memorandum NESDIS NGDC-9, National Geophysical Data Center, Boulder, CO, 32 pp.
|
||||
- Mobile_DEM_1255: Amante, C.J., M.R. Love, L.A. Taylor, and B.W. Eakins, 2011. Digital Elevation Models of Mobile, Alabama: Procedures, Data Sources and Analysis, NOAA Technical Memorandum NESDIS NGDC-44, Dept. of Commerce, Boulder, CO, 43 pp.
|
||||
- Panama_City_DEM_1276: Amante, C.J., M.R. Love, L.A. Taylor, and B.W. Eakins, 2011. Digital Elevation Models of Panama City, Florida: Procedures, Data Sources and Analysis, NOAA Technical Memorandum NESDIS NGDC-50, U.S. Dept. of Commerce, Boulder, CO, 46 pp.
|
||||
- Great Lakes: National Centers for Environmental Information (NCEI)
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout
|
||||
android:id="@+id/add_gpx_waypoint_bottom_sheet"
|
||||
android:id="@+id/add_gpx_point_bottom_sheet"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -25,14 +25,14 @@
|
|||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/add_gpx_waypoint_bottom_sheet_title"
|
||||
android:id="@+id/add_gpx_point_bottom_sheet_title"
|
||||
style="@style/TextAppearance.ContextMenuTitle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="16dp"
|
||||
android:layout_marginRight="16dp"
|
||||
android:layout_marginTop="16dp"
|
||||
android:text="@string/add_gpx_waypoint_bottom_sheet_title"/>
|
||||
android:text="@string/waypoint_one"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/description"
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:text="@string/shared_string_create"/>
|
||||
android:text="@string/shared_string_add"/>
|
||||
|
||||
<android.support.v7.widget.AppCompatButton
|
||||
android:id="@+id/cancel_button"
|
||||
|
|
@ -262,7 +262,7 @@
|
|||
tools:visibility="visible"/>
|
||||
|
||||
<include
|
||||
layout="@layout/add_gpx_waypoint_bottom_sheet"
|
||||
layout="@layout/add_gpx_point_bottom_sheet"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="bottom|left"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout
|
||||
android:id="@+id/add_gpx_waypoint_bottom_sheet"
|
||||
android:id="@+id/add_gpx_point_bottom_sheet"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -24,14 +24,14 @@
|
|||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/add_gpx_waypoint_bottom_sheet_title"
|
||||
android:id="@+id/add_gpx_point_bottom_sheet_title"
|
||||
style="@style/TextAppearance.ContextMenuTitle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="16dp"
|
||||
android:layout_marginRight="16dp"
|
||||
android:layout_marginTop="16dp"
|
||||
android:text="@string/add_gpx_waypoint_bottom_sheet_title"/>
|
||||
tools:text="@string/waypoint_one"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/description"
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
android:id="@+id/create_button"
|
||||
style="@style/DialogActionButton"
|
||||
android:layout_marginRight="8dp"
|
||||
android:text="@string/shared_string_create"/>
|
||||
android:text="@string/shared_string_add"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/cancel_button"
|
||||
|
|
@ -223,7 +223,7 @@
|
|||
<include layout="@layout/move_marker_bottom_sheet"
|
||||
tools:visibility="gone"/>
|
||||
|
||||
<include layout="@layout/add_gpx_waypoint_bottom_sheet"
|
||||
<include layout="@layout/add_gpx_point_bottom_sheet"
|
||||
tools:visibility="gone"/>
|
||||
|
||||
<FrameLayout
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/MainLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
xmlns:osmand="http://schemas.android.com/apk/res-auto"
|
||||
android:id="@+id/MainLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<ExpandableListView
|
||||
android:id="@android:id/list"
|
||||
|
|
@ -16,17 +18,96 @@
|
|||
android:divider="@null"
|
||||
android:dividerHeight="0dp"
|
||||
android:drawSelectorOnTop="false"
|
||||
android:groupIndicator="@android:color/transparent" />
|
||||
android:groupIndicator="@android:color/transparent"/>
|
||||
|
||||
<android.support.design.widget.FloatingActionButton
|
||||
android:id="@+id/fabButton"
|
||||
android:id="@+id/menu_fab"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_margin="16dp"
|
||||
android:src="@drawable/ic_action_plus"
|
||||
android:contentDescription="@string/quick_action_new_action"
|
||||
app:backgroundTint="@color/dashboard_blue"/>
|
||||
android:src="@drawable/ic_action_plus"
|
||||
app:backgroundTint="@color/dashboard_blue"
|
||||
app:fabSize="normal"/>
|
||||
|
||||
<android.support.design.widget.FloatingActionButton
|
||||
android:id="@+id/waypoint_fab"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_above="@id/menu_fab"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_marginRight="24dp"
|
||||
android:contentDescription="@string/quick_action_new_action"
|
||||
android:src="@drawable/ic_action_marker_dark"
|
||||
android:visibility="gone"
|
||||
app:backgroundTint="@color/dashboard_blue"
|
||||
app:fabSize="mini"
|
||||
tools:visibility="visible"/>
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/waypoint_text_layout"
|
||||
android:layout_toLeftOf="@id/waypoint_fab"
|
||||
android:layout_toStartOf="@id/waypoint_fab"
|
||||
android:layout_above="@id/menu_fab"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="40dp"
|
||||
android:layout_marginRight="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible">
|
||||
|
||||
<net.osmand.plus.widgets.TextViewEx
|
||||
android:textColor="?android:attr/textColorPrimary"
|
||||
osmand:typeface="@string/font_roboto_medium"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:id="@+id/waypoint_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical"
|
||||
android:text="@string/add_waypoint"/>
|
||||
|
||||
</FrameLayout>
|
||||
|
||||
<android.support.design.widget.FloatingActionButton
|
||||
android:id="@+id/route_fab"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_above="@id/waypoint_fab"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_marginBottom="16dp"
|
||||
android:layout_marginRight="24dp"
|
||||
android:contentDescription="@string/quick_action_new_action"
|
||||
android:src="@drawable/ic_action_markers_dark"
|
||||
android:visibility="gone"
|
||||
app:backgroundTint="@color/dashboard_blue"
|
||||
app:fabSize="mini"
|
||||
tools:visibility="visible"/>
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/route_text_layout"
|
||||
android:layout_toLeftOf="@id/route_fab"
|
||||
android:layout_toStartOf="@id/route_fab"
|
||||
android:layout_above="@id/waypoint_fab"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="40dp"
|
||||
android:layout_marginBottom="16dp"
|
||||
android:layout_marginRight="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible">
|
||||
|
||||
<net.osmand.plus.widgets.TextViewEx
|
||||
android:textColor="?android:attr/textColorPrimary"
|
||||
osmand:typeface="@string/font_roboto_medium"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:id="@+id/route_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical"
|
||||
android:text="@string/add_route_point"/>
|
||||
|
||||
</FrameLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
|
|
@ -2718,8 +2718,17 @@
|
|||
<string name="live_monitoring_max_interval_to_send_desrc">تحديد الوقت الإضافي المخزن للحفاظ على المواقع وإرسالها دون اتصال</string>
|
||||
<string name="mappilary_no_internet_desc">أنت بحاجة إلى إنترنت لعرض الصور من Mapillary</string>
|
||||
<string name="retry">اعد المحاولة</string>
|
||||
<string name="measurement_tool_action_bar">حدد موقعا على الخريطة وانقر على إضافة لإضافة نقطة إلى المسطرة.</string>
|
||||
<string name="measurement_tool">أداة القياس</string>
|
||||
<string name="measurement_tool_action_bar">تصفح الخريطة وأضف النقاط إلى خط</string>
|
||||
<string name="measurement_tool">قياس المسافة</string>
|
||||
<string name="add_gpx_waypoint_bottom_sheet_title">إضافة إحداثية وجهة gpx</string>
|
||||
<string name="shared_string_create">إنشاء</string>
|
||||
<string name="none_point_error">تحتاج إلى إضافة نقطة واحدة على الأقل.</string>
|
||||
<string name="enter_gpx_name">قم بإدخال اسم لـ GPX</string>
|
||||
<string name="show_on_map_after_saving">إظهار على الخريطة بعد الحفظ</string>
|
||||
<string name="add_route_point">إضافة نقطة مسار</string>
|
||||
<string name="add_waypoint">إضافة إحداثية</string>
|
||||
<string name="save_gpx_waypoint">حفظ إحداثية GPX</string>
|
||||
<string name="save_route_point">حفظ نقطة مسار</string>
|
||||
<string name="waypoint_one">إحداثية 1</string>
|
||||
<string name="route_point_one">نقطة المسار 1</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@
|
|||
<string name="shared_string_all">Usie</string>
|
||||
<string name="waypoints">Punkty šlachu</string>
|
||||
<string name="targets">Celi</string>
|
||||
<string name="announce_gpx_waypoints">Maršrutnyja punkty GPX</string>
|
||||
<string name="announce_gpx_waypoints">Punkty šlachu GPX</string>
|
||||
<string name="download_additional_maps">Ściahnuć mapy, što adsutnіčajuć, %1$s (%2$d MB)?</string>
|
||||
<string name="shared_string_more">Bolš…</string>
|
||||
<string name="rendering_value_browse_map_name">Prahlad mapy</string>
|
||||
|
|
@ -2760,7 +2760,7 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
|
|||
\n
|
||||
\n</string>
|
||||
<string name="rendering_value_translucent_pink_name">Paŭprazrysty ružovy</string>
|
||||
<string name="measurement_tool">Vymiareńnie</string>
|
||||
<string name="measurement_tool">Vymiarać adliehlasć</string>
|
||||
<string name="quick_action_resume_pause_navigation">Adnavić/Prypynić Navihacyju</string>
|
||||
<string name="quick_action_resume_pause_navigation_descr">Naciśnicie hetuju knopku, kab prypynić navihacyju ci adnavić jaje, kali jana ŭžo była prypynienaja.</string>
|
||||
<string name="quick_action_show_navigation_finish_dialog">Pakazvać dyjałoh Zaviaršeńnie navihacyi</string>
|
||||
|
|
@ -2770,7 +2770,16 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
|
|||
<string name="retry">Paŭtaryć sprobu</string>
|
||||
<string name="add_gpx_waypoint_bottom_sheet_title">Dadać GPX šlach</string>
|
||||
<string name="shared_string_create">Stvaryć</string>
|
||||
<string name="measurement_tool_action_bar">Vyłučycie miesća na mapie i naćisnicie knopku Dadać, kab dadać kropku da liniejcy.</string>
|
||||
<string name="measurement_tool_action_bar">Prahliadzieć mapu i dadać kropki da linii</string>
|
||||
<string name="live_monitoring_max_interval_to_send">Čas bufieryzacyi dlia anłajn sačeńnia</string>
|
||||
<string name="live_monitoring_max_interval_to_send_desrc">Zadaje čas bufieryzacyi dlia zbieražeńnia miescaŭ dlia adpraŭki biez zlučeńnia</string>
|
||||
</resources>
|
||||
<string name="none_point_error">Vy pavinny dadać pa mienšaj miery adnu kropku.</string>
|
||||
<string name="enter_gpx_name">Uviadzicie nazvu dlia GPX</string>
|
||||
<string name="show_on_map_after_saving">Pakazać mapu paslia zachavannia</string>
|
||||
<string name="add_route_point">Dadać kropku maršrutu</string>
|
||||
<string name="add_waypoint">Dadać kropku šliachu</string>
|
||||
<string name="save_gpx_waypoint">Zachavać GPX-kropku šliachu</string>
|
||||
<string name="save_route_point">Zachavać kropku maršrutu</string>
|
||||
<string name="waypoint_one">Kropka šliachu 1</string>
|
||||
<string name="route_point_one">Kropka maršrutu 1</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2809,8 +2809,8 @@
|
|||
\n • Іншыя паляпшэнні і выпраўленні хібаў
|
||||
\n
|
||||
\n</string>
|
||||
<string name="measurement_tool_action_bar">Вылучыце месца на мапе і націсніце кнопку Дадаць, каб дадаць кропку да лінейкі.</string>
|
||||
<string name="measurement_tool">Вымярэнне</string>
|
||||
<string name="measurement_tool_action_bar">Праглядзець мапу і дадаць кропкі да лініі</string>
|
||||
<string name="measurement_tool">Вымяраць адлегласць</string>
|
||||
<string name="quick_action_resume_pause_navigation">Аднавіць/прыпыніць навігацыю</string>
|
||||
<string name="quick_action_resume_pause_navigation_descr">Націсніце гэтую кропку, каб прыпыніць навігацыю ці аднавіць яе, калі яна ўжо была прыпынена.</string>
|
||||
<string name="quick_action_show_navigation_finish_dialog">Паказаць дыялог завяршэння навігацыі</string>
|
||||
|
|
@ -2822,4 +2822,13 @@
|
|||
<string name="retry">Паўтарыць</string>
|
||||
<string name="add_gpx_waypoint_bottom_sheet_title">Дадаць GPX-кропку</string>
|
||||
<string name="shared_string_create">Стварыць</string>
|
||||
<string name="none_point_error">Вы павінны дадаць па меншай меры адну кропку.</string>
|
||||
<string name="enter_gpx_name">Увядзіце назву для GPX</string>
|
||||
<string name="show_on_map_after_saving">Паказаць мапу пасля захавання</string>
|
||||
<string name="add_route_point">Дадаць кропку маршруту</string>
|
||||
<string name="add_waypoint">Дадаць кропку шляху</string>
|
||||
<string name="save_gpx_waypoint">Захаваць GPX-кропку шляху</string>
|
||||
<string name="save_route_point">Захаваць кропку маршруту</string>
|
||||
<string name="waypoint_one">Кропка шляху 1</string>
|
||||
<string name="route_point_one">Кропка маршруту 1</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2220,7 +2220,7 @@ L\'ús de memòria serà de {3} MB temporalment i {1} MB permanentment.
|
|||
<string name="shared_string_pause">Pausa</string>
|
||||
<string name="shared_string_trip">Viatge</string>
|
||||
<string name="shared_string_recorded">Enregistrat</string>
|
||||
<string name="shared_string_record">Enegistra</string>
|
||||
<string name="shared_string_record">Enregistra</string>
|
||||
<string name="gpx_logging_no_data">No hi ha dades</string>
|
||||
<string name="release_2_5">"\\u2022 Icones per clicar al mapa
|
||||
\n
|
||||
|
|
@ -2569,10 +2569,19 @@ Abasta l\'àrea: %1$s x %2$s</string>
|
|||
<string name="rendering_value_translucent_pink_name">Rosa translúcid</string>
|
||||
<string name="live_monitoring_max_interval_to_send">Memòria intermèdia temporal pel seguiment en línia</string>
|
||||
<string name="live_monitoring_max_interval_to_send_desrc">Especifiqueu una memòria intermèdia temporal per desar les ubicacions a enviar mentre no hi ha connexió</string>
|
||||
<string name="measurement_tool_action_bar">Seleccioneu una localització en el mapa i feu clic a Afegeix per indicar un extrem del regle.</string>
|
||||
<string name="measurement_tool">Eina de mesurament</string>
|
||||
<string name="measurement_tool_action_bar">Segueix el mapa i afegeix els punts d\'una línia</string>
|
||||
<string name="measurement_tool">Mesurament de distàncies</string>
|
||||
<string name="mappilary_no_internet_desc">Necessiteu internet per veure les fotografies de Mapillary</string>
|
||||
<string name="retry">Torneu a provar</string>
|
||||
<string name="add_gpx_waypoint_bottom_sheet_title">Afegiu punt de referència gpx</string>
|
||||
<string name="add_gpx_waypoint_bottom_sheet_title">Afegiu una fita gpx</string>
|
||||
<string name="shared_string_create">Crea</string>
|
||||
<string name="none_point_error">Us cal afegir un punt com a mínim.</string>
|
||||
<string name="enter_gpx_name">Introduïu el nom del GPX</string>
|
||||
<string name="show_on_map_after_saving">Mostra al mapa després de desar</string>
|
||||
<string name="add_route_point">Afegeix un punt de ruta</string>
|
||||
<string name="add_waypoint">Afegeix una fita</string>
|
||||
<string name="save_gpx_waypoint">Desa la fita GPX</string>
|
||||
<string name="save_route_point">Desa el punt de ruta</string>
|
||||
<string name="waypoint_one">Fita 1</string>
|
||||
<string name="route_point_one">Punt de ruta 1</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -301,7 +301,7 @@
|
|||
<string name="shared_string_next">Další</string>
|
||||
<string name="shared_string_previous">Předchozí</string>
|
||||
<string name="unit_of_length_descr">Zvolte jednotku vzdálenosti</string>
|
||||
<string name="unit_of_length">Jednotka vzdálenosti</string>
|
||||
<string name="unit_of_length">Jednotky vzdálenosti</string>
|
||||
<string name="si_mi_feet">Míle/stopy</string>
|
||||
<string name="si_mi_yard">Míle/yardy</string>
|
||||
<string name="si_km_m">Kilometry/metry</string>
|
||||
|
|
@ -2579,8 +2579,8 @@ Pokud potřebujete pomoci s aplikací OsmAnd, prosím kontaktujte naši podporu
|
|||
<string name="select_postcode">Zvolte směrovací číslo</string>
|
||||
<string name="quick_action_auto_zoom">Automatické přiblížení mapy</string>
|
||||
<string name="quick_action_auto_zoom_desc">Stisknutím akčního tlačítka zapnete/vypnete automatické přibližování mapy v závislosti na vaší rychlosti.</string>
|
||||
<string name="quick_action_auto_zoom_on">Automatické přiblížení zapnuto</string>
|
||||
<string name="quick_action_auto_zoom_off">Automatické přiblížení vypnuto</string>
|
||||
<string name="quick_action_auto_zoom_on">Zapnout automatické přiblížení mapy</string>
|
||||
<string name="quick_action_auto_zoom_off">Vypnout automatické přiblížení mapy</string>
|
||||
<string name="quick_action_add_destination">Přidat cíl</string>
|
||||
<string name="quick_action_replace_destination">Nahradit cíl</string>
|
||||
<string name="quick_action_add_first_intermediate">Přidat první mezicíl</string>
|
||||
|
|
@ -2691,4 +2691,9 @@ Pokud potřebujete pomoci s aplikací OsmAnd, prosím kontaktujte naši podporu
|
|||
\n
|
||||
\n"</string>
|
||||
<string name="rendering_value_translucent_pink_name">Průhledná růžová</string>
|
||||
<string name="none_point_error">Musíte přidat alespoň jeden bod.</string>
|
||||
<string name="enter_gpx_name">Zadejte název pro GPX</string>
|
||||
<string name="show_on_map_after_saving">Po uložení zobrazit na mapě</string>
|
||||
<string name="measurement_tool_action_bar">Prohlížet mapu a přidat body do linie</string>
|
||||
<string name="measurement_tool">Měřit vzdálenost</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -240,9 +240,7 @@ Proportional hukommelse %4$s MB (Android grænse %5$s MB, Dalvik %6$s MB).</stri
|
|||
<string name="osmand_parking_position_description_add">Afhent bilen:</string>
|
||||
<string name="osmand_parking_am">AM</string>
|
||||
<string name="osmand_parking_position_name">Parkeringsplads</string>
|
||||
<string name="osmand_parking_plugin_description">Parkeringsplads udvidelsen kan huske hvor bilen er parkeret, og hvor meget tid der er tilbage (hvis der er en tidsfrist).
|
||||
|
||||
Både placering og tid er synlige på betjeningspanel samt i modul på kortskærmen. En alarm kan tilføjes til kalenderen, som en påmindelse.</string>
|
||||
<string name="osmand_parking_plugin_description">Parkeringsplads udvidelsen kan huske hvor bilen er parkeret, og hvor meget tid der er tilbage (hvis der er en tidsfrist). Både placering og tid er synlige på betjeningspanel samt i modul på skærmen. En alarm kan tilføjes til kalenderen, som en påmindelse.</string>
|
||||
<string name="osmand_parking_plugin_name">Parkering</string>
|
||||
<string name="context_menu_item_add_parking_point">Marker som parkeringsplads</string>
|
||||
<string name="context_menu_item_delete_parking_point">Slet en parkeringsmarkør</string>
|
||||
|
|
@ -304,7 +302,7 @@ Både placering og tid er synlige på betjeningspanel samt i modul på kortskær
|
|||
|
||||
<string name="osmand_rastermaps_plugin_description">Udvidelsen giver adgang til mange typer af online (såkaldte brikker eller raster) kort, fra foruddefinerede OpenStreetMap kortbrikker (som Mapnik) til satellitbilleder og lag til særlig anvendelse som vejr-, klima- eller geologiskekort og reliefskygger osv.
|
||||
\n
|
||||
\nAlle disse kort kan enten bruges som det vigtigste (primær) kort, der skal vises på kortskærmen, eller som en over- eller underlejring til et andet basiskort (såsom OsmAnd standard offline kort). For at gøre underlejringskortet mere synlig, kan visse elementer af OsmAnd vektorkort nemt skjules via \'Konfigurer kort\' menuen som ønsket.
|
||||
\nAlle disse kort kan enten bruges som det vigtigste (primær) kort, der skal vises på skærmen, eller som en over- eller underlejring til et andet basiskort (såsom OsmAnd standard offline kort). For at gøre underlejringskortet mere synlig, kan visse elementer af OsmAnd vektorkort nemt skjules via \'Konfigurer kort\' menuen som ønsket.
|
||||
\n
|
||||
\nKortbrikker kan hentes direkte via online-kilder, eller kan fremstilles til offline brug (og manuelt kopieres til OsmAnd datamappen) som en SQLite database. Kort kan fremstilles ved hjælp af en række 3. parts kortværktøjer.</string>
|
||||
|
||||
|
|
@ -751,7 +749,7 @@ OSM er et i fællesskab drevet, globalt offentligt domæne kortlægningsprojekt.
|
|||
<string name="rotate_map_compass_opt">Efter kompas</string>
|
||||
<string name="rotate_map_bearing_opt">Efter bevægelsesretningen</string>
|
||||
<string name="rotate_map_none_opt">Ingen rotation (nord er op)</string>
|
||||
<string name="rotate_map_to_bearing_descr">Vælg justering af kortskærmen</string>
|
||||
<string name="rotate_map_to_bearing_descr">Vælg justering af skærmen</string>
|
||||
<string name="rotate_map_to_bearing">Kortorientering</string>
|
||||
<string name="show_route">Rutedetaljer</string>
|
||||
<string name="fav_imported_sucessfully">Favoritter er importeret</string>
|
||||
|
|
@ -1096,13 +1094,10 @@ OSM er et i fællesskab drevet, globalt offentligt domæne kortlægningsprojekt.
|
|||
<string name="plugin_distance_point_ele">højde</string>
|
||||
<string name="osmand_distance_planning_plugin_description">"Udvidelsen giver et modul som gør det muligt at oprette stier, ved at trykke på kortet, eller bruge eller ændre en eksisterende GPX-fil, til at planlægge en tur og måle afstanden mellem punkter. Resultaterne kan gemmes som en GPX-fil, som senere kan bruges til rutevejledning."</string>
|
||||
<string name="osmand_distance_planning_plugin_name">Afstandsberegner & planlægningsværktøj</string>
|
||||
<string name="use_distance_measurement_help">* Tryk for at markere et punkt.
|
||||
|
||||
* Langt tryk på kortet for at slette tidligere punkt.
|
||||
|
||||
* Langt tryk på punkt for at se og vedhæfte beskrivelse.
|
||||
|
||||
* Klik på målemodul for at se flere handlinger.</string>
|
||||
<string name="use_distance_measurement_help">* Tryk for at markere et punkt.
|
||||
\n* Langt tryk på kortet for at slette tidligere punkt.
|
||||
\n* Langt tryk på punkt for at se og vedhæfte beskrivelse.
|
||||
\n* Tryk på målemodul for at se flere handlinger.</string>
|
||||
<string name="delete_point">Slet punkt</string>
|
||||
<string name="local_osm_changes_backup_failed">Sikkerhedskopiering af OSM-data ændringer mislykkedes</string>
|
||||
<string name="local_osm_changes_backup_successful">OSM-data ændringsfilen %1$s genereret</string>
|
||||
|
|
@ -1302,7 +1297,7 @@ OSM er et i fællesskab drevet, globalt offentligt domæne kortlægningsprojekt.
|
|||
<string name="voice_pref_title">Tale</string>
|
||||
<string name="misc_pref_title">Diverse</string>
|
||||
<string name="localization_pref_title">Lokalisering</string>
|
||||
<string name="interrupt_music_descr">Pause musik under talemeddelelser (sænk ikke kun volumen)</string>
|
||||
<string name="interrupt_music_descr">Stemmemeddelelser pause, ikke bare dæmpe musikafspilning</string>
|
||||
<string name="interrupt_music">Pause musik</string>
|
||||
<string name="share_route_as_gpx">Del rute som GPX-fil</string>
|
||||
<string name="share_route_subject">Ruten deles via OsmAnd</string>
|
||||
|
|
@ -1341,7 +1336,7 @@ OSM er et i fællesskab drevet, globalt offentligt domæne kortlægningsprojekt.
|
|||
<string name="osmo_auto_send_locations_descr">Start tur automatisk og send placeringer efter start af programmet</string>
|
||||
<string name="osmo_auto_send_locations">Start tur automatisk</string>
|
||||
<string name="osmo_tracker_id">Sporings-ID</string>
|
||||
<string name="osmo_tracker_id_descr">Klik for at se tracker-ID</string>
|
||||
<string name="osmo_tracker_id_descr">Tryk for at se tracker-ID</string>
|
||||
<string name="osmo_session_token">Sessiontoken: %1$s</string>
|
||||
<string name="osmo_auth_pending">Venter på autorisation…</string>
|
||||
<string name="osmo_locations_sent">Placeringer sendt %1$d (i buffer %2$d) </string>
|
||||
|
|
@ -1350,13 +1345,13 @@ OSM er et i fællesskab drevet, globalt offentligt domæne kortlægningsprojekt.
|
|||
<string name="osmo_settings_debug">Fejlsøgningsinformation</string>
|
||||
<string name="osmo_group_info">Info</string>
|
||||
<string name="osmo_group">OsMo gruppe</string>
|
||||
<string name="osmo_group_share">For at oprette forbindelse til gruppen %2$s, angiv gruppe-id (%1$s) eller klik på %3$s.</string>
|
||||
<string name="osmo_group_share">For at oprette forbindelse til gruppen %2$s, angiv gruppe-id (%1$s) eller tryk på %3$s.</string>
|
||||
<string name="osmo_share_connect_device">Følg enheden permanent</string>
|
||||
<string name="osmo_share_current_session">Del den aktuelle session i browser</string>
|
||||
<string name="osmo_session_not_available">Sessionen er ikke tilgængelig, kontroller at \'Send placering\' er til.</string>
|
||||
<string name="osmo_share_session">Del sessionen</string>
|
||||
<string name="osmo_session_id_share">Session url til at spore enhed (%1$s)</string>
|
||||
<string name="osmo_tracker_id_share">For at oprette forbindelse til målenheden %2$s, klik på linket %3$s eller angiv sporings-id (%1$s)</string>
|
||||
<string name="osmo_tracker_id_share">For at oprette forbindelse til målenheden %2$s, tryk på linket %3$s eller angiv sporings-id (%1$s)</string>
|
||||
<string name="osmo_track_interval">Logningsinterval</string>
|
||||
<string name="osmo_track_interval_descr">Vælg tidsinterval til at sende placering</string>
|
||||
<string name="int_days">dage</string>
|
||||
|
|
@ -1430,7 +1425,9 @@ OSM er et i fællesskab drevet, globalt offentligt domæne kortlægningsprojekt.
|
|||
<string name="gpx_info_subtracks">Underspor: %1$s </string>
|
||||
<string name="map_widget_plain_time">Aktuel tid</string>
|
||||
<string name="gpx_wpt">Rutepunkt</string>
|
||||
<string name="selected_gpx_info_show">\n\nLangt tryk for at se på kort</string>
|
||||
<string name="selected_gpx_info_show">"
|
||||
\n
|
||||
\nLangt tryk for at se på kortet"</string>
|
||||
<string name="delay_navigation_start">Start sving-for-sving vejledning automatisk</string>
|
||||
<string name="gpx_split_interval">Opdelingsinterval</string>
|
||||
<string name="loading_smth">Indlæser %1$s…</string>
|
||||
|
|
@ -1443,7 +1440,7 @@ OSM er et i fællesskab drevet, globalt offentligt domæne kortlægningsprojekt.
|
|||
|
||||
<string name="sort_by_distance">Sorter efter afstand</string>
|
||||
<string name="sort_by_name">Sorter efter navn</string>
|
||||
<string name="none_selected_gpx">Ingen GPX filer valgt. Langt tryk for at vælge et tilgængeligt spor.</string>
|
||||
<string name="none_selected_gpx">Ingen GPX filer er valgt. Langt tryk for at vælge et tilgængeligt spor.</string>
|
||||
<string name="local_index_select_gpx_file">Vælg at få vist</string>
|
||||
|
||||
<string name="no_index_file_to_download">Ingenting at hente, kontroller internetforbindelsen.</string>
|
||||
|
|
@ -1491,7 +1488,7 @@ OSM er et i fællesskab drevet, globalt offentligt domæne kortlægningsprojekt.
|
|||
<string name="gpx_monitoring_stop">Stop GPX logning</string>
|
||||
<string name="gpx_start_new_segment">Start nyt segment</string>
|
||||
<string name="lang_fa">Persisk</string>
|
||||
<string name="map_preferred_locale_descr">Foretrukket sprog for etiketter på kortet (hvis sprog ikke findes skiftes til engelsk eller lokale navne)</string>
|
||||
<string name="map_preferred_locale_descr">Foretrukket sprog for etiketter på kortet (hvis sproget ikke findes skiftes til engelsk eller lokale navne)</string>
|
||||
<string name="map_preferred_locale">Foretrukket sprog på kort</string>
|
||||
<string name="stop_navigation_service">Stop</string>
|
||||
<string name="enable_sleep_mode">Aktiver GPS baggrundstilstand</string>
|
||||
|
|
@ -1541,7 +1538,7 @@ OSM er et i fællesskab drevet, globalt offentligt domæne kortlægningsprojekt.
|
|||
<string name="duration">Varighed</string>
|
||||
<string name="int_hour">t</string>
|
||||
<string name="record_plugin_name">Optag ture</string>
|
||||
<string name="record_plugin_description">Udvidelsen aktiverer funktionalitet til at optage og gemme spor ved at klikke på GPX logning modul på kortskærmen, eller også for automatisk at logge alle navigationsruter til en GPX-fil.
|
||||
<string name="record_plugin_description">Udvidelsen aktiverer funktionalitet til at optage og gemme spor ved at klikke på GPX logning modul på skærmen, eller også for automatisk at logge alle navigationsruter til en GPX-fil.
|
||||
\n
|
||||
\nOptagede spor kan deles med venner eller anvendes til OSM bidrag. Sportsfolk kan bruge optagede spor til at monitere træning. Nogle grundlæggende spor analyse kan udføres direkte i OsmAnd, såsom omgangstider, gennemsnitshastighed mv, og spor kan selvfølgelig også senere analyseres i særlige 3. parts analyseværktøjer.</string>
|
||||
<string name="rendering_attr_publicTransportMode_name">Bus-, trolleybus-, shuttlebusruter</string>
|
||||
|
|
@ -1549,7 +1546,7 @@ OSM er et i fællesskab drevet, globalt offentligt domæne kortlægningsprojekt.
|
|||
<string name="save_track_interval_globally">Logningsinterval</string>
|
||||
<string name="save_track_to_gpx_globally_descr">Generel positionsslogning til en GPX-fil kan slås til/fra med \'GPX logning\' på hovedskærmen</string>
|
||||
<string name="confirm_every_run">Spørg altid</string>
|
||||
<string name="save_global_track_interval_descr">Vælg logningsinterval for den almindelige optagelse af spor(aktiveres via \'GPX logning\' på hovedskærmen)</string>
|
||||
<string name="save_global_track_interval_descr">Vælg logningsinterval for den almindelige optagelse af spor (aktiveres via \'GPX logning\' på hovedskærmen)</string>
|
||||
<string name="save_global_track_interval">Generelt logningsinterval</string>
|
||||
<string name="traffic_warning_speed_limit">Hastighedsgrænse</string>
|
||||
<string name="traffic_warning_border_control">Grænsekontrol</string>
|
||||
|
|
@ -1558,7 +1555,7 @@ OSM er et i fællesskab drevet, globalt offentligt domæne kortlægningsprojekt.
|
|||
<string name="traffic_warning_calming">Trafikdæmpning</string>
|
||||
<string name="traffic_warning_speed_camera">Fartkamera</string>
|
||||
<string name="traffic_warning">Trafikadvarsel</string>
|
||||
<string name="local_index_description">Klik på et eksisterende emne for at se flere detaljer, langt tryk for at deaktivere eller slette. Aktuelle data på enhed (%1$s ledig):</string>
|
||||
<string name="local_index_description">Tryk på et eksisterende emne for at se flere detaljer, langt tryk for at deaktivere eller slette. Aktuelle data på enhed (%1$s ledig):</string>
|
||||
<string name="text_size_descr">Vælg tekststørrelsen på kortet.</string>
|
||||
<string name="text_size">Tekststørrelse</string>
|
||||
<string name="fav_point_dublicate">Favoritnavn dublet</string>
|
||||
|
|
@ -1822,7 +1819,7 @@ Lon %2$s</string>
|
|||
<string name="welcome_select_region">For korrekt at afspejle trafikskilte og regler, vælg område:</string>
|
||||
<string name="welcome_header">Velkommen</string>
|
||||
<string name="welcome_text">OsmAnd giver globale offline kortvisninger, og global offline navigation!</string>
|
||||
<string name="confirm_usage_speed_cameras">I mange lande (Tyskland, Frankrig, Italien og andre) er anvendelse af fartkamera advarsler ikke tilladt ved lov. OsmAnd påtager sig ikke ansvaret, hvis loven overtrædes. Klik kun på Ja, hvis det er berettiget at bruge denne funktion.</string>
|
||||
<string name="confirm_usage_speed_cameras">I mange lande (Tyskland, Frankrig, Italien og andre) er anvendelse af fartkamera advarsler ikke tilladt ved lov. OsmAnd påtager sig ikke ansvaret, hvis loven overtrædes. Tryk kun på Ja, hvis det er berettiget at bruge denne funktion.</string>
|
||||
<string name="agps_info">A-GPS information</string>
|
||||
<string name="agps_data_last_downloaded">A-GPS data sidst hentet: %1$s</string>
|
||||
<string name="shared_string_message">Meddelelse</string>
|
||||
|
|
@ -2043,7 +2040,7 @@ Lon %2$s</string>
|
|||
<string name="application_dir_description">Vælg hvor kort- og andre datafiler skal gemmes.</string>
|
||||
<string name="show_on_start_description">\'Fra\' starter direkte på kortet</string>
|
||||
<string name="map_downloaded">Kort hentet</string>
|
||||
<string name="map_downloaded_descr">Kort over %1$s er nu hentet og kan anvendes.</string>
|
||||
<string name="map_downloaded_descr">Kortet over %1$s er nu hentet og kan anvendes.</string>
|
||||
<string name="go_to_map">Vis kortet</string>
|
||||
<string name="shared_string_qr_code">QR kode</string>
|
||||
<string name="enter_country_name">Angiv landenavn</string>
|
||||
|
|
@ -2287,23 +2284,14 @@ Hvis du ønsker at støtte OsmAnd og OSM, er dette en god måde at gøre det p
|
|||
<string name="shared_string_move_down">Flyt ned</string>
|
||||
<string name="release_2_3">"• OSM Live. Støt bidragsyderne og udviklere af kortet og få kortopdateringer hver time.
|
||||
\n
|
||||
\n
|
||||
\n • Kortmarkører. En ny måde til hurtigt at vælge steder på kortet.
|
||||
\n
|
||||
\n
|
||||
\n
|
||||
\n • Mere detaljerede OSM kort med landespecifikke vejskilte og masser af nye kortfunktioner.
|
||||
\n
|
||||
\n
|
||||
\n
|
||||
\n • Forbedret ruteplanlægning.
|
||||
\n
|
||||
\n
|
||||
\n
|
||||
\n • Mange forbedringer i kontekstmenuen på kortet, såsom indholdsbestemt adresseopslag.
|
||||
\n
|
||||
\n
|
||||
\n
|
||||
\n og mere…"</string>
|
||||
<string name="full_report">Fuldstændig rapport</string>
|
||||
<string name="open_street_map_login_and_pass">OpenStreetMap brugernavn og adgangskode</string>
|
||||
|
|
@ -2480,7 +2468,7 @@ Hvis du ønsker at støtte OsmAnd og OSM, er dette en god måde at gøre det p
|
|||
<string name="shared_string_recorded">Optaget</string>
|
||||
<string name="shared_string_record">Optag</string>
|
||||
<string name="gpx_logging_no_data">Ingen data</string>
|
||||
<string name="release_2_5">• Klikbare ikoner på kortet
|
||||
<string name="release_2_5">• Trykbare ikoner på kortet
|
||||
\n
|
||||
\n • Fleksibel IP-filter søgning: Søg fx. restauranter efter køkkenstil, eller campingpladser med særlige faciliteter
|
||||
\n
|
||||
|
|
@ -2494,7 +2482,7 @@ Hvis du ønsker at støtte OsmAnd og OSM, er dette en god måde at gøre det p
|
|||
\n
|
||||
\n og mere…</string>
|
||||
<string name="trip_rec_notification_settings">Tur optagelse (ingen data)</string>
|
||||
<string name="trip_rec_notification_settings_desc">Vis meddelelse, som giver mulighed for at starte turoptagelse ved at trykke på knappen Optag</string>
|
||||
<string name="trip_rec_notification_settings_desc">Vis en systemmeddelelse, der giver mulighed for at starte optagelse af turen</string>
|
||||
<string name="shared_string_notifications">Meddelelser</string>
|
||||
<string name="osmo_share_location">Del</string>
|
||||
<string name="osmo_pause_location">Pause</string>
|
||||
|
|
@ -2826,16 +2814,25 @@ Tidligere destination bliver sidste mellemliggende punkt.</string>
|
|||
\n</string>
|
||||
<string name="rendering_value_translucent_pink_name">Gennemsigtig lyserød</string>
|
||||
<string name="quick_action_resume_pause_navigation">Genoptag/pause navigation</string>
|
||||
<string name="quick_action_resume_pause_navigation_descr">Tryk på knappen pause navigation eller genoptag, hvis den allerede var sat på pause.</string>
|
||||
<string name="quick_action_show_navigation_finish_dialog">Vis Stop navigation dialog</string>
|
||||
<string name="quick_action_resume_pause_navigation_descr">Tryk på knappen for at pause eller genoptage navigationen.</string>
|
||||
<string name="quick_action_show_navigation_finish_dialog">Vis Navigation færdig dialogboks</string>
|
||||
<string name="quick_action_start_stop_navigation">Start/stop navigation</string>
|
||||
<string name="quick_action_start_stop_navigation_descr">Tryk på knappen for at starte navigation eller stoppe, hvis den allerede var begyndt.</string>
|
||||
<string name="quick_action_start_stop_navigation_descr">Tryk på knappen for at starte eller stoppe navigationen.</string>
|
||||
<string name="live_monitoring_max_interval_to_send">Tidsbuffer til online sporing</string>
|
||||
<string name="live_monitoring_max_interval_to_send_desrc">Angiv en buffer for hvor lang tid positioner skal gemmes, når der ingen internetforbindelse er</string>
|
||||
<string name="retry">Prøv igen</string>
|
||||
<string name="mappilary_no_internet_desc">Internetforbindelse er nødvendig for at se fotos fra Mapillary</string>
|
||||
<string name="measurement_tool">Måleværktøj</string>
|
||||
<string name="measurement_tool_action_bar">Vælg en placering på kortet og klik på Tilføj for at føje et punkt til linealen.</string>
|
||||
<string name="measurement_tool">Mål afstand</string>
|
||||
<string name="measurement_tool_action_bar">Gennemse kortet og tilføj punkter</string>
|
||||
<string name="add_gpx_waypoint_bottom_sheet_title">Tilføj gpx rutepunkt</string>
|
||||
<string name="shared_string_create">Opret</string>
|
||||
<string name="none_point_error">Tilføj mindst ét punkt.</string>
|
||||
<string name="enter_gpx_name">GPX filnavn:</string>
|
||||
<string name="show_on_map_after_saving">Vis på kort efter at have gemt</string>
|
||||
<string name="add_route_point">Tilføj rutepunkt</string>
|
||||
<string name="add_waypoint">Tilføj rutepunkt</string>
|
||||
<string name="save_gpx_waypoint">Gem GPX rutepunkt</string>
|
||||
<string name="save_route_point">Gem rutepunkt</string>
|
||||
<string name="waypoint_one">Rutepunkt 1</string>
|
||||
<string name="route_point_one">Rutepunkt 1</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1767,8 +1767,8 @@
|
|||
<string name="poi_payment_electronic_purses_yes">Elektronische Geldbörsen</string>
|
||||
<string name="poi_payment_uta_yes">UTA</string>
|
||||
<string name="poi_payment_uta_no">UTA Karten nicht akzeptiert</string>
|
||||
<string name="poi_payment_efectivo_yes">Efectivo</string>
|
||||
<string name="poi_payment_efectivo_no">Nachnahme nicht akzeptiert</string>
|
||||
<string name="poi_payment_efectivo_yes">Bargeld</string>
|
||||
<string name="poi_payment_efectivo_no">Bargeld nicht akzeptiert</string>
|
||||
<string name="poi_payment_girocard_yes">Girokarte</string>
|
||||
<string name="poi_payment_girocard_no">Girokarte nicht akzeptiert</string>
|
||||
<string name="poi_payment_discover_card_yes">Discover-Karte</string>
|
||||
|
|
|
|||
|
|
@ -1297,7 +1297,7 @@ Proportionaler Speicher %4$s MB (Android Limit %5$s MB, Dalvik %6$s MB).</string
|
|||
<string name="keep_and_add_destination_point">Als letztes Ziel hinzufügen</string>
|
||||
<string name="select_gpx">GPX-Datei auswählen…</string>
|
||||
<string name="route_descr_select_destination">Ziel wählen</string>
|
||||
<string name="interrupt_music_descr">Musik für Sprachhinweise pausieren (nicht nur leiser spielen)</string>
|
||||
<string name="interrupt_music_descr">Sprachansagen pausieren (nicht nur dämpfen) Musikwiedergabe</string>
|
||||
<string name="always_center_position_on_map">Standort immer in Bildschirmmitte anzeigen</string>
|
||||
<string name="voice_pref_title">Stimme</string>
|
||||
<string name="misc_pref_title">Verschiedenes</string>
|
||||
|
|
@ -2454,7 +2454,7 @@ Wenn Sie OsmAnd und OSM lieben und unterstützen wollen, so ist dies die perfekt
|
|||
\n
|
||||
\nund vieles mehr …</string>
|
||||
<string name="trip_rec_notification_settings">Streckenaufzeichnung (keine Daten)</string>
|
||||
<string name="trip_rec_notification_settings_desc">Benachrichtigung einblenden, in der die Streckenaufzeichnung durch Betätigen der Taste \'Aufzeichnen\' gestartet werden kann.</string>
|
||||
<string name="trip_rec_notification_settings_desc">Anzeige einer Systembenachrichtigung mit der die Streckenaufzeichnung gestartet werden kann.</string>
|
||||
<string name="shared_string_notifications">Benachrichtigungen</string>
|
||||
<string name="osmo_service_running">OsMo-Dienst wird ausgeführt</string>
|
||||
<string name="osmo_pause_location">Pause</string>
|
||||
|
|
@ -2546,7 +2546,7 @@ Wenn Sie OsmAnd und OSM lieben und unterstützen wollen, so ist dies die perfekt
|
|||
<string name="quick_action_add_gpx_descr">Drücken der Aktionstaste fügt einen GPX-Wegpunkt am Bildschirmmittelpunkt ein.</string>
|
||||
<string name="quick_action_add_osm_bug_descr">Drücken der Aktionstaste fügt eine OSM-Notiz am Bildschirmmittelpunkt ein.</string>
|
||||
<string name="quick_action_add_poi_descr">Drücken der Aktionstaste fügt einen POI am Bildschirmmittelpunkt ein.</string>
|
||||
<string name="quick_action_navigation_voice_descr">Drücken der Aktionstaste deaktiviert oder aktiviert die Sprachhinweise bei der Navigation.</string>
|
||||
<string name="quick_action_navigation_voice_descr">Drücken der Aktionstaste deaktiviert oder aktiviert die Sprachansagen bei der Navigation.</string>
|
||||
<string name="quick_action_add_parking_descr">Drücken der Aktionstaste fügt eine Parkposition am Bildschirmmittelpunkt ein.</string>
|
||||
<string name="quick_action_interim_dialog">Dialog zum Bearbeiten zeigen</string>
|
||||
<string name="favorite_autofill_toast_text">" wird gespeichert unter "</string>
|
||||
|
|
@ -2771,9 +2771,9 @@ Abgedeckte Fläche: %1$s x %2$s</string>
|
|||
<string name="moving_time">Zeit in Bewegung</string>
|
||||
<string name="mapillary_menu_filter_description">Sie können Bilder nach Übermittler oder Datum filtern. Filter gelten nur für nahe Zoomstufen.</string>
|
||||
<string name="min_max">min/max</string>
|
||||
<string name="quick_action_resume_pause_navigation_descr">Drücken Sie diese Taste, um die Navigation zu pausieren oder fortzusetzen, wenn sie bereits pausiert ist.</string>
|
||||
<string name="quick_action_resume_pause_navigation_descr">Drücken Sie diese Taste, um die Navigation zu pausieren oder fortzusetzen.</string>
|
||||
<string name="quick_action_show_navigation_finish_dialog">Dialog bei Navigationsende anzeigen</string>
|
||||
<string name="quick_action_start_stop_navigation_descr">Taste drücken, um Navigation zu starten oder zu beenden, wenn sie bereits gestartet ist.</string>
|
||||
<string name="quick_action_start_stop_navigation_descr">Taste drücken, um Navigation zu starten oder zu beenden.</string>
|
||||
<string name="quick_action_start_stop_navigation">Navigation starten/beenden</string>
|
||||
<string name="quick_action_resume_pause_navigation">Navigation fortsetzen/pausieren</string>
|
||||
<string name="release_2_7">\\022 Mapillary-Erweiterung mit Vor-Ort-Bildern
|
||||
|
|
@ -2789,4 +2789,11 @@ Abgedeckte Fläche: %1$s x %2$s</string>
|
|||
<string name="live_monitoring_max_interval_to_send">Zeitpuffer für Track-Liveübertragung</string>
|
||||
<string name="live_monitoring_max_interval_to_send_desrc">Zeitpuffer festlegen, in dem zu sendende Positionen erhalten bleiben sollen, wenn keine Verbindung besteht</string>
|
||||
<string name="measurement_tool">Messwerkzeug</string>
|
||||
</resources>
|
||||
<string name="measurement_tool_action_bar">Wählen Sie einen Standort auf der Karte, und klicken Sie auf Hinzufügen, um einen Punkt auf das Lineal hinzuzufügen.</string>
|
||||
<string name="mappilary_no_internet_desc">Sie benötigen Internet, um Fotos von Mapillary ansehen zu können</string>
|
||||
<string name="retry">Wiederholen</string>
|
||||
<string name="add_gpx_waypoint_bottom_sheet_title">GPX-Wegpunkt hinzufügen</string>
|
||||
<string name="shared_string_create">Erstellen</string>
|
||||
<string name="none_point_error">Bitte mindestens einen Punkt hinzufügen.</string>
|
||||
<string name="enter_gpx_name">GPX Dateiname:</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1106,7 +1106,7 @@ Premtenu por vidi sur la mapo</string>
|
|||
<string name="dropbox_plugin_description">La kromprogramo Dropbox ebligas al vi samtempigi kursojn kaj aŭdia-/videa-notojn kun via Dropbox-a konto.</string>
|
||||
<string name="dropbox_plugin_name">Dropbox kromprogramo</string>
|
||||
<string name="intermediate_points_change_order">Ŝanĝi ordon</string>
|
||||
<string name="srtm_paid_version_msg">Bonvolu konsideri aĉeti la Nivelkurbo kromprogramo en la Market por subteni pluan disvolviĝon.</string>
|
||||
<string name="srtm_paid_version_msg">Bonvolu konsideri aĉeti la kromprogramon ‘Nivelkurboj’ en la Market por subteni pluan disvolviĝon.</string>
|
||||
<string name="av_def_action_choose">Elekti laŭvole</string>
|
||||
<string name="av_def_action_video">Registri videon</string>
|
||||
<string name="av_def_action_audio">Registri sonon</string>
|
||||
|
|
@ -1170,7 +1170,7 @@ Premtenu por vidi sur la mapo</string>
|
|||
<string name="rendering_attr_roadColors_description">Elektu skemkoloron de vojoj:</string>
|
||||
<string name="rendering_attr_roadColors_name">Skemkoloro de vojoj</string>
|
||||
<string name="map_widget_show_destination_arrow">Montri celdirekton</string>
|
||||
<string name="enable_plugin_monitoring_services">Aktivigu la Registrado de kurso kromprogramo por uzi pozici-registradajn servojn (GPX-registrado, enreta kurs-registrado)</string>
|
||||
<string name="enable_plugin_monitoring_services">Aktivigu la kromprogramo ‘Kurs-registrilo’ por uzi pozici-registradajn servojn (GPX-registrado, enreta kurs-registrado)</string>
|
||||
<string name="non_optimal_route_calculation">Kalkuli verŝajne neplejbonajn kursojn por malproksimaj distancoj</string>
|
||||
<string name="gps_not_available">Bonvolu aktivigi GPS-on en agordoj</string>
|
||||
<string name="map_widget_monitoring_services">Kurso-registradaj servoj</string>
|
||||
|
|
@ -1664,7 +1664,7 @@ Proporcia memoro %4$s MB (limito de Android %5$s MB, Dalvik %6$s MB).</string>
|
|||
\n
|
||||
\nPor reveni al unu de normaj mapaj aspektoj de OsmAnd, simple aŭ malaktivigi la kromprogramon, aŭ ŝanĝi ‘map-aspekton’ en la menuo ‘agordi mapon’.</string>
|
||||
<string name="plugin_ski_name">Skiada map-vido</string>
|
||||
<string name="plugin_ski_descr">Tiu ĉi kromprogramo aldonas al OsmAnd detalojn pri descendejoj, skivojoj, montaraj skivojoj, kablovojoj kaj skiliftoj. Kursoj kaj vojoj estas kolorigitaj laŭ facileco kaj montrataj kiel speciala \'Vintra\' map-aspekto kiu ŝajnas kiel neĝ-kovrita landvidaĵo.
|
||||
<string name="plugin_ski_descr">Tiu ĉi kromprogramo aldonas al OsmAnd detalojn pri descendejoj, skivojoj, montaraj skivojoj, kablovojoj kaj skiliftoj. Kursoj kaj vojoj estas kolorigitaj laŭ facileco kaj montrataj kiel speciala ‘vintra map-aspekto kiu ŝajnas kiel neĝ-kovrita landvidaĵo.
|
||||
\n
|
||||
\nAktivigo de tiu ĉi map-vido ŝanĝas map-aspekton al ‘vintro kaj skiado’, montranta ĉiun terenon kovritan de neĝo. La vidon oni povas malaktivigi, per malaktivigi la kromprogramon tie ĉi, aŭ per ŝanĝi de ‘map-aspekto’ en la menuo ‘agordi mapon.</string>
|
||||
<string name="osmand_parking_plugin_name">Parkumeja pozicio</string>
|
||||
|
|
@ -2658,9 +2658,9 @@ Indikas lokon: %1$s x %2$s"</string>
|
|||
<string name="save_poi_too_many_uppercase">Nomo enhavas tro multe da grandaj literoj? Ĉu vi volas pluigi?</string>
|
||||
<string name="srtm_menu_download_descr">Por vidi nivelkurbojn sur la mapo, vi devas elŝuti nivelkurban mapon de tiu ĉi regiono.</string>
|
||||
<string name="shared_string_plugin">Kromprogramo</string>
|
||||
<string name="srtm_purchase_header">Por vidi nivelkurbojn sur la mapo, vi devas aĉeti kaj instali la kromprogramon \'Nivelkurboj\'</string>
|
||||
<string name="srtm_purchase_header">Por vidi nivelkurbojn sur la mapo, vi devas aĉeti kaj instali la kromprogramon ‘Nivelkurboj</string>
|
||||
<string name="hillshade_menu_download_descr">Por vidi nivel-ombrumon sub la mapo, vi devas elŝuti nivel-ombruman mapon de tiu ĉi regiono.</string>
|
||||
<string name="hillshade_purchase_header">Por vidi nivel-ombrumon sub la mapo, vi devas aĉeti kaj instali kromprogramon \'Nivelkurboj\'</string>
|
||||
<string name="hillshade_purchase_header">Por vidi nivel-ombrumon sub la mapo, vi devas aĉeti kaj instali kromprogramon ‘Nivelkurboj</string>
|
||||
<string name="hide_from_zoom_level">Kaŝi de skal-nivelo</string>
|
||||
<string name="sorted_by_distance">Ordigitaj laŭ distanco</string>
|
||||
<string name="search_favorites">Serĉi en ŝatataj</string>
|
||||
|
|
|
|||
|
|
@ -1294,7 +1294,7 @@ Se aprecia la participación activa, y las contribuciones pueden hacerse directa
|
|||
<string name="preferred_locale">Idioma de la pantalla</string>
|
||||
<string name="incomplete_locale">incompleto</string>
|
||||
<string name="unit_of_length_descr">Cambia las unidades de longitud</string>
|
||||
<string name="unit_of_length">Unidad de longitud</string>
|
||||
<string name="unit_of_length">Unidades de longitud</string>
|
||||
<string name="si_mi_feet">Millas/pies</string>
|
||||
<string name="si_mi_yard">Millas/yardas</string>
|
||||
<string name="si_km_m">Kilómetros/metros</string>
|
||||
|
|
@ -2588,8 +2588,8 @@ Proporciona un código completo</string>
|
|||
<string name="no_underlay">Sin subyacencia</string>
|
||||
<string name="quick_action_auto_zoom">Alternar ampliación automática del mapa</string>
|
||||
<string name="quick_action_auto_zoom_desc">Pulsar el botón de acción alternará la ampliación automática del mapa de acuerdo a la velocidad.</string>
|
||||
<string name="quick_action_auto_zoom_on">Ampliación automática del mapa activada</string>
|
||||
<string name="quick_action_auto_zoom_off">Ampliación automática del mapa desactivada</string>
|
||||
<string name="quick_action_auto_zoom_on">Activar ampliación automática del mapa</string>
|
||||
<string name="quick_action_auto_zoom_off">Desactivar ampliación automática del mapa</string>
|
||||
<string name="quick_action_add_destination">Añadir destino</string>
|
||||
<string name="quick_action_replace_destination">Reemplazar destino</string>
|
||||
<string name="quick_action_add_first_intermediate">Añadir primer destino intermedio</string>
|
||||
|
|
@ -2698,8 +2698,17 @@ Proporciona un código completo</string>
|
|||
<string name="live_monitoring_max_interval_to_send_desrc">Especifica el tiempo que el búfer mantendrá los lugares para enviar sin conexión</string>
|
||||
<string name="mappilary_no_internet_desc">Debes tener conexión a Internet para ver fotos de Mapillary</string>
|
||||
<string name="retry">Reintentar</string>
|
||||
<string name="measurement_tool_action_bar">Elige una ubicación en el mapa y pulsa «Añadir» para añadir un punto en la regla.</string>
|
||||
<string name="measurement_tool">Herramienta de medición</string>
|
||||
<string name="measurement_tool_action_bar">Navega por el mapa y añade puntos para una línea</string>
|
||||
<string name="measurement_tool">Medir distancia</string>
|
||||
<string name="add_gpx_waypoint_bottom_sheet_title">Añadir punto de ruta GPX</string>
|
||||
<string name="shared_string_create">Crear</string>
|
||||
<string name="none_point_error">Debes añadir al menos un punto.</string>
|
||||
<string name="enter_gpx_name">Ingresa el nombre del GPX</string>
|
||||
<string name="show_on_map_after_saving">Mostrar en el mapa después de guardar</string>
|
||||
<string name="add_route_point">Añadir punto de ruta</string>
|
||||
<string name="add_waypoint">Añadir punto de ruta</string>
|
||||
<string name="save_gpx_waypoint">Guardar punto de ruta GPX</string>
|
||||
<string name="save_route_point">Guardar ruta de puntos</string>
|
||||
<string name="waypoint_one">Punto de ruta 1</string>
|
||||
<string name="route_point_one">Punto de ruta 1</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1294,7 +1294,7 @@ Se aprecia la participación activa, y las contribuciones pueden hacerse directa
|
|||
<string name="preferred_locale">Idioma de la pantalla</string>
|
||||
<string name="incomplete_locale">incompleto</string>
|
||||
<string name="unit_of_length_descr">Cambia las unidades de longitud</string>
|
||||
<string name="unit_of_length">Unidad de longitud</string>
|
||||
<string name="unit_of_length">Unidades de longitud</string>
|
||||
<string name="si_mi_feet">Millas/pies</string>
|
||||
<string name="si_mi_yard">Millas/yardas</string>
|
||||
<string name="si_km_m">Kilómetros/metros</string>
|
||||
|
|
@ -2589,8 +2589,8 @@ Proporciona un código completo</string>
|
|||
<string name="no_underlay">Sin subyacencia</string>
|
||||
<string name="quick_action_auto_zoom">Alternar ampliación automática del mapa</string>
|
||||
<string name="quick_action_auto_zoom_desc">Pulsar el botón de acción alternará la ampliación automática del mapa de acuerdo a la velocidad.</string>
|
||||
<string name="quick_action_auto_zoom_on">Ampliación automática del mapa activada</string>
|
||||
<string name="quick_action_auto_zoom_off">Ampliación automática del mapa desactivada</string>
|
||||
<string name="quick_action_auto_zoom_on">Activar ampliación automática del mapa</string>
|
||||
<string name="quick_action_auto_zoom_off">Desactivar ampliación automática del mapa</string>
|
||||
<string name="quick_action_add_destination">Añadir destino</string>
|
||||
<string name="quick_action_replace_destination">Reemplazar destino</string>
|
||||
<string name="quick_action_add_first_intermediate">Añadir primer destino intermedio</string>
|
||||
|
|
@ -2699,8 +2699,17 @@ Proporciona un código completo</string>
|
|||
<string name="live_monitoring_max_interval_to_send_desrc">Especifica el tiempo que el búfer mantendrá los lugares para enviar sin conexión</string>
|
||||
<string name="mappilary_no_internet_desc">Debes tener conexión a Internet para ver fotos de Mapillary</string>
|
||||
<string name="retry">Reintentar</string>
|
||||
<string name="measurement_tool_action_bar">Elige una ubicación en el mapa y pulsa «Añadir» para añadir un punto en la regla.</string>
|
||||
<string name="measurement_tool">Herramienta de medición</string>
|
||||
<string name="measurement_tool_action_bar">Navega por el mapa y añade puntos para un línea</string>
|
||||
<string name="measurement_tool">Medir distancia</string>
|
||||
<string name="add_gpx_waypoint_bottom_sheet_title">Añadir punto de ruta GPX</string>
|
||||
<string name="shared_string_create">Crear</string>
|
||||
<string name="none_point_error">Debes añadir al menos un punto.</string>
|
||||
<string name="enter_gpx_name">Ingresa el nombre del GPX</string>
|
||||
<string name="show_on_map_after_saving">Mostrar en el mapa después de guardar</string>
|
||||
<string name="add_route_point">Añadir punto de ruta</string>
|
||||
<string name="add_waypoint">Añadir punto de ruta</string>
|
||||
<string name="save_gpx_waypoint">Guardar punto de ruta GPX</string>
|
||||
<string name="save_route_point">Guardar punto de ruta</string>
|
||||
<string name="waypoint_one">Punto de ruta 1</string>
|
||||
<string name="route_point_one">Punto de ruta 1</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="local_osm_changes_backup_failed">پشتیبانگیری از تغییرات OsmAnd ناموفق بود</string>
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<resources><string name="local_osm_changes_backup_failed">پشتیبانگیری از تغییرات OsmAnd ناموفق بود</string>
|
||||
<string name="plugin_distance_point_time">زمان</string>
|
||||
<string name="plugin_distance_point_hdop">دقت</string>
|
||||
<string name="plugin_distance_point_speed">سرعت</string>
|
||||
|
|
@ -869,7 +870,7 @@
|
|||
|
||||
<string name="download_hillshade_maps">تپه سایه</string>
|
||||
|
||||
<string name="osmand_srtm_long_description_1000_chars">"این افزونه، منحنیهای همتراز را که در نقشههای آفلاین OsmAnd نمایش داده میشوند فراهم میکند. دادههای جهانی (بین 70 درجه شمالی و 70 درجه جنوبی) در این زمینه براساس اندازه گیریهای SRTM (مأموریت توپوگرافی رادار شاتل) و ASTER (رادیومتر انعکاسی و پرتویی حرارتی هوایی پیشرفته)، یک ابزار تصویربرداری پردازنده ترا و ماهواره فوق پیشرفته سیستم نظارتی زمین ناسا مییباشند. ASTER محصول تلاش مشترک میان ناسا، وزارت اقتصاد ژاپن، صنعت و تجارت (متی)، و سیستم های فضایی ژاپن (جی-اسپیس سیستم) است. "</string>
|
||||
<string name="osmand_srtm_long_description_1000_chars">"این افزونه، منحنیهای همتراز را که در نقشههای آفلاین OsmAnd نمایش داده میشوند فراهم میکند. دادههای جهانی (بین 70 درجه شمالی و 70 درجه جنوبی) در این زمینه براساس اندازه گیریهای SRTM (مأموریت توپوگرافی رادار شاتل) و ASTER (رادیومتر انعکاسی و پرتویی حرارتی هوایی پیشرفته)، یک ابزار تصویربرداری پردازنده ترا و ماهواره فوق پیشرفته سیستم نظارتی زمین ناسا مییباشند. ASTER محصول تلاش مشترک میان ناسا، وزارت اقتصاد ژاپن، صنعت و تجارت (متی)، و سیستم های فضایی ژاپن (جی-اسپیس سیستم) است. "</string>
|
||||
<string name="srtm_plugin_description">"این افزونه هم یک لایه خطوط همتراز و هم یک لایه تپه سایه بر روی نقشههای استاندارد OsmAnd اضافه میکند. این قابلیت بسیار به درد قهرمانان، کوهنوردان، جهانگردان و هرکسی که به ساختار زمین علاقمند است میخورد.\nدادههای جهانی (بین ۷۰ درجه شمالی و ۷۰ درجه جنوبی) توسط اندازهگیریهای SRTM (مأموریت رادار توپوگرافی شاتل) و ASTER (تابش حرارتی فضاپایه پیشرفته و رادیومتری انعکاسی)، ایزار تصویربرداری Terra، ماهواره پرچمدار سیستم نظارهگر زمین ناسا انجام شده است. ASTER یک پروژه همکاری مشترک بین ناسا، وزارت اقتصاد ژاپن، وزارت صنعت و بازرگانی و سیستمهای فضایی ژاپن (J-spacesystems) میباشد. "</string>
|
||||
<string name="monitoring_control_start">جی پی ایکس</string>
|
||||
<string name="rendering_attr_noPolygons_description">محو کردن همه عوارض زمین روی نقشه</string>
|
||||
|
|
@ -1249,7 +1250,7 @@
|
|||
|
||||
<string name="route_descr_destination">مقصد</string>
|
||||
<string name="create_poi_link_to_osm_doc"> <u>Online OSM</u> map classification with images</string>
|
||||
<string name="app_mode_hiking">پیادهروی</string>
|
||||
<string name="app_mode_hiking">پیادهروی</string>
|
||||
<string name="app_mode_motorcycle">موتورسیکلت</string>
|
||||
<string name="app_mode_boat">قایق</string>
|
||||
<string name="app_mode_aircraft">هواپیما</string>
|
||||
|
|
@ -2150,4 +2151,13 @@
|
|||
<string name="delete_filter">حذف فیلتر</string>
|
||||
<string name="new_filter">فیلتر جدید</string>
|
||||
<string name="new_filter_desc">لطفا یک نام برای فیلتر جدید را وارد کنید، این نام به عنوان دسته جدید اضافه میشود.</string>
|
||||
</resources>
|
||||
<string name="enter_gpx_name">نام فایل gpx را وارد نمایید</string>
|
||||
<string name="show_on_map_after_saving">مشاهده بر روی نقشه پس از ذخیره شدن</string>
|
||||
<string name="measurement_tool_action_bar">مرور نقشه و افزودن نقاط به خط</string>
|
||||
<string name="measurement_tool">اندازه گیری فاصله</string>
|
||||
<string name="quick_action_resume_pause_navigation">ادامه/توقف مسیریابی</string>
|
||||
<string name="quick_action_show_navigation_finish_dialog">مشاهده پیغام اتمام مسیریابی</string>
|
||||
<string name="quick_action_start_stop_navigation">شروع/اتمام مسیریابی</string>
|
||||
<string name="shared_string_reset">تنظیم مجدد</string>
|
||||
<string name="shared_string_reload">بارگذاری مجدد</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2724,8 +2724,8 @@ Fonctionnalités principales :
|
|||
<string name="quick_action_replace_destination_desc">Appuyez sur le bouton d\'action pour remplacer la destination par le centre de la carte.</string>
|
||||
<string name="quick_action_auto_zoom">Zoom automatique de la carte Actif / Inactif</string>
|
||||
<string name="quick_action_auto_zoom_desc">Appuyez sur le bouton pour activer ou désactiver le zoom automatique de la carte en fonction de votre vitesse.</string>
|
||||
<string name="quick_action_auto_zoom_on">Zoom automatique activé</string>
|
||||
<string name="quick_action_auto_zoom_off">Zoom automatique désactivé</string>
|
||||
<string name="quick_action_auto_zoom_on">Activer le zoom automatique</string>
|
||||
<string name="quick_action_auto_zoom_off">Désactiver le zoom automatique</string>
|
||||
<string name="shared_string_paused">Mis en pause</string>
|
||||
<string name="type_city_town">Entrer la ville ou le village</string>
|
||||
<string name="type_postcode">Entrer le code postal</string>
|
||||
|
|
|
|||
|
|
@ -2171,8 +2171,8 @@ Representerer området: %1$s x %2$s</string>
|
|||
<string name="select_city">Velg by</string>
|
||||
<string name="select_postcode">Velg postnummer</string>
|
||||
<string name="quick_action_auto_zoom">Auto-zoom på/av</string>
|
||||
<string name="quick_action_auto_zoom_on">Auto-zoom på</string>
|
||||
<string name="quick_action_auto_zoom_off">Auto-zoom av</string>
|
||||
<string name="quick_action_auto_zoom_on">Aktiver auto-zoom</string>
|
||||
<string name="quick_action_auto_zoom_off">Deaktiver auto-zoom</string>
|
||||
<string name="quick_action_add_destination">Legg til reisemål</string>
|
||||
<string name="quick_action_replace_destination">Erstatt reisemål</string>
|
||||
<string name="quick_action_add_first_intermediate">Legg til første mellomliggende punkt</string>
|
||||
|
|
@ -2282,4 +2282,18 @@ Representerer området: %1$s x %2$s</string>
|
|||
<string name="mapillary_menu_edit_text_hint">Skriv inn brukernavn</string>
|
||||
<string name="mapillary_menu_title_username">Brukernavn</string>
|
||||
<string name="shared_string_reset">Tilbakestill</string>
|
||||
</resources>
|
||||
<string name="show_on_map_after_saving">Vis på kart etter lagring</string>
|
||||
<string name="measurement_tool_action_bar">Se gjennom kart og legg til punkter på en linje</string>
|
||||
<string name="measurement_tool">Mål avstand</string>
|
||||
<string name="quick_action_show_navigation_finish_dialog">Vis dialog ved navigeringsslutt</string>
|
||||
<string name="quick_action_start_stop_navigation">Start/Avslutt navigering</string>
|
||||
<string name="map_widget_ruler_control">Radiusmåler</string>
|
||||
<string name="quick_action_btn_tutorial_title">Endre knappeplassering</string>
|
||||
<string name="retry">Prøv igjen</string>
|
||||
<string name="add_route_point">Legg til rutepunkt</string>
|
||||
<string name="add_waypoint">Legg til rutepunkt</string>
|
||||
<string name="save_gpx_waypoint">Lagre GPX-rutepunkt</string>
|
||||
<string name="save_route_point">Lagre rutepunkt</string>
|
||||
<string name="waypoint_one">Rutepunkt 1</string>
|
||||
<string name="route_point_one">Rutepunkt 1</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@
|
|||
<string name="contribution_activity">Wersje instalacyjne</string>
|
||||
<string name="gps_status_app_not_found">Nie zainstalowano aplikacji GPS status. Wyszukać ją w Market?</string>
|
||||
<string name="voice_is_not_available_msg">Nawigacja głosowa jest niedostępna. Proszę przejść do „Ustawienia”→„Ogólne”→„Głos komunikatów”, wybrać zestaw komunikatów głosowych i zainstalować go.</string>
|
||||
<string name="voice_is_not_available_title">Nie wybrano nawigacji głosowej</string>
|
||||
<string name="voice_is_not_available_title">Nie wybrano komunikatów głosowych</string>
|
||||
<string name="daynight_mode_day">Dzienny</string>
|
||||
<string name="daynight_mode_night">Nocny</string>
|
||||
<string name="daynight_mode_auto">Wschód/zachód Słońca</string>
|
||||
|
|
@ -466,7 +466,7 @@
|
|||
<string name="shared_string_close">Zamknij</string>
|
||||
<string name="loading_data">Wczytywanie danych…</string>
|
||||
<string name="reading_indexes">Wczytywanie danych lokalnych…</string>
|
||||
<string name="previous_run_crashed">Program wcześniej uległ awarii. Dziennik z informacjami znajduje się w {0}. Proszę wysłać zgłoszenie błędu i załączyć plik dziennika.</string>
|
||||
<string name="previous_run_crashed">Program wcześniej uległ awarii. Plik dziennika znajduje się w {0}. Proszę wysłać zgłoszenie błędu i załączyć plik dziennika.</string>
|
||||
<string name="saving_gpx_tracks">Zapisywanie śladów GPX na kartę SD…</string>
|
||||
<string name="finished_task">Zakończono</string>
|
||||
|
||||
|
|
@ -884,7 +884,7 @@ Miejsce parkowania oraz czas można znaleźć na karcie w panelu oraz na widżec
|
|||
<string name="show_warnings_descr">Wyświetla ostrzeżenia ruchu drogowego, ostrzeżenia o fotoradarach i informacje o pasach</string>
|
||||
|
||||
|
||||
<string name="osmand_short_description_80_chars">OsmAnd to aplikacja nawigacyjna open source wspierająca mapy kafelkowe oraz wektorowe</string>
|
||||
<string name="osmand_short_description_80_chars">Mapy dla całego świata i nawigacja działająca w oparciu o stacjonarne jak i sieciowe mapy OSM</string>
|
||||
<string name="osmand_long_description_1000_chars">"
|
||||
OsmAnd (OSM Automatyczne Nawigowanie Do celu)
|
||||
|
||||
|
|
@ -946,24 +946,26 @@ OsmAnd jest otwarto-źródłowym programem do nawigacji z dostępem do szerokiej
|
|||
<string name="poi_filter_accomodation">Zakwaterowanie</string>
|
||||
<string name="poi_filter_restaurants">Restauracje</string>
|
||||
<string name="poi_filter_sightseeing">Zwiedzanie</string>
|
||||
<string name="osmand_plus_long_description_1000_chars">OsmAnd+ (OSM Automatyczne Nawigowanie Do celu)
|
||||
<string name="osmand_plus_long_description_1000_chars">OsmAnd+ (OSM Automated Navigation Directions)
|
||||
\n
|
||||
\n OsmAnd jest otwarto-źródłowym programem do nawigacji z dostępem do szerokiej gamy globalnych map OpenStreetMap (OSM). Wszystkie dane map (wektorowe lub kafelkowe) mogą być przechowywane na karcie pamięci telefonu do użycia bez połączenia z siecią. OsmAnd umożliwia również wyznaczanie tras zarówno w trybie offline i online z komunikatami głosowymi.
|
||||
\nOsmAnd+ jest otwarto-źródłowym programem do nawigacji z dostępem do szerokiej gamy globalnych map OpenStreetMap (OSM). Wszystkie dane map (wektorowe lub kafelkowe) mogą być przechowywane na karcie pamięci telefonu do użycia bez połączenia z siecią. OsmAnd umożliwia również wyznaczanie tras oraz nawigowanie zarówno w trybie stacjonarnym jak i sieciowym z komunikatami głosowymi.
|
||||
\n
|
||||
\nOsmAnd+ jest płatną wersją programu, kupując program wspierasz projekt, nowe funkcje i otrzymujesz najnowsze uaktualnienia.
|
||||
\nOsmAnd+ jest płatną wersją programu. Zakup programu wspiera projekt, umożliwia dodawanie nowych funkcji, w zamian za najnowsze uaktualnienia.
|
||||
\n
|
||||
\nNiektóre z podstawowych funkcji:
|
||||
\n - Działa trybie offline (przechowuje pobrane mapy wektorowych lub kafelkowe w pamięci urządzenia)
|
||||
\n - Dostępne kompaktowe mapy w trybie offlinie dla całego świata
|
||||
\n - Pobieranie map kraju lub regionu bezpośrednio z aplikacji
|
||||
\n - Możliwość nakładania kilku warstw map, takich jak GPX lub tras nawigacji, ciekawe miejsc, ulubionych, linii konturu, przystanków komunikacji miejskiej, dodatkowe mapy z konfigurowalną przejrzystością
|
||||
\n - Wyszukiwanie Offline adresów i miejsc (POI)
|
||||
\n - Wyznaczanie w trybie Offline tras na średnich dystansach
|
||||
\n - Tryby samochodowy, rowerowy i pieszy z:
|
||||
\n - opcjonalnym automatycznym przełączaniem widoku dzień/noc
|
||||
\n - opcjonalnie skalowanie map w zależności od prędkości
|
||||
\n - opcjonalne wyrównanie map według kompasu lub kierunku ruchu
|
||||
\n - opcjonalne wyświetlanie wskazywanie pasów, ograniczeń prędkości, nagrane i syntezowane komunikaty głosowe.</string>
|
||||
\n - działanie w trybie stacjonarnym (przechowuje pobrane mapy wektorowe lub kafelkowe w pamięci urządzenia),
|
||||
\n - dostępne kompaktowe mapy stacjonarne dla całego świata,
|
||||
\n - pobieranie map kraju lub regionu bez ograniczeń ilościowych, bezpośrednio z aplikacji,
|
||||
\n - stacjonarne dane Wikipedia - doskonałe do zwiedzania,
|
||||
\n - możliwość nakładania kilku warstw map, takich jak śladów GPX, tras nawigacji, użytecznych i ulubionych miejsc, linii konturu, przystanków komunikacji miejskiej, dodatkowych map z konfigurowalną przejrzystością,
|
||||
\n - wyszukiwanie adresów i użytecznych miejsc bez połączenia z siecią,
|
||||
\n - wyznaczanie tras na średnich dystansach bez połączenia z siecią,
|
||||
\n - tryby samochodowy, rowerowy i pieszy z:
|
||||
\n
|
||||
\n - opcjonalnym, automatycznym przełączaniem widoku dziennego/nocnego,
|
||||
\n - opcjonalnym skalowanie map w zależności od prędkości,
|
||||
\n - opcjonalnym wyrównanie map według kompasu lub kierunku ruchu,
|
||||
\n - opcjonalnymi nagranymi lub syntezowanymi komunikatami o pasach ruchu, ograniczeniami prędkości.</string>
|
||||
<string name="select_navigation_mode">Wybierz tryb poruszania się</string>
|
||||
|
||||
|
||||
|
|
@ -1008,7 +1010,7 @@ OsmAnd jest otwarto-źródłowym programem do nawigacji z dostępem do szerokiej
|
|||
<string name="map_widget_max_speed">Ograniczenie prędkości</string>
|
||||
|
||||
|
||||
<string name="monitoring_control_start">Ślad GPX</string>
|
||||
<string name="monitoring_control_start">Ślad</string>
|
||||
|
||||
<string name="download_srtm_maps">Poziomice</string>
|
||||
<string name="download_select_map_types">Inne mapy</string>
|
||||
|
|
@ -1041,7 +1043,7 @@ OsmAnd jest otwarto-źródłowym programem do nawigacji z dostępem do szerokiej
|
|||
<string name="recording_is_recorded">Dźwięk/obraz jest nagrywany. Aby zatrzymać naciśnij przycisk stop na widżecie.</string>
|
||||
<string name="recording_playing">Dźwięk z wybranego nagrania jest odtwarzany.\n%1$s</string>
|
||||
<string name="recording_open_external_player">Otwórz zewnętrzny odtwarzacz</string>
|
||||
<string name="recording_delete_confirm">Usunąć to nagranie?</string>
|
||||
<string name="recording_delete_confirm">Usunąć ten ślad?</string>
|
||||
|
||||
<string name="recording_unavailable">niedostępne</string>
|
||||
<string name="layer_recordings">Warstwa nagrywania</string>
|
||||
|
|
@ -1100,7 +1102,7 @@ OsmAnd jest otwarto-źródłowym programem do nawigacji z dostępem do szerokiej
|
|||
<string name="osmand_play_title_30_chars">Mapy i nawigacja OsmAnd</string>
|
||||
|
||||
|
||||
<string name="osmand_plus_play_title_30_chars">OsmAnd+ Mapy i Nawigacja</string>
|
||||
<string name="osmand_plus_play_title_30_chars">OsmAnd+ mapy i nawigacja</string>
|
||||
<string name="street_name">Nazwa ulicy</string>
|
||||
<string name="hno">Numer domu</string>
|
||||
<string name="choose_osmand_theme">Styl</string>
|
||||
|
|
@ -1603,7 +1605,7 @@ OsmAnd jest otwarto-źródłowym programem do nawigacji z dostępem do szerokiej
|
|||
<string name="way_alarms">Ostrzeżenia ruchu drogowego</string>
|
||||
<string name="speak_favorites">Pobliskie ulubione miejsca</string>
|
||||
<string name="speak_poi">Pobliskie użyteczne miejsca</string>
|
||||
<string name="save_track_to_gpx_globally">Rejestrowanie śladu do pliku GPX</string>
|
||||
<string name="save_track_to_gpx_globally">Rejestrowanie śladu GPX</string>
|
||||
<string name="save_track_to_gpx_globally_descr">Rejestrowanie położenia do pliku GPX można włączyć lub wyłączyć używając widżetu rejestrowania GPX na ekranie mapy</string>
|
||||
<string name="save_track_interval_globally">Częstość rejestrowania</string>
|
||||
<string name="record_plugin_description">Aktywuje funkcje rejestrowania i zapisywania śladów za pomocą widżetu rejestrowania śladów GPX na ekranie mapy lub automatyczne rejestruje przebiegi wszystkich tras do plików GPX.
|
||||
|
|
@ -2784,6 +2786,11 @@ Reprezentuje obszar: %1$s x %2$s</string>
|
|||
\n • Inne ulepszenia i naprawione błędy
|
||||
\n
|
||||
\n</string>
|
||||
<string name="measurement_tool_action_bar">Proszę wskazać położenie na mapie i nacisnąć Dodaj, aby dodać punkt do pomiaru.</string>
|
||||
<string name="measurement_tool_action_bar">Proszę dodać położenia do pomiaru.</string>
|
||||
<string name="measurement_tool">Mierzenie odległości</string>
|
||||
<string name="enter_gpx_name">Proszę wprowadzić nazwę pliku GPX</string>
|
||||
<string name="none_point_error">Należy dodać co najmniej jedno położenie.</string>
|
||||
<string name="show_on_map_after_saving">Wyświetlanie na mapie po zapisaniu</string>
|
||||
<string name="rendering_value_translucent_pink_name">Przezroczysty różowy</string>
|
||||
<string name="min_max">Min./Maks.</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2719,8 +2719,17 @@ Pro praghere iscrie su còdighe intreu</string>
|
|||
<string name="live_monitoring_max_interval_to_send_desrc">Dislinda un\'intervallu de tempus pro mantènnere sas positziones de imbiare cando non b\'est connessione</string>
|
||||
<string name="mappilary_no_internet_desc">Tenes bisòngiu de ìnternet pro bìdere sas fotografias de Mapillary</string>
|
||||
<string name="retry">Torra a proare</string>
|
||||
<string name="measurement_tool_action_bar">Issèbera una positzione in sa mapa e incarca Annanghe pro annànghere unu puntu a su righellu.</string>
|
||||
<string name="measurement_tool">Aina de medidura</string>
|
||||
<string name="measurement_tool_action_bar">Esplora sa mapa e annanghe puntos a una lìnia</string>
|
||||
<string name="measurement_tool">Medi una distàntzia</string>
|
||||
<string name="add_gpx_waypoint_bottom_sheet_title">Annanghe unu puntu de coladòrgiu gpx</string>
|
||||
<string name="shared_string_create">Crea</string>
|
||||
<string name="none_point_error">Depes annànghere a su mancu unu puntu.</string>
|
||||
<string name="enter_gpx_name">Inserta unu nùmene pro su GPX</string>
|
||||
<string name="show_on_map_after_saving">Ammustra in sa mapa a pustis de su sarvatàgiu</string>
|
||||
<string name="add_route_point">Annanghe unu puntu a s\'àndala</string>
|
||||
<string name="add_waypoint">Annanghe unu puntu de coladòrgiu</string>
|
||||
<string name="save_gpx_waypoint">Sarva puntu de coladòrgiu GPX</string>
|
||||
<string name="save_route_point">Sarva puntu de s\'àndala</string>
|
||||
<string name="waypoint_one">Puntu de coladòrgiu 1</string>
|
||||
<string name="route_point_one">Puntu de s\'àndala 1</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2703,8 +2703,8 @@ Zodpovedá oblasti: %1$s x %2$s</string>
|
|||
<string name="shared_string_visible">Viditeľné</string>
|
||||
<string name="quick_action_auto_zoom">Automatické priblíženie mapy zap/vyp</string>
|
||||
<string name="quick_action_auto_zoom_desc">Aktivovaním tlačidla akcie sa zapne/vypne automatické priblíženie mapy podľa vašej rýchlosti.</string>
|
||||
<string name="quick_action_auto_zoom_on">Automatické priblíženie mapy zapnuté</string>
|
||||
<string name="quick_action_auto_zoom_off">Automatické priblíženie mapy vypnuté</string>
|
||||
<string name="quick_action_auto_zoom_on">Zapnúť automatické priblíženie mapy</string>
|
||||
<string name="quick_action_auto_zoom_off">Vypnúť automatické priblíženie mapy</string>
|
||||
<string name="quick_action_add_destination">Pridať cieľ</string>
|
||||
<string name="quick_action_replace_destination">Nahradiť cieľ</string>
|
||||
<string name="quick_action_add_first_intermediate">Pridať prvý prechodný bod</string>
|
||||
|
|
@ -2817,8 +2817,17 @@ Zodpovedá oblasti: %1$s x %2$s</string>
|
|||
<string name="live_monitoring_max_interval_to_send_desrc">Zadajte čas pokiaľ budú udržované pozície na odoslanie kým nie je pripojenie</string>
|
||||
<string name="mappilary_no_internet_desc">Na zobrazovanie fotografií z Mapillary potrebujete pripojenie na Internet</string>
|
||||
<string name="retry">Skúsiť znova</string>
|
||||
<string name="measurement_tool_action_bar">Zvoľte miesto na mape a kliknite Pridať pre pridanie bodu pre pravítko.</string>
|
||||
<string name="measurement_tool">Nástroj na meranie</string>
|
||||
<string name="measurement_tool_action_bar">Prezerať mapu a pridať body do čiary</string>
|
||||
<string name="measurement_tool">Merať vzdialenosť</string>
|
||||
<string name="add_gpx_waypoint_bottom_sheet_title">Pridať prechodný bod GPX</string>
|
||||
<string name="shared_string_create">Vytvoriť</string>
|
||||
<string name="none_point_error">Musíte pridať aspoň jeden bod.</string>
|
||||
<string name="enter_gpx_name">Zadajte názov pre GPX</string>
|
||||
<string name="show_on_map_after_saving">Po uložení zobraziť na mape</string>
|
||||
<string name="add_route_point">Pridať bod trasy</string>
|
||||
<string name="add_waypoint">Pridať prechodný bod</string>
|
||||
<string name="save_gpx_waypoint">Uložiť prechodný bod GPX</string>
|
||||
<string name="save_route_point">Uložiť bod trasy</string>
|
||||
<string name="waypoint_one">Prechodný bod 1</string>
|
||||
<string name="route_point_one">Bod trasy 1</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2806,8 +2806,17 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
|
|||
<string name="live_monitoring_max_interval_to_send_desrc">指定一段緩衝時間以保持位置，而無需連接發送</string>
|
||||
<string name="mappilary_no_internet_desc">您需要網際網路才能從 Mapillary 檢視照片</string>
|
||||
<string name="retry">重試</string>
|
||||
<string name="measurement_tool">測量工具</string>
|
||||
<string name="measurement_tool_action_bar">在地圖上選擇一個位置，然後輕點增加以便增加一個標點到尺規。</string>
|
||||
<string name="measurement_tool">測量距離</string>
|
||||
<string name="measurement_tool_action_bar">瀏覽地圖並增加標點到行列</string>
|
||||
<string name="add_gpx_waypoint_bottom_sheet_title">增加 gpx 航點</string>
|
||||
<string name="shared_string_create">建立</string>
|
||||
<string name="none_point_error">您最起碼需要增加一個標點。</string>
|
||||
<string name="enter_gpx_name">為 GPX 輸入名稱</string>
|
||||
<string name="show_on_map_after_saving">儲存後在地圖上顯示</string>
|
||||
<string name="add_route_point">增加路線標點</string>
|
||||
<string name="add_waypoint">增加航點</string>
|
||||
<string name="save_gpx_waypoint">儲存 GPX 航點</string>
|
||||
<string name="save_route_point">儲存路線標點</string>
|
||||
<string name="waypoint_one">航點 1</string>
|
||||
<string name="route_point_one">路線標點 1</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
|
||||
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
|
||||
-->
|
||||
<string name="none_point_error">You need to add at least one point.</string>
|
||||
<string name="enter_gpx_name">Enter name for GPX</string>
|
||||
<string name="none_point_error">Please add at least one point.</string>
|
||||
<string name="enter_gpx_name">GPX file name:</string>
|
||||
<string name="show_on_map_after_saving">Show on map after saving</string>
|
||||
<string name="measurement_tool_action_bar">Browse map and add points to a line</string>
|
||||
<string name="measurement_tool_action_bar">Browse the map and add points</string>
|
||||
<string name="measurement_tool">Measure distance</string>
|
||||
<string name="quick_action_resume_pause_navigation">Resume/Pause Navigation</string>
|
||||
<string name="quick_action_resume_pause_navigation_descr">Press this button to pause the navigation, or to resume it if it was already paused.</string>
|
||||
<string name="quick_action_show_navigation_finish_dialog">Show Finish navigation dialog</string>
|
||||
<string name="quick_action_start_stop_navigation">Start/Finish Navigation</string>
|
||||
<string name="quick_action_start_stop_navigation_descr">Press this button to start the navigation, or to stop it if it was already started.</string>
|
||||
<string name="quick_action_resume_pause_navigation">Resume/pause navigation</string>
|
||||
<string name="quick_action_resume_pause_navigation_descr">Tap this button to pause or resume the navigation.</string>
|
||||
<string name="quick_action_show_navigation_finish_dialog">Show Navigation finished dialog</string>
|
||||
<string name="quick_action_start_stop_navigation">Start/stop navigation</string>
|
||||
<string name="quick_action_start_stop_navigation_descr">Tap this button to start or end the navigation.</string>
|
||||
<string name="store_tracks_in_monthly_directories">Store recorded tracks in monthly folders</string>
|
||||
<string name="store_tracks_in_monthly_directories_descrp">Store recorded tracks in sub-folders per recording month (like 2017-01).</string>
|
||||
<string name="shared_string_reset">Reset</string>
|
||||
|
|
@ -209,7 +209,7 @@
|
|||
<string name="osmo_pause_location">Pause</string>
|
||||
<string name="osmo_service_running">OsMo service is running</string>
|
||||
<string name="trip_rec_notification_settings">Trip recording (no data)</string>
|
||||
<string name="trip_rec_notification_settings_desc">Show notification which allows to start trip recording by pressing Record button</string>
|
||||
<string name="trip_rec_notification_settings_desc">Display a system notification allowing to start trip recording</string>
|
||||
<string name="shared_string_notifications">Notifications</string>
|
||||
<string name="shared_string_continue">Continue</string>
|
||||
<string name="shared_string_pause">Pause</string>
|
||||
|
|
@ -219,7 +219,7 @@
|
|||
<string name="shared_string_record">Record</string>
|
||||
<string name="gpx_logging_no_data">No data</string>
|
||||
<string name="release_2_5">
|
||||
\u2022 Clickable icons on the map\n\n
|
||||
\u2022 Tappable icons on the map\n\n
|
||||
\u2022 Powerful POI filter search: Search, e.g. restaurants by cuisine, or campgrounds with specific facilities\n\n
|
||||
\u2022 New Topo Map style for cyclists and hikers\n\n
|
||||
\u2022 Enhanced trip recording\n\n
|
||||
|
|
@ -384,7 +384,7 @@
|
|||
<string name="osmo_auto_send_locations_descr">Automatically start trip and send locations after application startup</string>
|
||||
<string name="osmo_auto_send_locations">Automatically start trip</string>
|
||||
<string name="osmo_tracker_id">Tracker ID</string>
|
||||
<string name="osmo_tracker_id_descr">Click to view tracker ID</string>
|
||||
<string name="osmo_tracker_id_descr">Tap to view tracker ID</string>
|
||||
<string name="osmo_connect_to_my_nickname">Nick</string>
|
||||
<string name="osmo_share_my_location">Transmit the location</string>
|
||||
<string name="osmo_plugin_name">OpenStreetMap Monitoring</string>
|
||||
|
|
@ -723,7 +723,7 @@
|
|||
<string name="shared_string_show_description">Show description</string>
|
||||
<string name="shared_string_message">Message</string>
|
||||
<string name="agps_data_last_downloaded">A-GPS data last downloaded: %1$s</string>
|
||||
<string name="confirm_usage_speed_cameras">In many countries (Germany, France, Italy, and others) the use of speed camera warnings is not permitted by law. OsmAnd does not assume any liability if you violate the law. Please click yes only if you are eligible to use this feature.</string>
|
||||
<string name="confirm_usage_speed_cameras">In many countries (Germany, France, Italy, and others) the use of speed camera warnings is not permitted by law. OsmAnd does not assume any liability if you violate the law. Please tap yes only if you are eligible to use this feature.</string>
|
||||
<string name="welmode_download_maps">Download maps</string>
|
||||
<string name="welcome_select_region">To correctly reflect your traffic signs and regulations, please select your driving region:</string>
|
||||
<string name="welcome_text">OsmAnd provides global offline map browsing, and global offline navigation!</string>
|
||||
|
|
@ -1087,7 +1087,7 @@
|
|||
<string name="osmo_gpx_track_downloaded">OsMo track %1$s downloaded.</string>
|
||||
<string name="no_index_file_to_download">Downloads not found, please check your Internet connection.</string>
|
||||
<string name="select_index_file_to_download">Nothing was found. If you can\'t find your region, you can make it yourself (see http://osmand.net).</string>
|
||||
<string name="none_selected_gpx">No GPX files selected. In order to select press and hold on available track.</string>
|
||||
<string name="none_selected_gpx">No GPX files selected. To select one long-tap an available track.</string>
|
||||
<string name="local_index_select_gpx_file">Select to show</string>
|
||||
<string name="gpx_split_interval">Split interval</string>
|
||||
<string name="sort_by_distance">Sort by distance</string>
|
||||
|
|
@ -1100,9 +1100,9 @@
|
|||
<string name="loading_smth">Loading %1$s…</string>
|
||||
<string name="map_widget_plain_time">Current time</string>
|
||||
<string name="gpx_wpt">Waypoint</string>
|
||||
<string name="selected_gpx_info_show">\n\nPress and hold to see on map</string>
|
||||
<string name="selected_gpx_info_show">\n\nLong-tap to view on the map</string>
|
||||
<string name="delay_navigation_start">Start turn-by-turn guidance automatically</string>
|
||||
<string name="local_index_gpx_info_show">\n\nPress and hold for options</string>
|
||||
<string name="local_index_gpx_info_show">\n\nLong-tap for options</string>
|
||||
<string name="gpx_info_subtracks">Subtracks: %1$s </string>
|
||||
<string name="gpx_info_waypoints">Waypoints: %1$s </string>
|
||||
<string name="gpx_info_distance">Distance: %1$s (%2$s points) </string>
|
||||
|
|
@ -1142,13 +1142,13 @@
|
|||
<string name="osmo_edit_color">Display color</string>
|
||||
<string name="osmo_group_info">Info</string>
|
||||
<string name="osmo_group">OsMo group</string>
|
||||
<string name="osmo_group_share">In order to Connect to the group %2$s, specify group id (%1$s) or click %3$s.</string>
|
||||
<string name="osmo_group_share">In order to Connect to the group %2$s, specify group id (%1$s) or tap %3$s.</string>
|
||||
<string name="osmo_share_connect_device">Let permanently follow this device</string>
|
||||
<string name="osmo_share_current_session">Share current session in browser</string>
|
||||
<string name="osmo_session_not_available">Session not available, please check that \'Send locations\' is on.</string>
|
||||
<string name="osmo_share_session">Share session</string>
|
||||
<string name="osmo_session_id_share">Session url to track device (%1$s)</string>
|
||||
<string name="osmo_tracker_id_share">In order to Connect to the target device %2$s, click on the link %3$s or specify tracker id (%1$s)</string>
|
||||
<string name="osmo_tracker_id_share">In order to Connect to the target device %2$s, tap on the link %3$s or specify tracker id (%1$s)</string>
|
||||
<string name="osmo_track_interval">Logging interval</string>
|
||||
<string name="osmo_track_interval_descr">Choose time interval to send location</string>
|
||||
<string name="int_days">days</string>
|
||||
|
|
@ -1376,9 +1376,9 @@
|
|||
<string name="gpx_file_name">GPX file name</string>
|
||||
<string name="gpx_saved_sucessfully">GPX file successfully saved to {0}</string>
|
||||
<string name="use_distance_measurement_help">* Tap to mark a point.\n
|
||||
* Press and hold on the map to delete previous point.\n
|
||||
* Press and hold on point to view and attach description.\n
|
||||
* Click on measurement widget to see more actions.</string>
|
||||
* Long-tap on the map to delete previous point.\n
|
||||
* Long-tap on a point to view and attach description.\n
|
||||
* Tap on the measurement widget to see more actions.</string>
|
||||
<string name="distance_measurement_start_editing">Start editing</string>
|
||||
<string name="distance_measurement_finish_editing">Finish editing</string>
|
||||
<string name="distance_measurement_finish_subtrack">Begin a new subtrack</string>
|
||||
|
|
@ -1450,7 +1450,7 @@
|
|||
<string name="av_settings">Audio/video settings </string>
|
||||
<string name="recording_error">Error occurred while recording </string>
|
||||
<string name="recording_camera_not_available">Camera is not available</string>
|
||||
<string name="recording_is_recorded">Audio/video is being recorded. To stop it press the AV widget.</string>
|
||||
<string name="recording_is_recorded">Audio/video is being recorded. To stop it tap the AV widget.</string>
|
||||
<string name="recording_playing">An audio from the specified recording is being played.\n%1$s</string>
|
||||
<string name="recording_open_external_player">Open external player</string>
|
||||
<string name="recording_delete_confirm">Do you want to delete this recording?</string>
|
||||
|
|
@ -1537,7 +1537,7 @@
|
|||
<string name="auto_zoom_map">Auto zoom map</string>
|
||||
<string name="snap_to_road_descr">Snap position to roads during navigation</string>
|
||||
<string name="snap_to_road">Snap to road</string>
|
||||
<string name="interrupt_music_descr">Fully pause any music during voice prompts (not just lower its volume)</string>
|
||||
<string name="interrupt_music_descr">Voice prompts pause, not just subdue, music playback</string>
|
||||
<string name="interrupt_music">Pause music</string>
|
||||
<string name="osmand_play_title_30_chars">OsmAnd Maps & Navigation</string>
|
||||
<string name="osmand_short_description_80_chars">Global Mobile Map Viewing & Navigation for Offline and Online OSM Maps</string>
|
||||
|
|
@ -1753,7 +1753,7 @@
|
|||
<string name="bg_service_sleep_mode_on">Stop\n running in background</string>
|
||||
<string name="gps_wakeup_interval">GPS wake-up interval: %s</string>
|
||||
<string name="int_continuosly">Continuous</string>
|
||||
<string name="screen_is_locked">To unlock screen press lock icon</string>
|
||||
<string name="screen_is_locked">To unlock screen tap the lock icon</string>
|
||||
<string name="map_widget_top_text">Street name</string>
|
||||
<string name="map_widget_config">Configure screen</string>
|
||||
<string name="map_widget_back_to_loc">Where am I</string>
|
||||
|
|
@ -1838,7 +1838,7 @@
|
|||
<string name="offline_navigation_not_available">OsmAnd offline navigation is temporarily not available.</string>
|
||||
<string name="left_side_navigation">Left-hand driving</string>
|
||||
<string name="left_side_navigation_descr">Select for countries with left-hand traffic</string>
|
||||
<string name="local_index_description">Click any existing item to see more details, press and hold to deactivate or delete. Current data on device (%1$s free):</string>
|
||||
<string name="local_index_description">Tap any existing item to see more details, long-tap to deactivate or delete. Current data on device (%1$s free):</string>
|
||||
<string name="unknown_from_location">Starting point is not yet determined</string>
|
||||
<string name="unknown_location">Position not yet known</string>
|
||||
<string name="modify_transparency">Modify transparency (0 - transparent, 255 - opaque)</string>
|
||||
|
|
@ -2659,10 +2659,14 @@
|
|||
<string name="quick_action_map_source_action">Add map source</string>
|
||||
<string name="quick_action_map_source_switch">The map source has been changed to \"%s\".</string>
|
||||
<string name="quick_action_btn_tutorial_title">Change button position</string>
|
||||
<string name="quick_action_btn_tutorial_descr">Long tap and drag the button to change its position on the screen</string>
|
||||
<string name="quick_action_btn_tutorial_descr">Long-tap and drag the button to change its position on the screen</string>
|
||||
<string name="shared_string_action_name">Action name</string>
|
||||
<string name="mappilary_no_internet_desc">You need internet to view photos from Mapillary</string>
|
||||
<string name="retry">Retry</string>
|
||||
<string name="add_gpx_waypoint_bottom_sheet_title">Add gpx waypoint</string>
|
||||
<string name="shared_string_create">Create</string>
|
||||
<string name="add_route_point">Add Route Point</string>
|
||||
<string name="add_waypoint">Add Waypoint</string>
|
||||
<string name="save_gpx_waypoint">Save GPX Waypoint</string>
|
||||
<string name="save_route_point">Save Route Point</string>
|
||||
<string name="waypoint_one">Waypoint 1</string>
|
||||
<string name="route_point_one">Route Point 1</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ public class PointDescription {
|
|||
|
||||
public static final String POINT_TYPE_FAVORITE = "favorite";
|
||||
public static final String POINT_TYPE_WPT = "wpt";
|
||||
public static final String POINT_TYPE_RTE = "rte";
|
||||
public static final String POINT_TYPE_POI = "poi";
|
||||
public static final String POINT_TYPE_ADDRESS = "address";
|
||||
public static final String POINT_TYPE_OSM_NOTE= "osm_note";
|
||||
|
|
@ -211,6 +212,10 @@ public class PointDescription {
|
|||
public boolean isWpt() {
|
||||
return POINT_TYPE_WPT.equals(type);
|
||||
}
|
||||
|
||||
public boolean isRte() {
|
||||
return POINT_TYPE_RTE.equals(type);
|
||||
}
|
||||
|
||||
public boolean isPoi() {
|
||||
return POINT_TYPE_POI.equals(type);
|
||||
|
|
|
|||
|
|
@ -102,18 +102,6 @@ public class GPXUtilities {
|
|||
public float speed;
|
||||
}
|
||||
|
||||
public static class NewGpxWaypoint {
|
||||
private GPXFile gpx;
|
||||
|
||||
public NewGpxWaypoint(GPXFile gpx) {
|
||||
this.gpx = gpx;
|
||||
}
|
||||
|
||||
public GPXFile getGpx() {
|
||||
return gpx;
|
||||
}
|
||||
}
|
||||
|
||||
public static class WptPt extends GPXExtensions implements LocationPoint {
|
||||
public boolean firstPoint = false;
|
||||
public boolean lastPoint = false;
|
||||
|
|
@ -872,6 +860,29 @@ public class GPXUtilities {
|
|||
}
|
||||
|
||||
points.add(pt);
|
||||
|
||||
modifiedTime = System.currentTimeMillis();
|
||||
|
||||
return pt;
|
||||
}
|
||||
|
||||
public WptPt addRtePt(double lat, double lon, long time, String description, String name, String category, int color) {
|
||||
double latAdjusted = Double.parseDouble(latLonFormat.format(lat));
|
||||
double lonAdjusted = Double.parseDouble(latLonFormat.format(lon));
|
||||
final WptPt pt = new WptPt(latAdjusted, lonAdjusted, time, Double.NaN, 0, Double.NaN);
|
||||
pt.name = name;
|
||||
pt.category = category;
|
||||
pt.desc = description;
|
||||
if (color != 0) {
|
||||
pt.setColor(color);
|
||||
}
|
||||
|
||||
if (routes.size() == 0) {
|
||||
routes.add(new Route());
|
||||
}
|
||||
Route currentRoute = routes.get(routes.size() -1);
|
||||
currentRoute.points.add(pt);
|
||||
|
||||
modifiedTime = System.currentTimeMillis();
|
||||
|
||||
return pt;
|
||||
|
|
|
|||
|
|
@ -57,8 +57,6 @@ import net.osmand.plus.AppInitializer;
|
|||
import net.osmand.plus.AppInitializer.AppInitializeListener;
|
||||
import net.osmand.plus.AppInitializer.InitEvents;
|
||||
import net.osmand.plus.ApplicationMode;
|
||||
import net.osmand.plus.GPXUtilities;
|
||||
import net.osmand.plus.GPXUtilities.NewGpxWaypoint;
|
||||
import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
|
||||
import net.osmand.plus.MapMarkersHelper.MapMarker;
|
||||
import net.osmand.plus.MapMarkersHelper.MapMarkerChangedListener;
|
||||
|
|
@ -106,6 +104,7 @@ import net.osmand.plus.routing.RoutingHelper.RouteCalculationProgressCallback;
|
|||
import net.osmand.plus.search.QuickSearchDialogFragment;
|
||||
import net.osmand.plus.search.QuickSearchDialogFragment.QuickSearchTab;
|
||||
import net.osmand.plus.search.QuickSearchDialogFragment.QuickSearchType;
|
||||
import net.osmand.plus.views.AddGpxPointBottomSheetHelper.NewGpxPoint;
|
||||
import net.osmand.plus.views.AnimateDraggingMapThread;
|
||||
import net.osmand.plus.views.MapControlsLayer;
|
||||
import net.osmand.plus.views.MapInfoLayer;
|
||||
|
|
@ -505,6 +504,10 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
|
|||
getMeasurementToolFragment().showQuitDialog();
|
||||
return;
|
||||
}
|
||||
if (mapContextMenu.isVisible() && mapContextMenu.isClosable()) {
|
||||
mapContextMenu.close();
|
||||
return;
|
||||
}
|
||||
if (prevActivityIntent != null && getSupportFragmentManager().getBackStackEntryCount() == 0) {
|
||||
prevActivityIntent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
|
||||
LatLon loc = getMapLocation();
|
||||
|
|
@ -923,9 +926,9 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
|
|||
} else if (toShow instanceof QuadRect) {
|
||||
QuadRect qr = (QuadRect) toShow;
|
||||
mapView.fitRectToMap(qr.left, qr.right, qr.top, qr.bottom, (int) qr.width(), (int) qr.height(), 0);
|
||||
} else if (toShow instanceof NewGpxWaypoint) {
|
||||
NewGpxWaypoint newGpxWaypoint = (NewGpxWaypoint) toShow;
|
||||
getMapLayers().getContextMenuLayer().enterAddGpxWaypointMode(newGpxWaypoint);
|
||||
} else if (toShow instanceof NewGpxPoint) {
|
||||
NewGpxPoint newGpxPoint = (NewGpxPoint) toShow;
|
||||
getMapLayers().getContextMenuLayer().enterAddGpxPointMode(newGpxPoint);
|
||||
} else {
|
||||
mapContextMenu.show(latLonToShow, mapLabelToShow, toShow);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ import java.util.List;
|
|||
public class TrackActivity extends TabActivity {
|
||||
|
||||
public static final String TRACK_FILE_NAME = "TRACK_FILE_NAME";
|
||||
public static final String OPEN_POINTS_TAB = "OPEN_POINTS_TAB";
|
||||
public static final String CURRENT_RECORDING = "CURRENT_RECORDING";
|
||||
protected List<WeakReference<Fragment>> fragList = new ArrayList<>();
|
||||
protected PagerSlidingTabStrip slidingTabLayout;
|
||||
|
|
@ -47,6 +48,7 @@ public class TrackActivity extends TabActivity {
|
|||
private List<GpxDisplayGroup> displayGroups;
|
||||
private List<GpxDisplayGroup> originalGroups = new ArrayList<>();
|
||||
private boolean stopped = false;
|
||||
public boolean openPointsTab = false;
|
||||
|
||||
public PagerSlidingTabStrip getSlidingTabLayout() {
|
||||
return slidingTabLayout;
|
||||
|
|
@ -75,6 +77,9 @@ public class TrackActivity extends TabActivity {
|
|||
}
|
||||
actionBar.setElevation(0);
|
||||
}
|
||||
if (intent.hasExtra(OPEN_POINTS_TAB)) {
|
||||
openPointsTab = true;
|
||||
}
|
||||
setContentView(R.layout.tab_content);
|
||||
}
|
||||
|
||||
|
|
@ -188,6 +193,9 @@ public class TrackActivity extends TabActivity {
|
|||
if (isHavingWayPoints() || isHavingRoutePoints()) {
|
||||
((OsmandFragmentPagerAdapter) mViewPager.getAdapter()).addTab(
|
||||
getTabIndicator(R.string.points, TrackPointFragment.class));
|
||||
if (openPointsTab) {
|
||||
mViewPager.setCurrentItem(1, false);
|
||||
}
|
||||
} else {
|
||||
slidingTabLayout.setVisibility(View.GONE);
|
||||
getSupportActionBar().setElevation(AndroidUtils.dpToPx(getMyApplication(), 4f));
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ import net.osmand.plus.mapcontextmenu.MenuController.TitleProgressController;
|
|||
import net.osmand.plus.mapcontextmenu.controllers.MapDataMenuController;
|
||||
import net.osmand.plus.mapcontextmenu.editors.FavoritePointEditor;
|
||||
import net.osmand.plus.mapcontextmenu.editors.PointEditor;
|
||||
import net.osmand.plus.mapcontextmenu.editors.RtePtEditor;
|
||||
import net.osmand.plus.mapcontextmenu.editors.WptPtEditor;
|
||||
import net.osmand.plus.mapcontextmenu.other.MapMultiSelectionMenu;
|
||||
import net.osmand.plus.mapcontextmenu.other.ShareMenu;
|
||||
|
|
@ -64,6 +65,7 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
|
|||
|
||||
private FavoritePointEditor favoritePointEditor;
|
||||
private WptPtEditor wptPtEditor;
|
||||
private RtePtEditor rtePtEditor;
|
||||
|
||||
private boolean active;
|
||||
private LatLon latLon;
|
||||
|
|
@ -147,6 +149,9 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
|
|||
if (wptPtEditor != null) {
|
||||
wptPtEditor.setMapActivity(mapActivity);
|
||||
}
|
||||
if (rtePtEditor != null) {
|
||||
rtePtEditor.setMapActivity(mapActivity);
|
||||
}
|
||||
|
||||
if (active) {
|
||||
acquireMenuController(false);
|
||||
|
|
@ -196,11 +201,20 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
|
|||
return wptPtEditor;
|
||||
}
|
||||
|
||||
public RtePtEditor getRtePtPointEditor() {
|
||||
if (rtePtEditor == null) {
|
||||
rtePtEditor = new RtePtEditor(mapActivity);
|
||||
}
|
||||
return rtePtEditor;
|
||||
}
|
||||
|
||||
public PointEditor getPointEditor(String tag) {
|
||||
if (favoritePointEditor != null && favoritePointEditor.getFragmentTag().equals(tag)) {
|
||||
return favoritePointEditor;
|
||||
} else if (wptPtEditor != null && wptPtEditor.getFragmentTag().equals(tag)) {
|
||||
return wptPtEditor;
|
||||
} else if (rtePtEditor != null && rtePtEditor.getFragmentTag().equals(tag)) {
|
||||
return rtePtEditor;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
|
@ -379,15 +393,9 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
|
|||
WeakReference<MapContextMenuFragment> fragmentRef = findMenuFragment();
|
||||
init(latLon, pointDescription, object, true, false);
|
||||
if (fragmentRef != null) {
|
||||
fragmentRef.get().rebuildMenu();
|
||||
}
|
||||
}
|
||||
|
||||
public void rebuildMenu() {
|
||||
WeakReference<MapContextMenuFragment> fragmentRef = findMenuFragment();
|
||||
if (fragmentRef != null) {
|
||||
fragmentRef.get().rebuildMenu();
|
||||
fragmentRef.get().rebuildMenu(centerMarker);
|
||||
}
|
||||
centerMarker = false;
|
||||
}
|
||||
|
||||
public void showOrUpdate(LatLon latLon, PointDescription pointDescription, Object object) {
|
||||
|
|
|
|||
|
|
@ -792,7 +792,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
|
|||
menu.setMapZoom(0);
|
||||
}
|
||||
|
||||
public void rebuildMenu() {
|
||||
public void rebuildMenu(boolean centered) {
|
||||
OsmandApplication app = getMyApplication();
|
||||
if (app != null && view != null) {
|
||||
IconsCache iconsCache = app.getIconsCache();
|
||||
|
|
@ -807,6 +807,10 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
|
|||
bottomLayout.removeAllViews();
|
||||
buildBottomView();
|
||||
|
||||
if (centered) {
|
||||
this.initLayout = true;
|
||||
this.centered = true;
|
||||
}
|
||||
runLayoutListener();
|
||||
}
|
||||
}
|
||||
|
|
@ -1284,7 +1288,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
|
|||
public void downloadHasFinished() {
|
||||
updateOnDownload();
|
||||
if (menu != null && menu.isVisible() && menu.isMapDownloaded()) {
|
||||
rebuildMenu();
|
||||
rebuildMenu(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -10,13 +10,11 @@ import net.osmand.data.TransportStop;
|
|||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.mapcontextmenu.MapContextMenu;
|
||||
import net.osmand.plus.mapcontextmenu.MapContextMenuFragment;
|
||||
import net.osmand.plus.mapcontextmenu.MenuBuilder;
|
||||
import net.osmand.plus.mapcontextmenu.MenuController;
|
||||
import net.osmand.plus.mapcontextmenu.controllers.TransportStopController.TransportStopRoute;
|
||||
import net.osmand.plus.views.TransportStopsLayer;
|
||||
|
||||
import java.lang.ref.WeakReference;
|
||||
import java.util.List;
|
||||
|
||||
public class TransportRouteController extends MenuController {
|
||||
|
|
@ -94,14 +92,15 @@ public class TransportRouteController extends MenuController {
|
|||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean displayStreetNameInTitle() {
|
||||
return super.displayStreetNameInTitle();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTypeStr() {
|
||||
return getPointDescription().getTypeName();
|
||||
if (transportRoute.refStop != null) {
|
||||
return transportRoute.refStop.getName();
|
||||
} else if (transportRoute.stop != null) {
|
||||
return transportRoute.stop.getName();
|
||||
} else {
|
||||
return getPointDescription().getTypeName();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -159,16 +158,32 @@ public class TransportRouteController extends MenuController {
|
|||
|
||||
@Override
|
||||
public void onClick(View arg0) {
|
||||
MapContextMenu menu = getMapActivity().getContextMenu();
|
||||
if (mapContextMenu != null) {
|
||||
transportRoute.stop = stop;
|
||||
transportRoute.refStop = stop;
|
||||
PointDescription pd = new PointDescription(PointDescription.POINT_TYPE_TRANSPORT_ROUTE,
|
||||
transportRoute.getDescription(getMapActivity().getMyApplication(), false));
|
||||
|
||||
LatLon stopLocation = stop.getLocation();
|
||||
if (mapContextMenu.isVisible()) {
|
||||
mapContextMenu.updateMapCenter(stopLocation);
|
||||
} else {
|
||||
mapContextMenu.setMapCenter(stopLocation);
|
||||
mapContextMenu.setMapPosition(getMapActivity().getMapView().getMapPosition());
|
||||
}
|
||||
mapContextMenu.setCenterMarker(true);
|
||||
mapContextMenu.setMapZoom(15);
|
||||
mapContextMenu.showOrUpdate(stopLocation, pd, transportRoute);
|
||||
}
|
||||
/*
|
||||
PointDescription pd = new PointDescription(PointDescription.POINT_TYPE_TRANSPORT_STOP,
|
||||
getMapActivity().getString(R.string.transport_Stop), name);
|
||||
|
||||
//resetRoute();
|
||||
LatLon stopLocation = stop.getLocation();
|
||||
getMapActivity().getMyApplication().getSettings()
|
||||
.setMapLocationToShow(stopLocation.getLatitude(), stopLocation.getLongitude(),
|
||||
15, pd, false, stop);
|
||||
15, pd, false, transportRoute);
|
||||
MapActivity.launchMapActivityMoveToTop(getMapActivity());
|
||||
*/
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
package net.osmand.plus.mapcontextmenu.editors;
|
||||
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
|
||||
public class RtePtEditor extends WptPtEditor {
|
||||
|
||||
public static final String TAG = "RtePtEditorFragment";
|
||||
|
||||
public RtePtEditor(MapActivity mapActivity) {
|
||||
super(mapActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getFragmentTag() {
|
||||
return TAG;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void showEditorFragment() {
|
||||
RtePtEditorFragment.showInstance(mapActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void showEditorFragment(boolean skipDialog) {
|
||||
RtePtEditorFragment.showInstance(mapActivity, skipDialog);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
package net.osmand.plus.mapcontextmenu.editors;
|
||||
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
|
||||
public class RtePtEditorFragment extends WptPtEditorFragment {
|
||||
|
||||
@Override
|
||||
public void assignEditor() {
|
||||
editor = getMapActivity().getContextMenu().getRtePtPointEditor();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getToolbarTitle() {
|
||||
return getMapActivity().getResources().getString(R.string.save_route_point);
|
||||
}
|
||||
|
||||
public static void showInstance(final MapActivity mapActivity) {
|
||||
RtePtEditor editor = mapActivity.getContextMenu().getRtePtPointEditor();
|
||||
//int slideInAnim = editor.getSlideInAnimation();
|
||||
//int slideOutAnim = editor.getSlideOutAnimation();
|
||||
|
||||
RtePtEditorFragment fragment = new RtePtEditorFragment();
|
||||
mapActivity.getSupportFragmentManager().beginTransaction()
|
||||
//.setCustomAnimations(slideInAnim, slideOutAnim, slideInAnim, slideOutAnim)
|
||||
.add(R.id.fragmentContainer, fragment, editor.getFragmentTag())
|
||||
.addToBackStack(null).commit();
|
||||
}
|
||||
|
||||
public static void showInstance(final MapActivity mapActivity, boolean skipDialog) {
|
||||
RtePtEditor editor = mapActivity.getContextMenu().getRtePtPointEditor();
|
||||
//int slideInAnim = editor.getSlideInAnimation();
|
||||
//int slideOutAnim = editor.getSlideOutAnimation();
|
||||
|
||||
RtePtEditorFragment fragment = new RtePtEditorFragment();
|
||||
fragment.skipDialog = skipDialog;
|
||||
|
||||
mapActivity.getSupportFragmentManager().beginTransaction()
|
||||
//.setCustomAnimations(slideInAnim, slideOutAnim, slideInAnim, slideOutAnim)
|
||||
.add(R.id.fragmentContainer, fragment, editor.getFragmentTag())
|
||||
.addToBackStack(null).commit();
|
||||
}
|
||||
}
|
||||
|
|
@ -9,9 +9,11 @@ import net.osmand.plus.activities.MapActivity;
|
|||
|
||||
public class WptPtEditor extends PointEditor {
|
||||
|
||||
private OnDismissListener onDismissListener;
|
||||
private GPXFile gpxFile;
|
||||
private WptPt wpt;
|
||||
private boolean gpxSelected;
|
||||
private boolean newGpxPointProcessing;
|
||||
|
||||
public static final String TAG = "WptPtEditorFragment";
|
||||
|
||||
|
|
@ -19,9 +21,24 @@ public class WptPtEditor extends PointEditor {
|
|||
super(mapActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getFragmentTag() {
|
||||
return TAG;
|
||||
public void setNewGpxPointProcessing(boolean newGpxPointProcessing) {
|
||||
this.newGpxPointProcessing = newGpxPointProcessing;
|
||||
}
|
||||
|
||||
public boolean isNewGpxPointProcessing() {
|
||||
return newGpxPointProcessing;
|
||||
}
|
||||
|
||||
public interface OnDismissListener {
|
||||
void onDismiss();
|
||||
}
|
||||
|
||||
public void setOnDismissListener(OnDismissListener listener) {
|
||||
onDismissListener = listener;
|
||||
}
|
||||
|
||||
public OnDismissListener getOnDismissListener() {
|
||||
return onDismissListener;
|
||||
}
|
||||
|
||||
public GPXFile getGpxFile() {
|
||||
|
|
@ -36,6 +53,11 @@ public class WptPtEditor extends PointEditor {
|
|||
return wpt;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getFragmentTag() {
|
||||
return TAG;
|
||||
}
|
||||
|
||||
public void add(GPXFile gpxFile, LatLon latLon, String title) {
|
||||
if (latLon == null) {
|
||||
return;
|
||||
|
|
@ -50,7 +72,7 @@ public class WptPtEditor extends PointEditor {
|
|||
wpt = new WptPt(latLon.getLatitude(), latLon.getLongitude(),
|
||||
System.currentTimeMillis(), Double.NaN, 0, Double.NaN);
|
||||
wpt.name = title;
|
||||
WptPtEditorFragment.showInstance(mapActivity);
|
||||
showEditorFragment();
|
||||
}
|
||||
|
||||
public void add(GPXFile gpxFile, LatLon latLon, String title, String categoryName, int categoryColor, boolean skipDialog) {
|
||||
|
|
@ -86,7 +108,7 @@ public class WptPtEditor extends PointEditor {
|
|||
|
||||
wpt.category = categoryName;
|
||||
|
||||
WptPtEditorFragment.showInstance(mapActivity, skipDialog);
|
||||
showEditorFragment(skipDialog);
|
||||
}
|
||||
|
||||
public void edit(WptPt wpt) {
|
||||
|
|
@ -101,6 +123,14 @@ public class WptPtEditor extends PointEditor {
|
|||
gpxFile = selectedGpxFile.getGpxFile();
|
||||
}
|
||||
this.wpt = wpt;
|
||||
showEditorFragment();
|
||||
}
|
||||
|
||||
public void showEditorFragment() {
|
||||
WptPtEditorFragment.showInstance(mapActivity);
|
||||
}
|
||||
|
||||
public void showEditorFragment(boolean skipDialog) {
|
||||
WptPtEditorFragment.showInstance(mapActivity, skipDialog);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ import net.osmand.plus.FavouritesDbHelper.FavoriteGroup;
|
|||
import net.osmand.plus.GPXUtilities;
|
||||
import net.osmand.plus.GPXUtilities.GPXFile;
|
||||
import net.osmand.plus.GPXUtilities.WptPt;
|
||||
import net.osmand.plus.mapcontextmenu.editors.WptPtEditor.OnDismissListener;
|
||||
import net.osmand.plus.GpxSelectionHelper;
|
||||
import net.osmand.plus.OsmandApplication;
|
||||
import net.osmand.plus.R;
|
||||
|
|
@ -26,7 +27,8 @@ import net.osmand.util.Algorithms;
|
|||
import java.io.File;
|
||||
|
||||
public class WptPtEditorFragment extends PointEditorFragment {
|
||||
private WptPtEditor editor;
|
||||
|
||||
protected WptPtEditor editor;
|
||||
private WptPt wpt;
|
||||
private SavingTrackHelper savingTrackHelper;
|
||||
private GpxSelectionHelper selectedGpxHelper;
|
||||
|
|
@ -34,17 +36,21 @@ public class WptPtEditorFragment extends PointEditorFragment {
|
|||
private boolean saved;
|
||||
private int color;
|
||||
private int defaultColor;
|
||||
private boolean skipDialog;
|
||||
protected boolean skipDialog;
|
||||
|
||||
@Override
|
||||
public void onAttach(Activity activity) {
|
||||
super.onAttach(activity);
|
||||
savingTrackHelper = getMapActivity().getMyApplication().getSavingTrackHelper();
|
||||
selectedGpxHelper = getMapActivity().getMyApplication().getSelectedGpxHelper();
|
||||
editor = getMapActivity().getContextMenu().getWptPtPointEditor();
|
||||
assignEditor();
|
||||
defaultColor = getResources().getColor(R.color.gpx_color_point);
|
||||
}
|
||||
|
||||
protected void assignEditor() {
|
||||
editor = getMapActivity().getContextMenu().getWptPtPointEditor();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(final Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
|
@ -69,6 +75,17 @@ public class WptPtEditorFragment extends PointEditorFragment {
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void dismiss(boolean includingMenu) {
|
||||
super.dismiss(includingMenu);
|
||||
OnDismissListener listener = editor.getOnDismissListener();
|
||||
if (listener != null) {
|
||||
listener.onDismiss();
|
||||
}
|
||||
editor.setNewGpxPointProcessing(false);
|
||||
editor.setOnDismissListener(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PointEditor getEditor() {
|
||||
return editor;
|
||||
|
|
@ -76,10 +93,14 @@ public class WptPtEditorFragment extends PointEditorFragment {
|
|||
|
||||
@Override
|
||||
public String getToolbarTitle() {
|
||||
if (editor.isNew()) {
|
||||
return getMapActivity().getResources().getString(R.string.context_menu_item_add_waypoint);
|
||||
if (editor.isNewGpxPointProcessing()) {
|
||||
return getMapActivity().getResources().getString(R.string.save_gpx_waypoint);
|
||||
} else {
|
||||
return getMapActivity().getResources().getString(R.string.shared_string_edit);
|
||||
if (editor.isNew()) {
|
||||
return getMapActivity().getResources().getString(R.string.context_menu_item_add_waypoint);
|
||||
} else {
|
||||
return getMapActivity().getResources().getString(R.string.shared_string_edit);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ import net.osmand.plus.mapcontextmenu.MenuController.MenuType;
|
|||
import net.osmand.plus.mapcontextmenu.MenuTitleController;
|
||||
import net.osmand.plus.views.ContextMenuLayer;
|
||||
import net.osmand.plus.views.ContextMenuLayer.IContextMenuProvider;
|
||||
import net.osmand.plus.views.OsmandMapTileView;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
|
|
@ -194,8 +195,8 @@ public class MapMultiSelectionMenu extends BaseMenuController {
|
|||
public void openContextMenu(@NonNull MenuObject menuObject) {
|
||||
IContextMenuProvider provider = selectedObjects.remove(menuObject.getObject());
|
||||
hide();
|
||||
getMapActivity().getMapLayers().getContextMenuLayer().showContextMenu(
|
||||
menuObject.getLatLon(), menuObject.getPointDescription(), menuObject.getObject(), provider);
|
||||
ContextMenuLayer contextMenuLayer = getMapActivity().getMapLayers().getContextMenuLayer();
|
||||
contextMenuLayer.showContextMenu(menuObject.getLatLon(), menuObject.getPointDescription(), menuObject.getObject(), provider);
|
||||
}
|
||||
|
||||
private void clearSelectedObjects() {
|
||||
|
|
|
|||
|
|
@ -211,7 +211,7 @@ public class MeasurementToolFragment extends Fragment {
|
|||
|
||||
private void saveAsGpxOnClick(MapActivity mapActivity) {
|
||||
final File dir = mapActivity.getMyApplication().getAppPath(IndexConstants.GPX_INDEX_DIR);
|
||||
final LayoutInflater inflater = getLayoutInflater();
|
||||
final LayoutInflater inflater = mapActivity.getLayoutInflater();
|
||||
final View view = inflater.inflate(R.layout.save_gpx_dialog, null);
|
||||
final EditText nameEt = (EditText) view.findViewById(R.id.gpx_name_et);
|
||||
final TextView fileExistsTv = (TextView) view.findViewById(R.id.file_exists_text_view);
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import android.os.Handler;
|
|||
import android.support.annotation.NonNull;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.design.widget.FloatingActionButton;
|
||||
import android.support.v4.content.ContextCompat;
|
||||
import android.support.v4.view.MenuItemCompat;
|
||||
import android.support.v7.app.AlertDialog;
|
||||
import android.support.v7.view.ActionMode;
|
||||
|
|
@ -20,6 +21,7 @@ import android.view.MenuInflater;
|
|||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.AbsListView;
|
||||
import android.widget.CheckBox;
|
||||
import android.widget.EditText;
|
||||
import android.widget.ExpandableListView;
|
||||
|
|
@ -30,16 +32,13 @@ import android.widget.ListView;
|
|||
import android.widget.TextView;
|
||||
|
||||
import net.osmand.AndroidUtils;
|
||||
import net.osmand.Location;
|
||||
import net.osmand.data.FavouritePoint;
|
||||
import net.osmand.data.LatLon;
|
||||
import net.osmand.data.PointDescription;
|
||||
import net.osmand.plus.FavouritesDbHelper;
|
||||
import net.osmand.plus.GPXDatabase.GpxDataItem;
|
||||
import net.osmand.plus.GPXUtilities;
|
||||
import net.osmand.plus.GPXUtilities.WptPt;
|
||||
import net.osmand.plus.GPXUtilities.GPXFile;
|
||||
import net.osmand.plus.GPXUtilities.NewGpxWaypoint;
|
||||
import net.osmand.plus.GpxSelectionHelper.GpxDisplayGroup;
|
||||
import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
|
||||
import net.osmand.plus.GpxSelectionHelper.GpxDisplayItemType;
|
||||
|
|
@ -58,6 +57,7 @@ import net.osmand.plus.activities.TrackActivity;
|
|||
import net.osmand.plus.base.FavoriteImageDrawable;
|
||||
import net.osmand.plus.base.OsmandExpandableListFragment;
|
||||
import net.osmand.plus.dialogs.DirectionsDialogs;
|
||||
import net.osmand.plus.views.AddGpxPointBottomSheetHelper.NewGpxPoint;
|
||||
import net.osmand.util.Algorithms;
|
||||
|
||||
import java.io.File;
|
||||
|
|
@ -93,7 +93,12 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
|
|||
private Set<Integer> selectedGroups = new LinkedHashSet<>();
|
||||
private ActionMode actionMode;
|
||||
private SearchView searchView;
|
||||
private FloatingActionButton fab;
|
||||
private boolean menuOpened = false;
|
||||
private FloatingActionButton menuFab;
|
||||
private FloatingActionButton waypointFab;
|
||||
private View waypointTextLayout;
|
||||
private FloatingActionButton routePointFab;
|
||||
private View routePointTextLayout;
|
||||
|
||||
@Override
|
||||
public void onCreate(@Nullable Bundle savedInstanceState) {
|
||||
|
|
@ -104,6 +109,20 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
|
|||
@Override
|
||||
public void onActivityCreated(Bundle savedInstanceState) {
|
||||
super.onActivityCreated(savedInstanceState);
|
||||
listView.setOnScrollListener(new AbsListView.OnScrollListener() {
|
||||
@Override
|
||||
public void onScrollStateChanged(AbsListView absListView, int i) {
|
||||
if (i == AbsListView.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL) {
|
||||
if (menuOpened) {
|
||||
closeMenu();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onScroll(AbsListView absListView, int i, int i1, int i2) {
|
||||
}
|
||||
});
|
||||
listView.setBackgroundColor(getResources().getColor(
|
||||
getMyApplication().getSettings().isLightContent() ? R.color.ctx_menu_info_view_bg_light
|
||||
: R.color.ctx_menu_info_view_bg_dark));
|
||||
|
|
@ -115,26 +134,38 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
|
|||
ExpandableListView listView = (ExpandableListView) view.findViewById(android.R.id.list);
|
||||
setHasOptionsMenu(true);
|
||||
|
||||
fab = (FloatingActionButton) view.findViewById(R.id.fabButton);
|
||||
|
||||
fab.setOnClickListener(new View.OnClickListener() {
|
||||
menuFab = (FloatingActionButton) view.findViewById(R.id.menu_fab);
|
||||
menuFab.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
final OsmandSettings settings = app.getSettings();
|
||||
GPXFile gpx = getGpx();
|
||||
Location location = app.getLocationProvider().getLastKnownLocation();
|
||||
if (location != null) {
|
||||
settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(),
|
||||
settings.getLastKnownMapZoom(),
|
||||
new PointDescription(PointDescription.POINT_TYPE_WPT, getString(R.string.context_menu_item_add_waypoint)),
|
||||
false,
|
||||
new NewGpxWaypoint(gpx));
|
||||
|
||||
MapActivity.launchMapActivityMoveToTop(getActivity());
|
||||
if (menuOpened) {
|
||||
closeMenu();
|
||||
} else {
|
||||
openMenu();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
waypointFab = (FloatingActionButton) view.findViewById(R.id.waypoint_fab);
|
||||
waypointFab.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
PointDescription pointDescription = new PointDescription(PointDescription.POINT_TYPE_WPT, getString(R.string.add_waypoint));
|
||||
addPoint(pointDescription);
|
||||
}
|
||||
});
|
||||
waypointTextLayout = view.findViewById(R.id.waypoint_text_layout);
|
||||
|
||||
routePointFab = (FloatingActionButton) view.findViewById(R.id.route_fab);
|
||||
routePointFab.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
PointDescription pointDescription = new PointDescription(PointDescription.POINT_TYPE_RTE, getString(R.string.add_route_point));
|
||||
addPoint(pointDescription);
|
||||
}
|
||||
});
|
||||
routePointTextLayout = view.findViewById(R.id.route_text_layout);
|
||||
|
||||
TextView tv = new TextView(getActivity());
|
||||
tv.setText(R.string.none_selected_gpx);
|
||||
tv.setTextSize(24);
|
||||
|
|
@ -146,6 +177,43 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
|
|||
return view;
|
||||
}
|
||||
|
||||
private void addPoint(PointDescription pointDescription) {
|
||||
Intent currentIntent = getTrackActivity().getIntent();
|
||||
if (currentIntent != null) {
|
||||
currentIntent.putExtra(TrackActivity.OPEN_POINTS_TAB, true);
|
||||
}
|
||||
final OsmandSettings settings = app.getSettings();
|
||||
GPXFile gpx = getGpx();
|
||||
LatLon location = settings.getLastKnownMapLocation();
|
||||
if (gpx != null && location != null) {
|
||||
settings.setMapLocationToShow(location.getLatitude(), location.getLongitude(),
|
||||
settings.getLastKnownMapZoom(),
|
||||
pointDescription,
|
||||
false,
|
||||
new NewGpxPoint(gpx, pointDescription));
|
||||
|
||||
MapActivity.launchMapActivityMoveToTop(getActivity());
|
||||
}
|
||||
}
|
||||
|
||||
private void openMenu() {
|
||||
menuFab.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_action_remove_dark));
|
||||
waypointFab.setVisibility(View.VISIBLE);
|
||||
waypointTextLayout.setVisibility(View.VISIBLE);
|
||||
routePointFab.setVisibility(View.VISIBLE);
|
||||
routePointTextLayout.setVisibility(View.VISIBLE);
|
||||
menuOpened = true;
|
||||
}
|
||||
|
||||
private void closeMenu() {
|
||||
menuFab.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_action_plus));
|
||||
waypointFab.setVisibility(View.GONE);
|
||||
waypointTextLayout.setVisibility(View.GONE);
|
||||
routePointFab.setVisibility(View.GONE);
|
||||
routePointTextLayout.setVisibility(View.GONE);
|
||||
menuOpened = false;
|
||||
}
|
||||
|
||||
public TrackActivity getTrackActivity() {
|
||||
return (TrackActivity) getActivity();
|
||||
}
|
||||
|
|
@ -168,6 +236,11 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
|
|||
if (!adapter.isEmpty() && listView.getHeaderViewsCount() == 0) {
|
||||
listView.addHeaderView(getActivity().getLayoutInflater().inflate(R.layout.list_shadow_header, null, false));
|
||||
listView.addFooterView(getActivity().getLayoutInflater().inflate(R.layout.list_shadow_footer, null, false));
|
||||
View view = new View(getActivity());
|
||||
view.setLayoutParams(new AbsListView.LayoutParams(
|
||||
AbsListView.LayoutParams.MATCH_PARENT,
|
||||
AndroidUtils.dpToPx(getActivity(), 72)));
|
||||
listView.addFooterView(view);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -270,6 +343,7 @@ public class TrackPointFragment extends OsmandExpandableListFragment {
|
|||
@Override
|
||||
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
|
||||
menu.clear();
|
||||
getTrackActivity().getClearToolbar(false);
|
||||
MenuItem mi = createMenuItem(menu, SEARCH_ID, R.string.search_poi_filter, R.drawable.ic_action_search_dark,
|
||||
R.drawable.ic_action_search_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
|
||||
searchView = new SearchView(getActivity());
|
||||
|
|
|
|||
|
|
@ -0,0 +1,156 @@
|
|||
package net.osmand.plus.views;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.graphics.PointF;
|
||||
import android.view.View;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import net.osmand.data.LatLon;
|
||||
import net.osmand.data.PointDescription;
|
||||
import net.osmand.data.RotatedTileBox;
|
||||
import net.osmand.plus.GPXUtilities.GPXFile;
|
||||
import net.osmand.plus.IconsCache;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.activities.TrackActivity;
|
||||
import net.osmand.plus.mapcontextmenu.MapContextMenu;
|
||||
import net.osmand.plus.mapcontextmenu.editors.RtePtEditor;
|
||||
import net.osmand.plus.mapcontextmenu.editors.WptPtEditor;
|
||||
import net.osmand.plus.mapcontextmenu.editors.WptPtEditor.OnDismissListener;
|
||||
|
||||
public class AddGpxPointBottomSheetHelper implements OnDismissListener {
|
||||
private final View view;
|
||||
private final TextView title;
|
||||
private final TextView description;
|
||||
private final ImageView icon;
|
||||
private final MapActivity mapActivity;
|
||||
private final MapContextMenu contextMenu;
|
||||
private final ContextMenuLayer contextMenuLayer;
|
||||
private final IconsCache iconsCache;
|
||||
private String titleText;
|
||||
private boolean applyingPositionMode;
|
||||
private NewGpxPoint newGpxPoint;
|
||||
private PointDescription pointDescription;
|
||||
|
||||
public AddGpxPointBottomSheetHelper(final MapActivity activity, ContextMenuLayer ctxMenuLayer) {
|
||||
this.contextMenuLayer = ctxMenuLayer;
|
||||
iconsCache = activity.getMyApplication().getIconsCache();
|
||||
mapActivity = activity;
|
||||
contextMenu = activity.getContextMenu();
|
||||
view = activity.findViewById(R.id.add_gpx_point_bottom_sheet);
|
||||
title = (TextView) view.findViewById(R.id.add_gpx_point_bottom_sheet_title);
|
||||
description = (TextView) view.findViewById(R.id.description);
|
||||
icon = (ImageView) view.findViewById(R.id.icon);
|
||||
|
||||
view.findViewById(R.id.create_button).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
contextMenuLayer.createGpxPoint();
|
||||
GPXFile gpx = newGpxPoint.getGpx();
|
||||
LatLon latLon = contextMenu.getLatLon();
|
||||
if (pointDescription.isWpt()) {
|
||||
WptPtEditor editor = activity.getContextMenu().getWptPtPointEditor();
|
||||
editor.setOnDismissListener(AddGpxPointBottomSheetHelper.this);
|
||||
editor.setNewGpxPointProcessing(true);
|
||||
editor.add(gpx, latLon, titleText);
|
||||
} else if (pointDescription.isRte()) {
|
||||
RtePtEditor editor = activity.getContextMenu().getRtePtPointEditor();
|
||||
editor.setOnDismissListener(AddGpxPointBottomSheetHelper.this);
|
||||
editor.setNewGpxPointProcessing(true);
|
||||
editor.add(gpx, latLon, titleText);
|
||||
}
|
||||
}
|
||||
});
|
||||
view.findViewById(R.id.cancel_button).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
hide();
|
||||
contextMenuLayer.cancelAddGpxPoint();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void onDraw(RotatedTileBox rt) {
|
||||
PointF point = contextMenuLayer.getMovableCenterPoint(rt);
|
||||
double lat = rt.getLatFromPixel(point.x, point.y);
|
||||
double lon = rt.getLonFromPixel(point.x, point.y);
|
||||
description.setText(PointDescription.getLocationName(mapActivity, lat, lon, true));
|
||||
}
|
||||
|
||||
public void setTitle(String title) {
|
||||
if (title.equals("")) {
|
||||
if (pointDescription.isWpt()) {
|
||||
title = mapActivity.getString(R.string.waypoint_one);
|
||||
} else if (pointDescription.isRte()) {
|
||||
title = mapActivity.getString(R.string.route_point_one);
|
||||
}
|
||||
}
|
||||
titleText = title;
|
||||
this.title.setText(titleText);
|
||||
}
|
||||
|
||||
public boolean isVisible() {
|
||||
return view.getVisibility() == View.VISIBLE;
|
||||
}
|
||||
|
||||
public void show(NewGpxPoint newPoint) {
|
||||
this.newGpxPoint = newPoint;
|
||||
pointDescription = newPoint.getPointDescription();
|
||||
if (pointDescription.isWpt()) {
|
||||
setTitle(mapActivity.getString(R.string.waypoint_one));
|
||||
icon.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_marker_dark));
|
||||
} else if (pointDescription.isRte()) {
|
||||
setTitle(mapActivity.getString(R.string.route_point_one));
|
||||
icon.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_markers_dark));
|
||||
}
|
||||
exitApplyPositionMode();
|
||||
view.setVisibility(View.VISIBLE);
|
||||
}
|
||||
|
||||
public void hide() {
|
||||
exitApplyPositionMode();
|
||||
view.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
public void enterApplyPositionMode() {
|
||||
if (!applyingPositionMode) {
|
||||
applyingPositionMode = true;
|
||||
view.findViewById(R.id.create_button).setEnabled(false);
|
||||
}
|
||||
}
|
||||
|
||||
public void exitApplyPositionMode() {
|
||||
if (applyingPositionMode) {
|
||||
applyingPositionMode = false;
|
||||
view.findViewById(R.id.create_button).setEnabled(true);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDismiss() {
|
||||
Intent newIntent = new Intent(mapActivity, mapActivity.getMyApplication().getAppCustomization().getTrackActivity());
|
||||
newIntent.putExtra(TrackActivity.TRACK_FILE_NAME, newGpxPoint.getGpx().path);
|
||||
newIntent.putExtra(TrackActivity.OPEN_POINTS_TAB, true);
|
||||
newIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
||||
mapActivity.startActivity(newIntent);
|
||||
}
|
||||
|
||||
public static class NewGpxPoint {
|
||||
private PointDescription pointDescription;
|
||||
private GPXFile gpx;
|
||||
|
||||
public NewGpxPoint(GPXFile gpx, PointDescription pointDescription) {
|
||||
this.gpx = gpx;
|
||||
this.pointDescription = pointDescription;
|
||||
}
|
||||
|
||||
public GPXFile getGpx() {
|
||||
return gpx;
|
||||
}
|
||||
|
||||
public PointDescription getPointDescription() {
|
||||
return pointDescription;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,102 +0,0 @@
|
|||
package net.osmand.plus.views;
|
||||
|
||||
import android.content.Context;
|
||||
import android.graphics.PointF;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.view.View;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import net.osmand.data.LatLon;
|
||||
import net.osmand.data.PointDescription;
|
||||
import net.osmand.data.RotatedTileBox;
|
||||
import net.osmand.plus.GPXUtilities;
|
||||
import net.osmand.plus.GPXUtilities.GPXFile;
|
||||
import net.osmand.plus.GPXUtilities.NewGpxWaypoint;
|
||||
import net.osmand.plus.IconsCache;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.mapcontextmenu.MapContextMenu;
|
||||
|
||||
public class AddWaypointBottomSheetHelper {
|
||||
private final View view;
|
||||
private final TextView title;
|
||||
private String titleText = "";
|
||||
private final TextView description;
|
||||
private final Context context;
|
||||
private final MapContextMenu contextMenu;
|
||||
private final ContextMenuLayer contextMenuLayer;
|
||||
private boolean applyingPositionMode;
|
||||
private NewGpxWaypoint newGpxWaypoint;
|
||||
|
||||
public AddWaypointBottomSheetHelper(final MapActivity activity, ContextMenuLayer ctxMenuLayer) {
|
||||
this.contextMenuLayer = ctxMenuLayer;
|
||||
view = activity.findViewById(R.id.add_gpx_waypoint_bottom_sheet);
|
||||
title = (TextView) view.findViewById(R.id.add_gpx_waypoint_bottom_sheet_title);
|
||||
description = (TextView) view.findViewById(R.id.description);
|
||||
context = activity;
|
||||
contextMenu = activity.getContextMenu();
|
||||
ImageView icon = (ImageView) view.findViewById(R.id.icon);
|
||||
|
||||
IconsCache iconsCache = activity.getMyApplication().getIconsCache();
|
||||
icon.setImageDrawable(iconsCache.getIcon(R.drawable.ic_action_photo_dark, R.color.marker_green));
|
||||
view.findViewById(R.id.create_button).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
contextMenuLayer.createGpxWaypoint();
|
||||
GPXFile gpx = newGpxWaypoint.getGpx();
|
||||
LatLon latLon = contextMenu.getLatLon();
|
||||
activity.getContextMenu().getWptPtPointEditor().add(gpx, latLon, titleText);
|
||||
}
|
||||
});
|
||||
view.findViewById(R.id.cancel_button).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
hide();
|
||||
contextMenuLayer.cancelAddGpxWaypoint();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void onDraw(RotatedTileBox rt) {
|
||||
PointF point = contextMenuLayer.getMovableCenterPoint(rt);
|
||||
double lat = rt.getLatFromPixel(point.x, point.y);
|
||||
double lon = rt.getLonFromPixel(point.x, point.y);
|
||||
description.setText(PointDescription.getLocationName(context, lat, lon, true));
|
||||
}
|
||||
|
||||
public void setTitle(String title) {
|
||||
titleText = title;
|
||||
this.title.setText(titleText);
|
||||
}
|
||||
|
||||
public boolean isVisible() {
|
||||
return view.getVisibility() == View.VISIBLE;
|
||||
}
|
||||
|
||||
public void show(Drawable drawable, NewGpxWaypoint newGpxWaypoint) {
|
||||
this.newGpxWaypoint = newGpxWaypoint;
|
||||
exitApplyPositionMode();
|
||||
view.setVisibility(View.VISIBLE);
|
||||
((ImageView) view.findViewById(R.id.icon)).setImageDrawable(drawable);
|
||||
}
|
||||
|
||||
public void hide() {
|
||||
exitApplyPositionMode();
|
||||
view.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
public void enterApplyPositionMode() {
|
||||
if (!applyingPositionMode) {
|
||||
applyingPositionMode = true;
|
||||
view.findViewById(R.id.create_button).setEnabled(false);
|
||||
}
|
||||
}
|
||||
|
||||
public void exitApplyPositionMode() {
|
||||
if (applyingPositionMode) {
|
||||
applyingPositionMode = false;
|
||||
view.findViewById(R.id.create_button).setEnabled(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -35,13 +35,13 @@ import net.osmand.osm.PoiFilter;
|
|||
import net.osmand.osm.PoiType;
|
||||
import net.osmand.plus.ContextMenuAdapter;
|
||||
import net.osmand.plus.ContextMenuItem;
|
||||
import net.osmand.plus.GPXUtilities.NewGpxWaypoint;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
import net.osmand.plus.mapcontextmenu.MapContextMenu;
|
||||
import net.osmand.plus.mapcontextmenu.other.MapMultiSelectionMenu;
|
||||
import net.osmand.plus.render.MapRenderRepositories;
|
||||
import net.osmand.plus.render.NativeOsmandLibrary;
|
||||
import net.osmand.plus.views.AddGpxPointBottomSheetHelper.NewGpxPoint;
|
||||
import net.osmand.util.Algorithms;
|
||||
import net.osmand.util.MapUtils;
|
||||
|
||||
|
|
@ -76,14 +76,14 @@ public class ContextMenuLayer extends OsmandMapLayer {
|
|||
private GestureDetector movementListener;
|
||||
|
||||
private final MoveMarkerBottomSheetHelper mMoveMarkerBottomSheetHelper;
|
||||
private final AddWaypointBottomSheetHelper mAddWaypointBottomSheetHelper;
|
||||
private final AddGpxPointBottomSheetHelper mAddGpxPointBottomSheetHelper;
|
||||
private boolean mInChangeMarkerPositionMode;
|
||||
private IContextMenuProvider selectedObjectContextMenuProvider;
|
||||
private boolean cancelApplyingNewMarkerPosition;
|
||||
private LatLon applyingMarkerLatLon;
|
||||
private boolean wasCollapseButtonVisible;
|
||||
private boolean mInGpxDetailsMode;
|
||||
private boolean mInAddGpxWaypointMode;
|
||||
private boolean mInAddGpxPointMode;
|
||||
|
||||
private List<String> publicTransportTypes;
|
||||
private Object selectedObject;
|
||||
|
|
@ -94,7 +94,11 @@ public class ContextMenuLayer extends OsmandMapLayer {
|
|||
multiSelectionMenu = menu.getMultiSelectionMenu();
|
||||
movementListener = new GestureDetector(activity, new MenuLayerOnGestureListener());
|
||||
mMoveMarkerBottomSheetHelper = new MoveMarkerBottomSheetHelper(activity, this);
|
||||
mAddWaypointBottomSheetHelper = new AddWaypointBottomSheetHelper(activity, this);
|
||||
mAddGpxPointBottomSheetHelper = new AddGpxPointBottomSheetHelper(activity, this);
|
||||
}
|
||||
|
||||
public AddGpxPointBottomSheetHelper getAddGpxPointBottomSheetHelper() {
|
||||
return mAddGpxPointBottomSheetHelper;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -207,10 +211,10 @@ public class ContextMenuLayer extends OsmandMapLayer {
|
|||
contextMarker.draw(canvas);
|
||||
}
|
||||
mMoveMarkerBottomSheetHelper.onDraw(box);
|
||||
} else if (mInAddGpxWaypointMode) {
|
||||
} else if (mInAddGpxPointMode) {
|
||||
canvas.translate(box.getPixWidth() / 2 - contextMarker.getWidth() / 2, box.getPixHeight() / 2 - contextMarker.getHeight());
|
||||
contextMarker.draw(canvas);
|
||||
mAddWaypointBottomSheetHelper.onDraw(box);
|
||||
mAddGpxPointBottomSheetHelper.onDraw(box);
|
||||
} else if (menu.isActive()) {
|
||||
LatLon latLon = menu.getLatLon();
|
||||
int x = (int) box.getPixXFromLatLon(latLon.getLatitude(), latLon.getLongitude());
|
||||
|
|
@ -289,7 +293,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
|
|||
}
|
||||
|
||||
public Object getMoveableObject() {
|
||||
return mInChangeMarkerPositionMode || mInAddGpxWaypointMode ? menu.getObject() : null;
|
||||
return mInChangeMarkerPositionMode ? menu.getObject() : null;
|
||||
}
|
||||
|
||||
public boolean isInChangeMarkerPositionMode() {
|
||||
|
|
@ -300,8 +304,8 @@ public class ContextMenuLayer extends OsmandMapLayer {
|
|||
return mInGpxDetailsMode;
|
||||
}
|
||||
|
||||
public boolean isInAddGpxWaypointMode() {
|
||||
return mInAddGpxWaypointMode;
|
||||
public boolean isInAddGpxPointMode() {
|
||||
return mInAddGpxPointMode;
|
||||
}
|
||||
|
||||
public boolean isObjectMoveable(Object o) {
|
||||
|
|
@ -318,14 +322,14 @@ public class ContextMenuLayer extends OsmandMapLayer {
|
|||
}
|
||||
|
||||
public void applyMovedObject(Object o, LatLon position, ApplyMovedObjectCallback callback) {
|
||||
if (selectedObjectContextMenuProvider != null) {
|
||||
if (selectedObjectContextMenuProvider != null && !isInAddGpxPointMode()) {
|
||||
if (selectedObjectContextMenuProvider instanceof IMoveObjectProvider) {
|
||||
final IMoveObjectProvider l = (IMoveObjectProvider) selectedObjectContextMenuProvider;
|
||||
if (l.isObjectMovable(o)) {
|
||||
l.applyNewObjectPosition(o, position, callback);
|
||||
}
|
||||
}
|
||||
} else if (mInChangeMarkerPositionMode || mInAddGpxWaypointMode) {
|
||||
} else if (mInChangeMarkerPositionMode || mInAddGpxPointMode) {
|
||||
callback.onApplyMovedObject(true, null);
|
||||
}
|
||||
}
|
||||
|
|
@ -351,11 +355,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
|
|||
mMoveMarkerBottomSheetHelper.hide();
|
||||
quitMovingMarker();
|
||||
|
||||
PointDescription pointDescription = null;
|
||||
if (selectedObjectContextMenuProvider != null) {
|
||||
pointDescription = selectedObjectContextMenuProvider.getObjectName(newObject);
|
||||
}
|
||||
menu.show(ll, pointDescription, newObject);
|
||||
|
||||
view.refreshMap();
|
||||
}
|
||||
selectedObjectContextMenuProvider = null;
|
||||
|
|
@ -369,9 +369,9 @@ public class ContextMenuLayer extends OsmandMapLayer {
|
|||
});
|
||||
}
|
||||
|
||||
public void createGpxWaypoint() {
|
||||
if (!mInAddGpxWaypointMode) {
|
||||
throw new IllegalStateException("Not in add gpx waypoint mode");
|
||||
public void createGpxPoint() {
|
||||
if (!mInAddGpxPointMode) {
|
||||
throw new IllegalStateException("Not in add gpx point mode");
|
||||
}
|
||||
|
||||
RotatedTileBox tileBox = activity.getMapView().getCurrentRotatedTileBox();
|
||||
|
|
@ -381,14 +381,14 @@ public class ContextMenuLayer extends OsmandMapLayer {
|
|||
|
||||
Object obj = getMoveableObject();
|
||||
cancelApplyingNewMarkerPosition = false;
|
||||
mAddWaypointBottomSheetHelper.enterApplyPositionMode();
|
||||
mAddGpxPointBottomSheetHelper.enterApplyPositionMode();
|
||||
applyMovedObject(obj, ll, new ApplyMovedObjectCallback() {
|
||||
@Override
|
||||
public void onApplyMovedObject(boolean success, @Nullable Object newObject) {
|
||||
mAddWaypointBottomSheetHelper.exitApplyPositionMode();
|
||||
mAddGpxPointBottomSheetHelper.exitApplyPositionMode();
|
||||
if (success && !cancelApplyingNewMarkerPosition) {
|
||||
mAddWaypointBottomSheetHelper.hide();
|
||||
quitAddGpxWaipoint();
|
||||
mAddGpxPointBottomSheetHelper.hide();
|
||||
quitAddGpxPoint();
|
||||
|
||||
PointDescription pointDescription = null;
|
||||
if (selectedObjectContextMenuProvider != null) {
|
||||
|
|
@ -449,8 +449,8 @@ public class ContextMenuLayer extends OsmandMapLayer {
|
|||
}
|
||||
}
|
||||
|
||||
private void quitAddGpxWaipoint() {
|
||||
mInAddGpxWaypointMode = false;
|
||||
private void quitAddGpxPoint() {
|
||||
mInAddGpxPointMode = false;
|
||||
mark(View.VISIBLE, R.id.map_ruler_layout,
|
||||
R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info);
|
||||
|
||||
|
|
@ -460,14 +460,14 @@ public class ContextMenuLayer extends OsmandMapLayer {
|
|||
}
|
||||
}
|
||||
|
||||
public void enterAddGpxWaypointMode(NewGpxWaypoint newGpxWaypoint) {
|
||||
public void enterAddGpxPointMode(NewGpxPoint newGpxPoint) {
|
||||
menu.updateMapCenter(null);
|
||||
menu.hide();
|
||||
|
||||
activity.disableDrawer();
|
||||
|
||||
mInAddGpxWaypointMode = true;
|
||||
mAddWaypointBottomSheetHelper.show(menu.getLeftIcon(), newGpxWaypoint);
|
||||
mInAddGpxPointMode = true;
|
||||
mAddGpxPointBottomSheetHelper.show(newGpxPoint);
|
||||
mark(View.INVISIBLE, R.id.map_ruler_layout,
|
||||
R.id.map_left_widgets_panel, R.id.map_right_widgets_panel, R.id.map_center_info);
|
||||
|
||||
|
|
@ -529,9 +529,9 @@ public class ContextMenuLayer extends OsmandMapLayer {
|
|||
applyingMarkerLatLon = null;
|
||||
}
|
||||
|
||||
public void cancelAddGpxWaypoint() {
|
||||
public void cancelAddGpxPoint() {
|
||||
cancelApplyingNewMarkerPosition = true;
|
||||
quitAddGpxWaipoint();
|
||||
quitAddGpxPoint();
|
||||
activity.getContextMenu().show();
|
||||
applyingMarkerLatLon = null;
|
||||
}
|
||||
|
|
@ -547,15 +547,21 @@ public class ContextMenuLayer extends OsmandMapLayer {
|
|||
@Nullable PointDescription pointDescription,
|
||||
@Nullable Object object,
|
||||
@Nullable IContextMenuProvider provider) {
|
||||
selectedObjectContextMenuProvider = provider;
|
||||
hideVisibleMenues();
|
||||
activity.getMapViewTrackingUtilities().setMapLinkedToLocation(false);
|
||||
if (!activity.getMapView().getCurrentRotatedTileBox().containsLatLon(latLon)) {
|
||||
menu.setMapCenter(latLon);
|
||||
menu.setMapPosition(activity.getMapView().getMapPosition());
|
||||
menu.setCenterMarker(true);
|
||||
if (mInAddGpxPointMode) {
|
||||
String title = pointDescription == null ? "" : pointDescription.getName();
|
||||
mAddGpxPointBottomSheetHelper.setTitle(title);
|
||||
view.getAnimatedDraggingThread().startMoving(latLon.getLatitude(), latLon.getLongitude(), view.getZoom(), true);
|
||||
} else {
|
||||
selectedObjectContextMenuProvider = provider;
|
||||
hideVisibleMenues();
|
||||
activity.getMapViewTrackingUtilities().setMapLinkedToLocation(false);
|
||||
if (!activity.getMapView().getCurrentRotatedTileBox().containsLatLon(latLon)) {
|
||||
menu.setMapCenter(latLon);
|
||||
menu.setMapPosition(activity.getMapView().getMapPosition());
|
||||
menu.setCenterMarker(true);
|
||||
}
|
||||
menu.show(latLon, pointDescription, object);
|
||||
}
|
||||
menu.show(latLon, pointDescription, object);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -641,10 +647,9 @@ public class ContextMenuLayer extends OsmandMapLayer {
|
|||
if (latLon == null) {
|
||||
latLon = getLatLon(point, tileBox);
|
||||
}
|
||||
if (mInAddGpxWaypointMode) {
|
||||
if (pointDescription != null) {
|
||||
mAddWaypointBottomSheetHelper.setTitle(pointDescription.getName());
|
||||
}
|
||||
if (mInAddGpxPointMode) {
|
||||
String title = pointDescription == null ? "" : pointDescription.getName();
|
||||
mAddGpxPointBottomSheetHelper.setTitle(title);
|
||||
view.getAnimatedDraggingThread().startMoving(latLon.getLatitude(), latLon.getLongitude(), view.getZoom(), true);
|
||||
} else {
|
||||
showContextMenu(latLon, pointDescription, selectedObj, provider);
|
||||
|
|
@ -661,7 +666,12 @@ public class ContextMenuLayer extends OsmandMapLayer {
|
|||
selectedObjectContextMenuProvider = null;
|
||||
LatLon latLon = getLatLon(point, tileBox);
|
||||
activity.getMapViewTrackingUtilities().setMapLinkedToLocation(false);
|
||||
menu.show(latLon, null, null);
|
||||
if (mInAddGpxPointMode) {
|
||||
mAddGpxPointBottomSheetHelper.setTitle("");
|
||||
view.getAnimatedDraggingThread().startMoving(latLon.getLatitude(), latLon.getLongitude(), view.getZoom(), true);
|
||||
} else {
|
||||
menu.show(latLon, null, null);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
@ -690,7 +700,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
|
|||
}
|
||||
|
||||
public boolean disableLongPressOnMap() {
|
||||
if (mInChangeMarkerPositionMode || mInGpxDetailsMode || mInAddGpxWaypointMode) {
|
||||
if (mInChangeMarkerPositionMode || mInGpxDetailsMode || mInAddGpxPointMode) {
|
||||
return true;
|
||||
}
|
||||
boolean res = false;
|
||||
|
|
|
|||
|
|
@ -1120,8 +1120,8 @@ public class MapControlsLayer extends OsmandMapLayer {
|
|||
}
|
||||
|
||||
private boolean isInMovingMarkerMode(){
|
||||
return mapQuickActionLayer == null ? contextMenuLayer.isInChangeMarkerPositionMode() || contextMenuLayer.isInAddGpxWaypointMode():
|
||||
mapQuickActionLayer.isInMovingMarkerMode() || contextMenuLayer.isInChangeMarkerPositionMode() || contextMenuLayer.isInAddGpxWaypointMode();
|
||||
return mapQuickActionLayer == null ? contextMenuLayer.isInChangeMarkerPositionMode() || contextMenuLayer.isInAddGpxPointMode():
|
||||
mapQuickActionLayer.isInMovingMarkerMode() || contextMenuLayer.isInChangeMarkerPositionMode() || contextMenuLayer.isInAddGpxPointMode();
|
||||
}
|
||||
|
||||
private boolean isInGpxDetailsMode() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue