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

Resolve conflicts

Browse source
This commit is contained in:
PavelRatushny 2017-09-15 13:35:45 +03:00
commit 877ee34fbe
11 changed files with 229 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -132,7 +132,7 @@
<string name="poi_parking_entrance">Indgang til parkering</string>
<string name="poi_garages">Garage</string>
<string name="poi_public_transport_platform">Stoppested</string>
<string name="poi_public_transport_platform">Offentligt stoppested</string>
<string name="poi_public_transport_platform_bus">Busstoppested</string>
<string name="poi_public_transport_platform_trolleybus">Trolleybus stoppested</string>
<string name="poi_bus_stop">Busstoppested</string>
@ -1830,7 +1830,7 @@
<string name="poi_shelter_type_wildlife_hide">Vildtskjul</string>
<string name="poi_shelter_type_rock_shelter">Klippehule</string>
<string name="poi_shelter_type_sun_shelter">Solafskærming</string>
<string name="poi_shelter_type_field_shelter">Dyreshelter</string>
<string name="poi_shelter_type_field_shelter">Friluftsshelter</string>
<string name="poi_shelter_type_tent">Sheltertype: telt</string>
<string name="poi_shelter_type_abandoned">Sheltertype: forladt</string>
@ -1908,7 +1908,7 @@
<string name="poi_bridge_structure_aqueduct">Brokonstruktion: akvædukt</string>
<string name="poi_bridge_structure_log">Brokonstruktion: træstamme</string>
<string name="poi_bridge_type_movable">Brotype: bevægelig</string>
<string name="poi_bridge_movable_bascule">Bevægeligbro: klapbro</string>
<string name="poi_bridge_movable_bascule">Bevægelig bro: klapbro</string>
<string name="poi_bridge_movable_swing">Bevægeligbro: drejebro</string>
<string name="poi_bridge_movable_lift">Bevægeligbro: løftebro</string>
<string name="poi_bridge_movable_drawbridge">Bevægeligbro: vindebro</string>
@ -2326,7 +2326,7 @@
<string name="poi_historic_period_dominate">Historiskperiode: Dominatet (285 e.Kr. – 476 e.Kr)</string>
<string name="poi_historic_period_villager">Historiskperiode: landsbyboere (epoke I, II, 1580 f.Kr. - 133 e.Kr.)</string>
<string name="poi_historic_period_urban">Historiskperiode: bymæssig (epoke III, 133 e.Kr. - 374 e.Kr.)</string>
<string name="poi_historic_period_classical">Historiskperiode: klassisk (epoke IV, 374 e.Kr. - 900 e.Kr.)</string>
<string name="poi_historic_period_classical">Historisk periode: klassisk (epoke IV, 374 e.Kr. - 900 e.Kr.)</string>
<string name="poi_historic_period_imperial">Historiskperiode: imperial (epoke V, 900 e.Kr. - 1200 e.Kr.)</string>
<string name="poi_tourism_yes">Turistmæssigt objekt</string>
@ -3570,10 +3570,10 @@
<string name="poi_government_archive">Arkiv</string>
<string name="poi_government_ministry">Ministerie</string>
<string name="poi_government_public_service">Offentlig service</string>
<string name="poi_government_social_security">Social sikring</string>
<string name="poi_government_social_security">Socialkontor</string>
<string name="poi_government_social_services">Sociale ydelser</string>
<string name="poi_government_treasury">Finansministeriet</string>
<string name="poi_government_transportation">Transportministeriet</string>
<string name="poi_government_transportation">Transport/motorregister</string>
<string name="poi_government_legislative">Lovgivende institution</string>
</resources>

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

