GPX fixes

Author: Pygmalion69

app/src/main/java/org/nitri/opentopo/GpxDetailFragment.kt

@@ -147,30 +147,28 @@ class GpxDetailFragment : Fragment(), WayPointListAdapter.OnItemClickListener,
         mDistance = 0.0
         mElevation = false
         var prevTrackPoint: TrackPoint? = null
-        if (track.trackSegments != null) {
-            for (segment in track.trackSegments) {
-                if (segment.trackPoints != null) {
-                    mMaxElevation = segment.trackPoints[0].elevation
-                    mMinElevation = mMaxElevation
-                    for (trackPoint in segment.trackPoints) {
-                        if (prevTrackPoint != null) {
-                            mDistance += Util.distance(prevTrackPoint, trackPoint)
-                        }
-                        val builder = DistancePoint.Builder()
-                        builder.setDistance(mDistance)
-                        if (trackPoint.elevation != null) {
-                            val elevation = trackPoint.elevation
-                            if (elevation < mMinElevation) mMinElevation = elevation
-                            if (elevation > mMaxElevation) mMaxElevation = elevation
-                            builder.setElevation(elevation)
-                            mElevation = true
-                            mTrackDistanceLine.add(builder.build())
-                        }
-                        prevTrackPoint = trackPoint
+        track.trackSegments?.forEach { segment ->
+            segment.trackPoints?.let { points ->
+                mMaxElevation = points.first().elevation ?: 0.0
+                mMinElevation = mMaxElevation
+                points.forEach { trackPoint ->
+                    prevTrackPoint?.let { prevPoint ->
+                        mDistance += Util.distance(prevPoint, trackPoint)
                     }
+                    val builder = DistancePoint.Builder()
+                    builder.setDistance(mDistance)
+                    trackPoint.elevation?.also { elevation ->
+                        if (elevation < mMinElevation) mMinElevation = elevation
+                        if (elevation > mMaxElevation) mMaxElevation = elevation
+                        builder.setElevation(elevation)
+                        mElevation = true
+                        mTrackDistanceLine.add(builder.build())
+                    }
+                    prevTrackPoint = trackPoint
                 }
             }
         }
+
     }
 
     private fun buildWayPointList() {

app/src/main/java/org/nitri/opentopo/MainActivity.kt

@@ -328,6 +328,11 @@ class MainActivity : AppCompatActivity(), MapFragment.OnFragmentInteractionListe
         return gpxViewModel.gpx
     }
 
+    override fun clearGpx() {
+        gpxViewModel.gpx = null
+        mGpxUriString = null
+    }
+
     override fun showNearbyPlace(nearbyItem: NearbyItem?) {
         selectedNearbyPlace = nearbyItem
         supportFragmentManager.popBackStack()

app/src/main/java/org/nitri/opentopo/MapFragment.kt

@@ -492,12 +492,13 @@ class MapFragment() : Fragment(), LocationListener, PopupMenu.OnMenuItemClickLis
         builder.setTitle(getString(R.string.gpx))
             .setMessage(getString(R.string.discard_current_gpx))
             .setPositiveButton(android.R.string.ok) { dialog: DialogInterface, _: Int ->
-                if (mOverlayHelper != null) {
-                    mOverlayHelper!!.clearGpx()
+                mOverlayHelper?.let {
+                    it.clearGpx()
                     if (activity != null) (activity as AppCompatActivity?)!!.supportInvalidateOptionsMenu()
                 }
-                if (mListener != null) {
-                    mListener!!.selectGpx()
+                mListener?.let {
+                    it.clearGpx()
+                    it.selectGpx()
                 }
                 dialog.dismiss()
             }
@@ -805,6 +806,11 @@ class MapFragment() : Fragment(), LocationListener, PopupMenu.OnMenuItemClickLis
          */
         fun getGpx(): Gpx?
 
+        /**
+         * Clear GOX so it won't ne restored on config change
+         */
+        fun clearGpx()
+
         /**
          * Present GPX details
          */