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

sort down miles-yards - rarely used

Browse source
This commit is contained in:
sonora 2012-06-03 09:27:28 +02:00
parent 4b41a2c9e2
commit 046d4008c4
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/src/net/osmand/OsmAndFormatter.java
View file

@ -72,12 +72,12 @@ public class OsmAndFormatter {
} else { } else {
if (mc == MetricsConstants.KILOMETERS_AND_METERS) { if (mc == MetricsConstants.KILOMETERS_AND_METERS) {
return ((int) meters) + " " + ctx.getString(R.string.m); //$NON-NLS-1$ return ((int) meters) + " " + ctx.getString(R.string.m); //$NON-NLS-1$
} else if (mc == MetricsConstants.MILES_AND_YARDS) {
int yards = (int) (meters * YARDS_IN_ONE_METER);
return yards + " " + ctx.getString(R.string.yard); //$NON-NLS-1$
} else if (mc == MetricsConstants.MILES_AND_FOOTS) { } else if (mc == MetricsConstants.MILES_AND_FOOTS) {
int foots = (int) (meters * FOOTS_IN_ONE_METER); int foots = (int) (meters * FOOTS_IN_ONE_METER);
return foots + " " + ctx.getString(R.string.foot); //$NON-NLS-1$ return foots + " " + ctx.getString(R.string.foot); //$NON-NLS-1$
} else if (mc == MetricsConstants.MILES_AND_YARDS) {
int yards = (int) (meters * YARDS_IN_ONE_METER);
return yards + " " + ctx.getString(R.string.yard); //$NON-NLS-1$
} }
return ((int) meters) + " " + ctx.getString(R.string.m); //$NON-NLS-1$ return ((int) meters) + " " + ctx.getString(R.string.m); //$NON-NLS-1$
} }

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

@ -1267,8 +1267,8 @@ public class OsmandSettings {
public enum MetricsConstants { public enum MetricsConstants {
KILOMETERS_AND_METERS(R.string.si_km_m,"km-m"), KILOMETERS_AND_METERS(R.string.si_km_m,"km-m"),
MILES_AND_YARDS(R.string.si_mi_yard,"mi-y"), MILES_AND_FOOTS(R.string.si_mi_foots,"mi-f"),
MILES_AND_FOOTS(R.string.si_mi_foots,"mi-f"); MILES_AND_YARDS(R.string.si_mi_yard,"mi-y");
private final int key; private final int key;
private final String ttsString; private final String ttsString;