feat: add ids for device navigator state

mmadfox · Aug 28, 2023 · cbf921b · cbf921b
1 parent 1aa4003
commit cbf921b
Show file tree

Hide file tree

Showing 6 changed files with 194 additions and 81 deletions.
diff --git a/navigator/navigator.go b/navigator/navigator.go
@@ -347,6 +347,12 @@ func (n *Navigator) Update(state *proto.Device) {
 	state.Navigator.CurrentRouteIndex = int64(n.routeIndex)
 	state.Navigator.CurrentTrackIndex = int64(n.trackIndex)
 	state.Navigator.CurrentSegmentIndex = int64(n.segmentIndex)
+	if route := n.CurrentRoute(); route != nil {
+		state.Navigator.CurrentRouteId = route.ID()
+	}
+	if track := n.CurrentTrack(); track != nil {
+		state.Navigator.CurrentTrackId = track.ID()
+	}
 
 	state.Location.Bearing = n.CurrentBearing()
 	state.Location.Elevation = n.elevation.ValueY()

diff --git a/navigator/navigator_test.go b/navigator/navigator_test.go
@@ -813,6 +813,8 @@ func TestNavigator_Update(t *testing.T) {
 	require.Equal(t, int64(n.RouteIndex()), state.Navigator.CurrentRouteIndex)
 	require.Equal(t, int64(n.TrackIndex()), state.Navigator.CurrentTrackIndex)
 	require.Equal(t, int64(n.SegmentIndex()), state.Navigator.CurrentSegmentIndex)
+	require.NotEmpty(t, state.Navigator.CurrentRouteId)
+	require.NotEmpty(t, state.Navigator.CurrentTrackId)
 
 	require.Equal(t, n.CurrentBearing(), state.Location.Bearing)
 	require.Equal(t, n.Elevation(), state.Location.Elevation)

diff --git a/proto/gpsgen.pb.go b/proto/gpsgen.pb.go
diff --git a/proto/gpsgen.proto b/proto/gpsgen.proto
@@ -49,6 +49,8 @@ message Device {
         int64 current_route_index = 1; // Current route index.
         int64 current_track_index = 2; // Current track index.
         int64 current_segment_index = 3; // Current segment index.
+        string current_route_id = 4; // Current route id.
+        string current_track_id = 5; // Current track id.
     }
 
     // Represents distance information.