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

Added different speed limit for miles

Browse source
This commit is contained in:
Denis 2014-10-10 12:57:55 +03:00
parent 3863a864aa
commit bf288499e7
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -675,9 +675,12 @@ public class OsmandSettings {
public final OsmandPreference<Float> ARRIVAL_DISTANCE_FACTOR = public final OsmandPreference<Float> ARRIVAL_DISTANCE_FACTOR =
new FloatPreference("arrival_distance_factor", 1f).makeProfile(); new FloatPreference("arrival_distance_factor", 1f).makeProfile();
public final OsmandPreference<Float> SPEED_LIMIT_EXCEED = public final OsmandPreference<Float> SPEED_LIMIT_EXCEED_KM =
new FloatPreference("speed_limit_exceed", 5f).makeProfile(); new FloatPreference("speed_limit_exceed", 5f).makeProfile();
public final OsmandPreference<Float> SPEED_LIMIT_EXCEED_MILE =
new FloatPreference("speed_limit_exceed", 3f).makeProfile();
// this value string is synchronized with settings_pref.xml preference name // this value string is synchronized with settings_pref.xml preference name
public final OsmandPreference<Boolean> USE_TRACKBALL_FOR_MOVEMENTS = public final OsmandPreference<Boolean> USE_TRACKBALL_FOR_MOVEMENTS =
new BooleanPreference("use_trackball_for_movements", true).makeGlobal(); new BooleanPreference("use_trackball_for_movements", true).makeGlobal();

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

@ -112,9 +112,9 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
registerListPreference(settings.ARRIVAL_DISTANCE_FACTOR, screen, arrivalNames, arrivalValues); registerListPreference(settings.ARRIVAL_DISTANCE_FACTOR, screen, arrivalNames, arrivalValues);
ApplicationMode mode = getMyApplication().getSettings().getApplicationMode(); ApplicationMode mode = getMyApplication().getSettings().getApplicationMode();
if (mode == ApplicationMode.CAR || mode == ApplicationMode.TRUCK || mode == ApplicationMode.MOTORCYCLE){ if (mode.isDerivedRoutingFrom(ApplicationMode.CAR)){
Float[] speedLimits = new Float[] {5f, 7f, 10f, 15f, 20f};
if (settings.METRIC_SYSTEM.get() == OsmandSettings.MetricsConstants.KILOMETERS_AND_METERS){ if (settings.METRIC_SYSTEM.get() == OsmandSettings.MetricsConstants.KILOMETERS_AND_METERS){
Float[] speedLimits = new Float[] {5f, 7f, 10f, 15f, 20f};
String[] speedNames = new String[] { String[] speedNames = new String[] {
speedLimits[0] + " " + getString(R.string.km_h), speedLimits[0] + " " + getString(R.string.km_h),
@ -122,15 +122,16 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
speedLimits[2] + " " + getString(R.string.km_h), speedLimits[2] + " " + getString(R.string.km_h),
speedLimits[3] + " " + getString(R.string.km_h), speedLimits[3] + " " + getString(R.string.km_h),
speedLimits[4] + " " + getString(R.string.km_h)}; speedLimits[4] + " " + getString(R.string.km_h)};
registerListPreference(settings.SPEED_LIMIT_EXCEED, screen, speedNames, speedLimits); registerListPreference(settings.SPEED_LIMIT_EXCEED_KM, screen, speedNames, speedLimits);
} else { } else {
Float[] speedLimits = new Float[] {3f, 5f, 7f, 10f, 15f};
String[] speedNames = new String[] { String[] speedNames = new String[] {
speedLimits[0] + " " + getString(R.string.mile_per_hour), speedLimits[0] + " " + getString(R.string.mile_per_hour),
speedLimits[1] + " " + getString(R.string.mile_per_hour), speedLimits[1] + " " + getString(R.string.mile_per_hour),
speedLimits[2] + " " + getString(R.string.mile_per_hour), speedLimits[2] + " " + getString(R.string.mile_per_hour),
speedLimits[3] + " " + getString(R.string.mile_per_hour), speedLimits[3] + " " + getString(R.string.mile_per_hour),
speedLimits[4] + " " + getString(R.string.mile_per_hour)}; speedLimits[4] + " " + getString(R.string.mile_per_hour)};
registerListPreference(settings.SPEED_LIMIT_EXCEED, screen, speedNames, speedLimits); registerListPreference(settings.SPEED_LIMIT_EXCEED_MILE, screen, speedNames, speedLimits);
} }
} }

8
OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
View file

@ -159,9 +159,9 @@ public class WaypointHelper {
float mxspeed = route.getCurrentMaxSpeed(); float mxspeed = route.getCurrentMaxSpeed();
float delta; float delta;
if (app.getSettings().METRIC_SYSTEM.get() == MetricsConstants.KILOMETERS_AND_METERS){ if (app.getSettings().METRIC_SYSTEM.get() == MetricsConstants.KILOMETERS_AND_METERS){
delta = app.getSettings().SPEED_LIMIT_EXCEED.get(); delta = app.getSettings().SPEED_LIMIT_EXCEED_KM.get();
} else { } else {
delta = app.getSettings().SPEED_LIMIT_EXCEED.get() * 1.6f; delta = app.getSettings().SPEED_LIMIT_EXCEED_KM.get() * 1.6f;
} }
AlarmInfo speedAlarm = createSpeedAlarm(mc, mxspeed, lastProjection, delta); AlarmInfo speedAlarm = createSpeedAlarm(mc, mxspeed, lastProjection, delta);
if (speedAlarm != null) { if (speedAlarm != null) {
@ -254,9 +254,9 @@ public class WaypointHelper {
float mxspeed = ro.getMaximumSpeed(); float mxspeed = ro.getMaximumSpeed();
float delta; float delta;
if (app.getSettings().METRIC_SYSTEM.get() == MetricsConstants.KILOMETERS_AND_METERS){ if (app.getSettings().METRIC_SYSTEM.get() == MetricsConstants.KILOMETERS_AND_METERS){
delta = app.getSettings().SPEED_LIMIT_EXCEED.get(); delta = app.getSettings().SPEED_LIMIT_EXCEED_KM.get();
} else { } else {
delta = app.getSettings().SPEED_LIMIT_EXCEED.get() * 1.6f; delta = app.getSettings().SPEED_LIMIT_EXCEED_MILE.get() * 1.6f;
} }
AlarmInfo speedAlarm = createSpeedAlarm(mc, mxspeed, loc, delta); AlarmInfo speedAlarm = createSpeedAlarm(mc, mxspeed, loc, delta);
if (speedAlarm != null) { if (speedAlarm != null) {