@ -3533,12 +3533,12 @@
<string name="poi_network">Red</string>
<string name="poi_government_archive">Archivo</string>
<string name="poi_government_archive">Archivos gubernamentales</string>
<string name="poi_government_ministry">Ministerio</string>
<string name="poi_government_public_service">Servicio público</string>
<string name="poi_government_social_security">Seguridad social</string>
<string name="poi_government_social_services">Servicios sociales</string>
<string name="poi_government_treasury">Tesorería</string>
<string name="poi_government_treasury">Hacienda pública</string>
<string name="poi_government_transportation">Institución de transporte</string>
<string name="poi_government_legislative">Institución legislativa</string>

76
OsmAnd/res/values-he/phrases.xml
View file

@ -233,4 +233,78 @@
<string name="poi_government_transportation">מוסד תעבורתי</string>
<string name="poi_government_legislative">מוסד חוקתי</string>
</resources>
<string name="poi_gambling_bingo">בינגו</string>
<string name="poi_e_cigarette">חנות סיגריות אלקטרוניות</string>
<string name="poi_photo_studio">סטודיו לצילום</string>
<string name="poi_cliff">צוק</string>
<string name="poi_resort_kids_camp">מחנה ילדים</string>
<string name="poi_music_school">בית ספר למוזיקה</string>
<string name="poi_language_school">בית ספר לשפות</string>
<string name="poi_life_ring">גלגל הצלה</string>
<string name="poi_zoo_petting_zoo">גן חיות</string>
<string name="poi_zoo_wildlife_park">פארק חיות בר</string>
<string name="poi_zoo_enclosure">בכלובים</string>
<string name="poi_zoo_safari_park">פארק ספארי</string>
<string name="poi_zoo_birds">ציפורים</string>
<string name="poi_zoo_aviary">כלוב בעלי כנף</string>
<string name="poi_zoo_falconry">בזיירות</string>
<string name="poi_zoo_reptile">זוחלים</string>
<string name="poi_motorcycle_sales_yes">מכירות</string>
<string name="poi_motorcycle_sales_no">מכירות: אין</string>
<string name="poi_motorcycle_sales_yes_used">מכירות: יש, בשימוש</string>
<string name="poi_motorcycle_sales_used">מכירות: בשימוש</string>
<string name="poi_motorcycle_rental_yes">השכרה</string>
<string name="poi_motorcycle_rental_no">השכרה: אין</string>
<string name="poi_motorcycle_repair_yes">תיקון</string>
<string name="poi_motorcycle_repair_no">תיקון: אין</string>
<string name="poi_motorcycle_parts_yes">חלפים</string>
<string name="poi_motorcycle_parts_no">חלפים: אין</string>
<string name="poi_motorcycle_tyres_yes">צמיגים</string>
<string name="poi_motorcycle_tyres_no">צמיגים: אין</string>
<string name="poi_motorcycle_clothes_yes">בגדי אופנוענים</string>
<string name="poi_motorcycle_clothes_no">בגדי אופנוענים: אין</string>
<string name="poi_motorcycle_type_scooter">קטנוע</string>
<string name="poi_motorcycle_type_sportbike">אופנוע ספורט</string>
<string name="poi_motorcycle_type_chopper">צ׳ופר</string>
<string name="poi_motorcycle_type_offroad">אופנוע שטח</string>
<string name="poi_motorcycle_type_dualsport">דו״ש</string>
<string name="poi_motorcycle_type_standard">רגיל</string>
<string name="poi_generator_output_electricity_no">פלט (חשמל): אין</string>
<string name="poi_owner">בעלות</string>
<string name="poi_animal_shelter_purpose_adoption_yes">אימוץ: יש</string>
<string name="poi_animal_shelter_purpose_adoption_no">אימוץ: אין</string>
<string name="poi_animal_shelter_purpose_release_yes">שחרור לטבע: כן</string>
<string name="poi_animal_shelter_purpose_release_no">שחרור לטבע: לא</string>
<string name="poi_spaceport">נמל חלל</string>
<string name="poi_direction_ssw">כיוון: דרום - דרום מערב</string>
<string name="poi_direction_sw">כיוון: דרום מערב</string>
<string name="poi_direction_wsw">כיוון: מערב - דרום מערב</string>
<string name="poi_direction_w">כיוון: מערב</string>
<string name="poi_direction_wnw">כיוון: מערב - צפון מערב</string>
<string name="poi_direction_nw">כיוון: צפון מערב</string>
<string name="poi_direction_nnw">כיוון: צפון - צפון מערב</string>
<string name="poi_direction_forward">כיוון: קדימה</string>
<string name="poi_direction_backward">כיוון: אחורה</string>
<string name="poi_direction_clockwise">כיוון: עם כיוון השעון</string>
<string name="poi_direction_anticlockwise">כיוון: נגד כיוון השעון</string>
<string name="poi_direction_up">כיוון: למעלה</string>
<string name="poi_direction_down">כיוון: למטה</string>
<string name="poi_direction_entrance">כיוון: כניסה</string>
<string name="poi_direction_exit">כיוון: יציאה</string>
<string name="poi_direction_all">כיוון: הכול</string>
<string name="poi_winter_room_yes">חדר חורף: יש</string>
<string name="poi_winter_room_no">חדר חורף: אין</string>
</resources>

