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

Merge branch 'master' of github.com:osmandapp/Osmand

Browse source
This commit is contained in:
Victor Shcherb 2015-09-23 13:05:10 +02:00
commit f39d800cc1
3 changed files with 68 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/res/layout/main.xml
View file

@ -48,6 +48,14 @@
<include layout="@layout/map_hud_bottom"/>
</FrameLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom">
<View
android:layout_width="match_parent"
android:layout_height="1px"/>
</FrameLayout>
<include
layout="@layout/dashboard_over_map"

7
OsmAnd/res/layout/map_hud_bottom.xml
View file

@ -187,13 +187,6 @@
</LinearLayout>
</LinearLayout>
</FrameLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<View
android:layout_width="match_parent"
android:layout_height="1px"/>
</FrameLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >

68
OsmAnd/src/net/osmand/plus/GPXUtilities.java
View file

@ -226,8 +226,19 @@ public class GPXUtilities {
double totalSpeedSum = 0;
points = 0;
double channelThres = 5;
double channelBase;
double channelTop;
double channelBottom;
boolean climb = false;
for (SplitSegment s : splitSegments) {
final int numberOfPoints = s.getNumberOfPoints();
channelBase = 99999;
channelTop = channelBase;
channelBottom = channelBase;
metricEnd += s.metricEnd;
points += numberOfPoints;
for (int j = 0; j < numberOfPoints; j++) {
@ -259,17 +270,58 @@ public class GPXUtilities {
speedCount++;
}
// Trend channel approach for elevation gain/loss, Hardy 2015-09-22
if (!Double.isNaN(point.ele)) {
// Init channel
if (channelBase == 99999) {
channelBase = point.ele;
channelTop = channelBase;
channelBottom = channelBase;
}
// Channel maintenance
if (point.ele > channelTop) {
channelTop = point.ele;
} else if (point.ele < channelBottom) {
channelBottom = point.ele;
}
// Turnaround (breakout) detection
if ((point.ele <= (channelTop - channelThres)) && (climb == true)) {
if ((channelTop - channelBase) >= channelThres) {
diffElevationUp += channelTop - channelBase;
}
channelBase = channelTop;
channelBottom = point.ele;
climb = false;
} else if ((point.ele >= (channelBottom + channelThres)) && (climb == false)) {
if ((channelBase - channelBottom) >= channelThres) {
diffElevationDown += channelBase - channelBottom;
}
channelBase = channelBottom;
channelTop = point.ele;
climb = true;
// End detection without breakout
} else if (j == numberOfPoints -1) {
if ((channelTop - channelBase) >= channelThres) {
diffElevationUp += channelTop - channelBase;
}
if ((channelBase - channelBottom) >= channelThres) {
diffElevationDown += channelBase - channelBottom;
}
}
}
if (j > 0) {
WptPt prev = s.get(j - 1);
if (!Double.isNaN(point.ele) && !Double.isNaN(prev.ele)) {
double diff = point.ele - prev.ele;
if (diff > 0) {
diffElevationUp += diff;
} else {
diffElevationDown -= diff;
}
}
// Old complete summation approach for elevation gain/loss
//if (!Double.isNaN(point.ele) && !Double.isNaN(prev.ele)) {
// double diff = point.ele - prev.ele;
// if (diff > 0) {
// diffElevationUp += diff;
// } else {
// diffElevationDown -= diff;
// }
//}
// totalDistance += MapUtils.getDistance(prev.lat, prev.lon, point.lat, point.lon);
// using ellipsoidal 'distanceBetween' instead of spherical haversine (MapUtils.getDistance) is