Fix Kotlin conflict markers left in TrackDetailSheet.kt

https://claude.ai/code/session_01YUbuZNDAoLea4cf9UGQ9qn

1 files changed, 0 insertions, 22 deletions

diff --git a/android-app/app/src/main/kotlin/org/terst/nav/track/TrackDetailSheet.kt b/android-app/app/src/main/kotlin/org/terst/nav/track/TrackDetailSheet.kt
index 158e513..cedf4e1 100644
--- a/android-app/app/src/main/kotlin/org/terst/nav/track/TrackDetailSheet.kt
+++ b/android-app/app/src/main/kotlin/org/terst/nav/track/TrackDetailSheet.kt
@@ -10,8 +10,6 @@ import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-<<<<<<< Updated upstream
-=======
 import org.maplibre.android.camera.CameraUpdateFactory
 import org.maplibre.android.geometry.LatLng
 import org.maplibre.android.geometry.LatLngBounds
@@ -26,7 +24,6 @@ import org.maplibre.geojson.Feature
 import org.maplibre.geojson.FeatureCollection
 import org.maplibre.geojson.LineString
 import org.maplibre.geojson.Point
->>>>>>> Stashed changes
 import org.terst.nav.R
 import org.terst.nav.ui.MainViewModel
 import java.time.Instant
@@ -89,8 +86,6 @@ class TrackDetailSheet : Fragment() {
         rv.adapter = LogEventAdapter(events) { event ->
             trackMap?.easeCamera(CameraUpdateFactory.newLatLng(LatLng(event.lat, event.lon)), 300)
         }
-<<<<<<< Updated upstream
-=======
 
         trackMapView = view.findViewById(R.id.track_map_view)
         trackMapView.onCreate(savedInstanceState)
@@ -151,7 +146,6 @@ class TrackDetailSheet : Fragment() {
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         if (::trackMapView.isInitialized) trackMapView.onSaveInstanceState(outState)
->>>>>>> Stashed changes
     }
 
     override fun onDestroyView() {
@@ -179,22 +173,6 @@ class TrackDetailSheet : Fragment() {
                 "%.0f° → %.0f°  (Δ%.0f°)".format(t.cogBefore, t.cogAfter, abs(delta)))
         }
 
-        for (i in 1 until points.size - 1) {
-            val prev = points[i - 1].sogKnots
-            val curr = points[i].sogKnots
-            val next = points[i + 1].sogKnots
-            val rise = curr - prev
-            val fall = curr - next
-            val p = points[i]
-            if (rise > 1.5 && rise > fall) {
-                events += LogEvent(p.lat, p.lon, p.timestampMs, "↑",
-                    "Speed up", "%.1f → %.1f kt".format(prev, curr))
-            } else if (fall > 1.5 && fall > rise) {
-                events += LogEvent(p.lat, p.lon, p.timestampMs, "↓",
-                    "Slow down", "%.1f → %.1f kt".format(curr, next))
-            }
-        }
-
         points.lastOrNull()?.let { p ->
             events += LogEvent(p.lat, p.lon, p.timestampMs, "🏁", "End", formatPointDetail(p))
         }