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

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

Browse source
This commit is contained in:
Victor Shcherb 2015-01-05 01:48:53 +01:00
commit 5934bf0869
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -276,7 +276,7 @@
<string name="search_position_undefined">Неопределенно</string> <string name="search_position_undefined">Неопределенно</string>
<string name="search_position_fixed">Точка</string> <string name="search_position_fixed">Точка</string>
<string name="search_position_current_location">Текущее местоположение…</string> <string name="search_position_current_location">Текущее местоположение…</string>
<string name="search_position_map_view">Вид карты</string> <string name="search_position_map_view">Текущий центр карты</string>
<string name="select_search_position">Начало:</string> <string name="select_search_position">Начало:</string>
<string name="context_menu_item_search">Искать рядом</string> <string name="context_menu_item_search">Искать рядом</string>
<string name="tip_recent_changes_0_6_7_t">Изменения в 0.6.7: <string name="tip_recent_changes_0_6_7_t">Изменения в 0.6.7:
@ -624,7 +624,7 @@
<string name="first_time_continue">Продолжить</string> <string name="first_time_continue">Продолжить</string>
<string name="first_time_download">Загрузить детальные карты регионов</string> <string name="first_time_download">Загрузить детальные карты регионов</string>
<string name="search_poi_location">Поиск сигнала…</string> <string name="search_poi_location">Поиск сигнала…</string>
<string name="search_near_map">Искать вокруг выбранного центра карты</string> <string name="search_near_map">Искать вокруг текущего центра карты</string>
<string name="search_nearby">Искать рядом</string> <string name="search_nearby">Искать рядом</string>
<string name="map_orientation_default">По умолчанию</string> <string name="map_orientation_default">По умолчанию</string>
<string name="map_orientation_portrait">Портрет</string> <string name="map_orientation_portrait">Портрет</string>
@ -1247,7 +1247,7 @@
<string name="av_def_action_choose">Выберите по запросу</string> <string name="av_def_action_choose">Выберите по запросу</string>
<string name="osmand_play_title_30_chars">OsmAnd карты и навигация</string> <string name="osmand_play_title_30_chars">OsmAnd карты и навигация</string>
<string name="osmand_plus_play_title_30_chars">OsmAnd+ карты и навигация</string> <string name="osmand_plus_play_title_30_chars">OsmAnd+ карты и навигация</string>
<string name="use_kalman_filter_compass_descr">Использовать фильтр Калмана для избежания отклонений компаса</string> <string name="use_kalman_filter_compass_descr">Уменьшает \"шум\" компаса, но добавляет инерцию</string>
<string name="use_kalman_filter_compass">Использовать фильтр Калмана</string> <string name="use_kalman_filter_compass">Использовать фильтр Калмана</string>
<string name="cancel_navigation">Прекратить навигацию</string> <string name="cancel_navigation">Прекратить навигацию</string>
<string name="use_magnetic_sensor">Использовать датчик магнитного поля</string> <string name="use_magnetic_sensor">Использовать датчик магнитного поля</string>

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

@ -75,13 +75,11 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
if(selectFromMapTouch) { if(selectFromMapTouch) {
LatLon latlon = tileBox.getLatLonFromPixel(point.x, point.y); LatLon latlon = tileBox.getLatLonFromPixel(point.x, point.y);
selectFromMapTouch = false; selectFromMapTouch = false;
//TODO: Hardy: Looks like there is an old bug somewhere here: Re-selecting the From or To via "Select on map" during a route calculation does interrupt the ongoing route calculation, while reselecting From or To via "Fvorites" correctly re-starts any ongoing route recalculation with the updated point //TODO: Hardy: Looks like there is a small bug here somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to (sometimes?) only interrupt the ongoing route calculation, but not restart it again with the new points
if(selectFromMapForTarget) { if(selectFromMapForTarget) {
getTargets().navigateToPoint(latlon, true, -1); getTargets().navigateToPoint(latlon, true, -1);
getTargets().navigateToPoint(latlon, true, -1);
} else { } else {
getTargets().setStartPoint(latlon, true, null); getTargets().setStartPoint(latlon, true, null);
getTargets().setStartPoint(latlon, true, null);
} }
contextMenu.setLocation(latlon, null); contextMenu.setLocation(latlon, null);
showDialog(); showDialog();