11
OsmAnd/res/values-hu/phrases.xml
View file

@ -2347,7 +2347,7 @@
<string name="poi_social_facility_for_diseased">Betegek</string>
<string name="poi_social_facility_for_child_juvenile">Gyermekek; fiatalok</string>
<string name="poi_kiln">Kemence</string>
<string name="poi_kiln">Égetőkemence</string>
<string name="poi_product_brick">Termék: tégla</string>
<string name="poi_product_leather">Termék: bőr</string>
<string name="poi_product_beer">Termék: sör</string>
@ -3482,4 +3482,13 @@
<string name="poi_boat_canoe_rental_rental_yes">Kenu</string>
<string name="poi_boat_canoe_rental_rental_no">Kenu nincs</string>
<string name="poi_government_archive">Levéltár</string>
<string name="poi_government_ministry">Minisztérium</string>
<string name="poi_government_public_service">Közszolgáltatás</string>
<string name="poi_government_social_security">Társadalombiztosítás</string>
<string name="poi_government_social_services">Szociális szolgáltatások</string>
<string name="poi_government_treasury">Államkincstár, állmi pénzügyi szerv</string>
<string name="poi_government_transportation">Közlekedési intézmény</string>
<string name="poi_government_legislative">Jogalkotási intézmény</string>
</resources>

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

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="vector_maps_may_display_faster_on_some_devices">벡터 맵이 더욱 빠르게 표시됩니다. 하지만, 어떤 기기에서는 잘 작동하지 않을 수 있습니다.</string>
<?xml version='1.0' encoding='UTF-8'?>
<resources><string name="vector_maps_may_display_faster_on_some_devices">벡터 맵이 더욱 빠르게 표시됩니다. 하지만, 어떤 기기에서는 잘 작동하지 않을 수 있습니다.</string>
<string name="play_commands_of_currently_selected_voice">현재 선택된 음성 명령을 재생합니다</string>
<string name="debugging_and_development">OsmAnd 개발</string>
@ -1383,7 +1384,7 @@
<string name="osmo_settings_uuid">고유 장치 id</string>
<string name="osmo_settings_descr">모니터링 설정을 구성하고 개인 모니터링 채널을 설정</string>
<string name="osmo_plugin_description">"OsMosms 실시간 모니터링을 사용하도록 설정을 보여줍니다. http://osmo.mobi를 참조하세요. 다른 장치를 추적하고 추적 받을 수 있습니다. 익명 그룹을 만들고, 서로의 위치를 공유하고, 통신 할 수 있습니다. 세션 트래킹 또는 영구 트래킹을 위한 다양한 설정을 합니다. ↵\n↵\n원격 제어 및 그룹 관리자가 없는 일부 기능 때문에 익명 그룹을 제한합니다. 완전한 기능의 그룹은 웹 사이트에 생성되고 등록된 사용자만 OsMo에 액세스 할 수 있어야 합니다. "</string>
<string name="osmo_plugin_name">OsMo 모니터링</string>
<string name="osmo_plugin_name">OpenStreetMap 모니터링</string>
<string name="osmo_settings">오스모(OsMo)</string>
<string name="share_route_as_gpx">루트를 GPX 파일로 공유</string>
<string name="share_route_subject">OsmAnd를 통해 공유된 경로</string>
@ -1407,11 +1408,11 @@
<string name="osmo_connected_devices">연결된 장치</string>
<string name="osmo_groups">OsMo 그룹/장치</string>
<string name="osmo_auto_send_locations_descr">자동으로 트래커 세션을 시작하고 앱 시작 후 위치를 전송</string>
<string name="osmo_auto_send_locations">자동으로 트래커 세션을 시작</string>
<string name="osmo_tracker_id">개인 트래커 ID</string>
<string name="osmo_tracker_id_descr">트래커 ID를 보거나 공유하려면 클릭하십시오. 트래커 ID 연결된 장치를 사용하면 이 장치의 모든 움직임을 모니터 할 수 있습니다! 선택 재생성 옵션을 분리합니다.</string>
<string name="osmo_groups">OsMo 그룹</string>
<string name="osmo_auto_send_locations_descr">자동으로 여정을 시작하고 앱 시작 후 위치를 전송</string>
<string name="osmo_auto_send_locations">자동으로 여정을 시작</string>
<string name="osmo_tracker_id">트래커 ID</string>
<string name="osmo_tracker_id_descr">트래커 ID를 보려면 누르십시오</string>
<string name="osmo_session_token">세션 토큰 : %1$s</string>
<string name="osmo_auth_pending">허가를 기다리는 중…</string>
<string name="osmo_locations_sent">위치 전송 %1$d (in buffer %2$d) </string>
@ -1439,7 +1440,7 @@
<string name="osmo_connect_to_group_id">그룹 ID</string>
<string name="osmo_group_name">그룹 이름</string>
<string name="osmo_connect_to_group">그룹 링크</string>
<string name="osmo_connect">~에 연결</string>
<string name="osmo_connect">가입하기</string>
<string name="osmo_create_group">그룹 만들기</string>
<string name="osmo_server_operation_failed">OsMo 서버 작업 실패</string>
<string name="osmo_activity">OpenStreetMap 모니터링</string>
@ -1469,7 +1470,7 @@
<string name="osmo_center_location">맵뷰어 중심</string>
<string name="osmo_set_moving_target">이동 목적지로 설정</string>
<string name="osmo_use_server_name">등록된 이름</string>
<string name="osmo_connect_to_my_nickname">내 별명</string>
<string name="osmo_connect_to_my_nickname">닉네임</string>
<string name="osmo_user_name">사용자</string>
@ -1581,7 +1582,7 @@
<string name="rendering_attr_coloredBuildings_name">유형별 색상 코드 건물</string>
<string name="osmo_invite">초대…</string>
<string name="osmo_leave_confirmation_msg">그룹 %1$s를 떠나시겠습니까?</string>
<string name="osmo_specify_tracker_id">Id를 지정 하십시오</string>
<string name="osmo_specify_tracker_id">ID를 지정하십시오</string>
<string name="arrival_distance_factor_early">일찍</string>
<string name="arrival_distance_factor_normally">일반</string>
<string name="arrival_distance_factor_late">늦게</string>
@ -1634,8 +1635,14 @@
<string name="speed_limit_exceed">속도 제한 초과 값</string>
<string name="speed_limit_exceed_message">음성 안내 경고를 받아야 할 속도 제한 초과 값을 선택합니다.</string>
<string name="osmo_device_not_found">장치를 찾을 수 없습니다</string>
<string name="osmo_no_connection_msg">OsMo 서비스는 사용할 수 없습니다:\n- 연결 확인;\n- 설정 확인;\n- 체크 아웃 트위터: https://twitter.com/OsMomobi</string>
<string name="anonymous_user_hint">익명의 사용자는 아래 사항을 수행할 수 없습니다:\n- 그룹 생성;\n- 그룹 및 장치를 서버와 동기화;\n- 그룹 및 장치를 관리 (개인 사무실에서).</string>
<string name="osmo_no_connection_msg">OsMo 서비스를 사용할 수 없습니다:
\n- 연결 확인;
\n- 설정 확인;
\n- 트위터를 확인하세요: https://twitter.com/OsMomobi</string>
<string name="anonymous_user_hint">익명의 사용자는 아래 사항을 수행할 수 없습니다:
\n- 그룹 생성;
\n- 그룹 및 장치를 서버와 동기화;
\n- 그룹 및 장치를 관리 (개인 대시보드에서).</string>
<string name="anonymous_user">익명의 사용자</string>
<string name="logged_as">%1$s 사용자로 로그인 됨</string>
<string name="rendering_category_details">세부 정보</string>
@ -1899,7 +1906,7 @@
<string name="rendering_value_disabled_name">사용 안 함</string>
<string name="rendering_value_walkingRoutesScopeOSMC_name">루트 범위에 따라 색상변경</string>
<string name="rendering_value_walkingRoutesOSMC_name">OSMC에 따라 색상변경</string>
<string name="osmo_share_my_location">내 위치를 공유</string>
<string name="osmo_share_my_location">위치 전송</string>
<string name="shared_string_logoff">로그 오프</string>
<string name="routing_attr_avoid_borders_description">타국의 국경 횡단 방지</string>
@ -2112,4 +2119,4 @@
<string name="rendering_value_bold_name"/>
<string name="no_map_markers_found"/>
<string name="no_waypoints_found"/>
</resources>
</resources>

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

