diff --git a/OsmAnd/res/layout/gpx_split_segment_fragment.xml b/OsmAnd/res/layout/gpx_split_segment_fragment.xml index 788f97561c..4741ce93ef 100644 --- a/OsmAnd/res/layout/gpx_split_segment_fragment.xml +++ b/OsmAnd/res/layout/gpx_split_segment_fragment.xml @@ -309,7 +309,7 @@ android:layout_height="wrap_content" android:layout_marginTop="3dp" android:background="@null" - android:text="@string/range" + android:text="@string/range_min_max" android:textColor="?android:attr/textColorSecondary" android:textSize="@dimen/default_split_segments_sub" /> diff --git a/OsmAnd/src/net/osmand/plus/GPXUtilities.java b/OsmAnd/src/net/osmand/plus/GPXUtilities.java index ec73ad3bdd..e0553c7f50 100644 --- a/OsmAnd/src/net/osmand/plus/GPXUtilities.java +++ b/OsmAnd/src/net/osmand/plus/GPXUtilities.java @@ -275,7 +275,7 @@ public class GPXUtilities { public double minElevation = 99999; public double maxElevation = -100; - public float minSpeed = 0; + public float minSpeed = Float.MAX_VALUE; public float maxSpeed = 0; public float avgSpeed; @@ -521,11 +521,7 @@ public class GPXUtilities { if (speed > 0) { totalSpeedSum += speed; - if (minSpeed == 0) { - minSpeed = speed; - } else { - minSpeed = Math.min(speed, minSpeed); - } + minSpeed = Math.min(speed, minSpeed); maxSpeed = Math.max(speed, maxSpeed); speedCount++; } diff --git a/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentFragment.java index b0d52a599f..67314082a6 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentFragment.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/SplitSegmentFragment.java @@ -544,7 +544,7 @@ public class SplitSegmentFragment extends OsmAndListFragment { String maxSpeed = OsmAndFormatter.getFormattedSpeed(analysis.maxSpeed, app); String minSpeed = OsmAndFormatter.getFormattedSpeed(analysis.minSpeed, app); - String max_min_speed = maxSpeed.substring(0, maxSpeed.indexOf(" ")).concat("/").concat(minSpeed.substring(0, minSpeed.indexOf(" "))); + String max_min_speed = maxSpeed.substring(0, maxSpeed.indexOf(" ")).concat("/").concat(minSpeed); if (minSpeed.substring(0, minSpeed.indexOf(" ")).equals("0") || minSpeed.substring(0, minSpeed.indexOf(" ")).equals("0.0")) { (convertView.findViewById(R.id.max_speed_value)) .setVisibility(View.VISIBLE);