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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-01-19 09:17:05 +01:00
commit 47a70cf9e0
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
View file

@ -105,16 +105,16 @@ public class GpxUiHelper {
// 4. Elevation, eleUp, eleDown, if recorded // 4. Elevation, eleUp, eleDown, if recorded
if (analysis.isElevationSpecified()) { if (analysis.isElevationSpecified()) {
description.append("<br/>"); description.append(nl);
description.append(app.getString(R.string.gpx_info_avg_altitude, description.append(app.getString(R.string.gpx_info_avg_altitude,
getColorValue(speedClr, OsmAndFormatter.getFormattedAlt(analysis.avgElevation, app), html))); getColorValue(speedClr, OsmAndFormatter.getFormattedAlt(analysis.avgElevation, app), html)));
description.append("<br/>"); description.append(nl);
String min = getColorValue(descClr, OsmAndFormatter.getFormattedAlt(analysis.minElevation, app), html); String min = getColorValue(descClr, OsmAndFormatter.getFormattedAlt(analysis.minElevation, app), html);
String max = getColorValue(ascClr, OsmAndFormatter.getFormattedAlt(analysis.maxElevation, app), html); String max = getColorValue(ascClr, OsmAndFormatter.getFormattedAlt(analysis.maxElevation, app), html);
String asc = getColorValue(ascClr, OsmAndFormatter.getFormattedAlt(analysis.diffElevationUp, app), html); String asc = getColorValue(ascClr, OsmAndFormatter.getFormattedAlt(analysis.diffElevationUp, app), html);
String desc = getColorValue(descClr, OsmAndFormatter.getFormattedAlt(analysis.diffElevationDown, app), html); String desc = getColorValue(descClr, OsmAndFormatter.getFormattedAlt(analysis.diffElevationDown, app), html);
description.append(app.getString(R.string.gpx_info_diff_altitude,min +" - " + max )); description.append(app.getString(R.string.gpx_info_diff_altitude,min +" - " + max ));
description.append("<br/>"); description.append(nl);
description.append(app.getString(R.string.gpx_info_asc_altitude,"\u2193 " + desc + " \u2191 " + asc + "")); description.append(app.getString(R.string.gpx_info_asc_altitude,"\u2193 " + desc + " \u2191 " + asc + ""));
} }
@ -122,8 +122,8 @@ public class GpxUiHelper {
if(analysis.isSpeedSpecified()){ if(analysis.isSpeedSpecified()){
String avg = getColorValue(speedClr, OsmAndFormatter.getFormattedSpeed(analysis.avgSpeed, app), html); String avg = getColorValue(speedClr, OsmAndFormatter.getFormattedSpeed(analysis.avgSpeed, app), html);
String max = getColorValue(ascClr, OsmAndFormatter.getFormattedSpeed(analysis.maxSpeed, app), html); String max = getColorValue(ascClr, OsmAndFormatter.getFormattedSpeed(analysis.maxSpeed, app), html);
description.append("<br/>").append(app.getString(R.string.gpx_info_average_speed,avg)); description.append(nl).append(app.getString(R.string.gpx_info_average_speed,avg));
description.append("<br/>").append(app.getString(R.string.gpx_info_maximum_speed,max)); description.append(nl).append(app.getString(R.string.gpx_info_maximum_speed,max));
} }
return description.toString(); return description.toString();
} }