@ -9,6 +9,8 @@
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="map_orientation_change_in_accordance_with_speed">Map orientation change in accordance with speed</string>
<string name="map_orientation_change_in_accordance_with_speed_descr">Use built in compass instead of direction of movement to determine map orientation at low speed</string>
<string name="date_added">Date added</string>
<string name="order_by">Order by:</string>
<string name="all_markers_moved_to_history">All markers moved to History</string>

133
OsmAnd/res/xml/navigation_settings.xml
View file

@ -1,55 +1,92 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<ListPreference android:title="@string/router_service" android:key="router_service" android:summary="@string/router_service_descr" />
<ListPreference
android:key="router_service"
android:summary="@string/router_service_descr"
android:title="@string/router_service"/>
<PreferenceCategory android:key="routing_preferences" android:title="@string/routing_preferences_descr">
<CheckBoxPreference android:summary="@string/fast_route_mode_descr" android:title="@string/fast_route_mode"
android:key="fast_route_mode" />
<Preference android:title="@string/avoid_in_routing_title" android:summary="@string/avoid_in_routing_descr" android:key="avoid_in_routing"/>
<Preference android:title="@string/prefer_in_routing_title" android:summary="@string/prefer_in_routing_descr" android:key="prefer_in_routing"/>
</PreferenceCategory>
<PreferenceCategory
android:key="routing_preferences"
android:title="@string/routing_preferences_descr">
<CheckBoxPreference
android:key="fast_route_mode"
android:summary="@string/fast_route_mode_descr"
android:title="@string/fast_route_mode"/>
<Preference
android:key="avoid_in_routing"
android:summary="@string/avoid_in_routing_descr"
android:title="@string/avoid_in_routing_title"/>
<Preference
android:key="prefer_in_routing"
android:summary="@string/prefer_in_routing_descr"
android:title="@string/prefer_in_routing_title"/>
</PreferenceCategory>
<PreferenceCategory android:key="guidance_preferences" android:title="@string/guidance_preferences_descr">
<ListPreference android:key="auto_follow_route" android:title="@string/choose_auto_follow_route"
android:summary="@string/choose_auto_follow_route_descr" />
<Preference android:key="auto_zoom_map_on_off" android:title="@string/auto_zoom_map"
android:summary="@string/auto_zoom_map_descr" />
<CheckBoxPreference android:title="@string/snap_to_road" android:summary="@string/snap_to_road_descr" android:key="snap_to_road" />
<Preference android:title="@string/show_warnings_title" android:summary="@string/show_warnings_descr" android:key="show_routing_alarms"/>
<Preference android:title="@string/speak_title" android:summary="@string/speak_descr" android:key="speak_routing_alarms"/>
<ListPreference
android:key="keep_informing"
android:title="@string/keep_informing"
android:summary="@string/keep_informing_descr" />
<ListPreference
android:key="arrival_distance_factor"
android:title="@string/arrival_distance"
android:summary="@string/arrival_distance_descr" />
<ListPreference
android:key="default_speed_system"
android:title="@string/default_speed_system"
android:summary="@string/default_speed_system_descr" />
<ListPreference
android:key="speed_limit_exceed"
android:title="@string/speed_limit_exceed"
android:summary="@string/speed_limit_exceed_message"/>
<!--
<CheckBoxPreference android:title="@string/show_zoom_buttons_navigation" android:summary="@string/show_zoom_buttons_navigation_descr" android:key="show_zoom_buttons_navigation" />
-->
<ListPreference
android:key="wake_on_voice_int"
android:title="@string/wake_on_voice"
android:summary="@string/wake_on_voice_descr" />
<!--
<ListPreference
android:key="delay_to_start_navigation"
android:title="@string/delay_to_start_navigation"
android:summary="@string/delay_to_start_navigation_descr" />
-->
</PreferenceCategory>
<PreferenceCategory
android:key="guidance_preferences"
android:title="@string/guidance_preferences_descr">
<ListPreference
android:key="auto_follow_route"
android:summary="@string/choose_auto_follow_route_descr"
android:title="@string/choose_auto_follow_route"/>
<Preference
android:key="auto_zoom_map_on_off"
android:summary="@string/auto_zoom_map_descr"
android:title="@string/auto_zoom_map"/>
<CheckBoxPreference
android:key="snap_to_road"
android:summary="@string/snap_to_road_descr"
android:title="@string/snap_to_road"/>
<Preference
android:key="show_routing_alarms"
android:summary="@string/show_warnings_descr"
android:title="@string/show_warnings_title"/>
<Preference
android:key="speak_routing_alarms"
android:summary="@string/speak_descr"
android:title="@string/speak_title"/>
<ListPreference
android:key="keep_informing"
android:summary="@string/keep_informing_descr"
android:title="@string/keep_informing"/>
<ListPreference
android:key="arrival_distance_factor"
android:summary="@string/arrival_distance_descr"
android:title="@string/arrival_distance"/>
<ListPreference
android:key="default_speed_system"
android:summary="@string/default_speed_system_descr"
android:title="@string/default_speed_system"/>
<ListPreference
android:key="speed_limit_exceed"
android:summary="@string/speed_limit_exceed_message"
android:title="@string/speed_limit_exceed"/>
<ListPreference
android:key="speed_for_map_to_direction_of_movement"
android:summary="@string/map_orientation_change_in_accordance_with_speed_descr"
android:title="@string/map_orientation_change_in_accordance_with_speed"/>
<!--
<CheckBoxPreference android:title="@string/show_zoom_buttons_navigation" android:summary="@string/show_zoom_buttons_navigation_descr" android:key="show_zoom_buttons_navigation" />
-->
<ListPreference
android:key="wake_on_voice_int"
android:summary="@string/wake_on_voice_descr"
android:title="@string/wake_on_voice"/>
<!--
<ListPreference
android:key="delay_to_start_navigation"
android:title="@string/delay_to_start_navigation"
android:summary="@string/delay_to_start_navigation_descr" />
-->
</PreferenceCategory>
<PreferenceCategory android:title="@string/voice_pref_title" android:key="voice">
<ListPreference android:title="@string/voice_provider" android:key="voice_provider" android:summary="@string/voice_provider_descr"></ListPreference>
</PreferenceCategory>
<PreferenceCategory
android:key="voice"
android:title="@string/voice_pref_title">
<ListPreference
android:key="voice_provider"
android:summary="@string/voice_provider_descr"
android:title="@string/voice_provider"/>
</PreferenceCategory>
</PreferenceScreen>

