diff options
| author | Chumva <faiver.unknown@gmail.com> | 2019-10-17 18:35:37 +0300 |
|---|---|---|
| committer | Chumva <faiver.unknown@gmail.com> | 2019-10-17 18:35:37 +0300 |
| commit | 4295bf89cc6d3ecc9b23a4f89ef2081e404fcceb (patch) | |
| tree | dd3c4bc9cfaa2c4d1f9d21aba922245dbafa139d | |
| parent | 9b6ce51f947c6d4a8335d9ae97968301322708cd (diff) | |
| download | Osmand-4295bf89cc6d3ecc9b23a4f89ef2081e404fcceb.tar.gz | |
Replace fast_route_mode pref by short_way for car based profiles
| -rwxr-xr-x | OsmAnd/res/drawable-large/map_action_utv.png | bin | 586 -> 452 bytes | |||
| -rw-r--r-- | OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java | 7 |
2 files changed, 5 insertions, 2 deletions
diff --git a/OsmAnd/res/drawable-large/map_action_utv.png b/OsmAnd/res/drawable-large/map_action_utv.png Binary files differindex c6e51e8629..7c34c8c326 100755 --- a/OsmAnd/res/drawable-large/map_action_utv.png +++ b/OsmAnd/res/drawable-large/map_action_utv.png diff --git a/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java index 17dfca3136..c4ab399b6c 100644 --- a/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/RouteParametersFragment.java @@ -119,7 +119,7 @@ public class RouteParametersFragment extends BaseSettingsFragment { clearParameters(); if (router != null) { Map<String, GeneralRouter.RoutingParameter> parameters = router.getParameters(); - if (parameters.containsKey(GeneralRouter.USE_SHORTEST_WAY)) { + if (!am.isDerivedRoutingFrom(ApplicationMode.CAR)) { screen.addPreference(fastRoute); } for (Map.Entry<String, GeneralRouter.RoutingParameter> e : parameters.entrySet()) { @@ -133,7 +133,7 @@ public class RouteParametersFragment extends BaseSettingsFragment { reliefFactorParameters.add(routingParameter); } else if (DRIVING_STYLE.equals(routingParameter.getGroup())) { drivingStyleParameters.add(routingParameter); - } else if (!param.equals(GeneralRouter.USE_SHORTEST_WAY) + } else if ((!param.equals(GeneralRouter.USE_SHORTEST_WAY) || am.isDerivedRoutingFrom(ApplicationMode.CAR)) && !param.equals(GeneralRouter.VEHICLE_HEIGHT) && !param.equals(GeneralRouter.VEHICLE_WEIGHT) && !param.equals(GeneralRouter.VEHICLE_WIDTH)) { @@ -272,6 +272,7 @@ public class RouteParametersFragment extends BaseSettingsFragment { private void clearParameters() { avoidParameters.clear(); preferParameters.clear(); + drivingStyleParameters.clear(); reliefFactorParameters.clear(); otherRoutingParameters.clear(); } @@ -280,6 +281,8 @@ public class RouteParametersFragment extends BaseSettingsFragment { switch (prefId) { case GeneralRouter.ALLOW_PRIVATE: return getIcon(R.drawable.ic_action_private_access); + case GeneralRouter.USE_SHORTEST_WAY: + return getContentIcon(R.drawable.ic_action_fuel); case AVOID_ROUTING_PARAMETER_PREFIX: return getContentIcon(R.drawable.ic_action_alert); case DRIVING_STYLE: |
