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

Clean up

Browse source
This commit is contained in:
Victor Shcherb 2020-02-17 18:22:30 +01:00
parent c419845b0c
commit 49f901998d
3 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,6 @@
Thx - Hardy
-->
<string name="shared_string_routing_default_w_val">%s (Routing Default)</string>
<string name="shared_string_app_default_w_val">App Default (%s)</string>
<string name="please_provide_profile_name_message">Please provide a name for the profile</string>
<string name="no_recalculation_setting">Disable recalculation</string>

9
OsmAnd/src/net/osmand/access/AccessibilitySettingsFragment.java
View file

@ -172,15 +172,6 @@ public class AccessibilitySettingsFragment extends BaseSettingsFragment implemen
autoAnnouncePeriod.setDescription(R.string.access_autoannounce_period_descr);
}
// private void setupDisableOffRouteRecalculationPref() {
// SwitchPreferenceEx disableOffRouteRecalculation = (SwitchPreferenceEx) findPreference(settings.DISABLE_OFFROUTE_RECALC.getId());
// disableOffRouteRecalculation.setDescription(getString(R.string.access_disable_offroute_recalc_descr));
// }
//
// private void setupDisableWrongDirectionRecalculationPref() {
// SwitchPreferenceEx disableWrongDirectionRecalculation = (SwitchPreferenceEx) findPreference(settings.DISABLE_WRONG_DIRECTION_RECALC.getId());
// disableWrongDirectionRecalculation.setDescription(getString(R.string.access_disable_wrong_direction_recalc_descr));
// }
private void setupDirectionStylePref() {
RelativeDirectionStyle[] relativeDirectionStyles = RelativeDirectionStyle.values();

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

@ -1145,6 +1145,7 @@ public class RouteLayer extends OsmandMapLayer implements ContextMenuLayer.ICont
Location previousInRoute = null;
Location nextInRoute = null;
//need to change this code by fixing helper.route.getCurrentRoute() miscalculation
// TODO simplifiy all culation!
if (helper.getRoute().getIntermediatePointsToPass() > 0) {
for (int i = 1; i < routeNodes.size(); i++) {
LatLon routePoint = new LatLon(routeNodes.get(i).getLatitude(), routeNodes.get(i).getLongitude());
@ -1159,6 +1160,7 @@ public class RouteLayer extends OsmandMapLayer implements ContextMenuLayer.ICont
}
if (nextInRoute != null && previousInRoute != null) {
final Location ll = view.getApplication().getLocationProvider().getLastKnownLocation();
final int aX = box.getPixXFromLonNoRot(ll.getLongitude());
final int aY = box.getPixYFromLatNoRot(ll.getLatitude());