3
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -855,6 +855,9 @@ public class OsmandSettings {
public final OsmandPreference<Float> SPEED_LIMIT_EXCEED =
new FloatPreference("speed_limit_exceed", 5f).makeProfile();
public final OsmandPreference<Float> SWITCH_MAP_DIRECTION_TO_COMPASS =
new FloatPreference("speed_for_map_to_direction_of_movement", 0f).makeProfile();
// this value string is synchronized with settings_pref.xml preference name
public final OsmandPreference<Boolean> USE_TRACKBALL_FOR_MOVEMENTS =
new BooleanPreference("use_trackball_for_movements", true).makeGlobal();

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

@ -202,12 +202,14 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
speedNames[i] = speedLimitsKm[i] + " " + getString(R.string.km_h);
}
registerListPreference(settings.SPEED_LIMIT_EXCEED, screen, speedNames, speedLimitsKm);
registerListPreference(settings.SWITCH_MAP_DIRECTION_TO_COMPASS, screen, speedNames, speedLimitsKm);
} else {
String[] speedNames = new String[speedLimitsKm.length];
for (int i =0; i<speedNames.length;i++){
speedNames[i] = speedLimitsMiles[i] + " " + getString(R.string.mile_per_hour);
}
registerListPreference(settings.SPEED_LIMIT_EXCEED, screen, speedNames, speedLimitsKm);
registerListPreference(settings.SWITCH_MAP_DIRECTION_TO_COMPASS, screen, speedNames, speedLimitsKm);
}
PreferenceCategory category = (PreferenceCategory) screen.findPreference("guidance_preferences");

25
OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
View file

@ -123,7 +123,9 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
public void updateCompassValue(float val) {
heading = val;
if (mapView != null) {
if (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_COMPASS && !routePlanningMode) {
float speedForDirectionOfMovement = settings.SWITCH_MAP_DIRECTION_TO_COMPASS.get();
boolean smallSpeedForDirectionOfMovement = speedForDirectionOfMovement != 0 && getMyLocation() != null && isSmallSpeedForDirectionOfMovement(getMyLocation(), speedForDirectionOfMovement);
if ((settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_COMPASS || (settings.ROTATE_MAP.get() == OsmandSettings.ROTATE_MAP_BEARING && smallSpeedForDirectionOfMovement)) && !routePlanningMode) {
if (Math.abs(MapUtils.degreesDiff(mapView.getRotate(), -val)) > 1) {
mapView.setRotate(-val);
}
@ -201,13 +203,17 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
zoom = autozoom(location);
}
int currentMapRotation = settings.ROTATE_MAP.get();
float speedForDirectionOfMovement = settings.SWITCH_MAP_DIRECTION_TO_COMPASS.get();
boolean smallSpeedForDirectionOfMovement = speedForDirectionOfMovement != 0 && isSmallSpeedForDirectionOfMovement(location, speedForDirectionOfMovement);
boolean smallSpeedForCompass = isSmallSpeedForCompass(location);
boolean smallSpeedForAnimation = isSmallSpeedForAnimation(location);
// boolean virtualBearing = fMode && settings.SNAP_TO_ROAD.get();
showViewAngle = (!location.hasBearing() || smallSpeedForCompass) && (tb != null &&
tb.containsLatLon(location.getLatitude(), location.getLongitude()));
if (currentMapRotation == OsmandSettings.ROTATE_MAP_BEARING) {
if (location.hasBearing() && !smallSpeedForCompass) {
if (smallSpeedForDirectionOfMovement) {
showViewAngle = routePlanningMode;
} else if (location.hasBearing() && !smallSpeedForCompass) {
// special case when bearing equals to zero (we don't change anything)
if (location.getBearing() != 0f) {
rotation = -location.getBearing();
@ -216,7 +222,7 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
} else if(currentMapRotation == OsmandSettings.ROTATE_MAP_COMPASS) {
showViewAngle = routePlanningMode; // disable compass rotation in that mode
}
registerUnregisterSensor(location);
registerUnregisterSensor(location, smallSpeedForDirectionOfMovement);
if (settings.ANIMATE_MY_LOCATION.get() && !smallSpeedForAnimation && !movingToMyLocation &&
settings.WAKE_ON_VOICE_INT.get() == 0) {
mapView.getAnimatedDraggingThread().startMoving(
@ -233,7 +239,7 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
} else if(location != null) {
showViewAngle = (!location.hasBearing() || isSmallSpeedForCompass(location)) && (tb != null &&
tb.containsLatLon(location.getLatitude(), location.getLongitude()));
registerUnregisterSensor(location);
registerUnregisterSensor(location, false);
}
RoutingHelper routingHelper = app.getRoutingHelper();
followingMode = routingHelper.isFollowingMode();
@ -252,6 +258,10 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
}
}
public static boolean isSmallSpeedForDirectionOfMovement(Location location, float speedToDirectionOfMovement) {
return !location.hasSpeed() || location.getSpeed() < speedToDirectionOfMovement;
}
public static boolean isSmallSpeedForCompass(Location location) {
return !location.hasSpeed() || location.getSpeed() < 0.5;
}
@ -285,14 +295,15 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
&& !settings.CENTER_POSITION_ON_MAP.get() ?
OsmandSettings.BOTTOM_CONSTANT : OsmandSettings.CENTER_CONSTANT);
}
registerUnregisterSensor(app.getLocationProvider().getLastKnownLocation());
registerUnregisterSensor(app.getLocationProvider().getLastKnownLocation(), false);
}
private void registerUnregisterSensor(net.osmand.Location location) {
private void registerUnregisterSensor(net.osmand.Location location, boolean smallSpeedForDirectionOfMovement) {
int currentMapRotation = settings.ROTATE_MAP.get();
boolean registerCompassListener = ((showViewAngle || contextMenu != null) && location != null)
|| (currentMapRotation == OsmandSettings.ROTATE_MAP_COMPASS && !routePlanningMode);
|| (currentMapRotation == OsmandSettings.ROTATE_MAP_COMPASS && !routePlanningMode)
|| (currentMapRotation == OsmandSettings.ROTATE_MAP_BEARING && smallSpeedForDirectionOfMovement);
// show point view only if gps enabled
if(sensorRegistered != registerCompassListener) {
app.getLocationProvider().registerOrUnregisterCompassListener(registerCompassListener);

7
OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDbHelper.java
View file

@ -21,7 +21,7 @@ import java.util.Random;
public class MapMarkersDbHelper {
private static final int DB_VERSION = 2;
private static final int DB_VERSION = 7;
public static final String DB_NAME = "map_markers_db";
private static final String MARKERS_TABLE_NAME = "map_markers";
@ -117,7 +117,10 @@ public class MapMarkersDbHelper {
}
private void onUpgrade(SQLiteConnection db, int oldVersion, int newVersion) {
// When the DB_VERSION will increase from 7, DROP TABLE must be removed. Existing markers should not be deleted.
db.execSQL("DROP TABLE IF EXISTS " + MARKERS_TABLE_NAME);
db.execSQL("DROP TABLE IF EXISTS " + GROUPS_TABLE_NAME);
onCreate(db);
}
private void saveExistingMarkersToDb() {