From a2649bcaf6ca662a0316d08e304088e517c461f0 Mon Sep 17 00:00:00 2001
From: Reinka <0xre1nk0@gmail.com>
Date: Thu, 27 Jul 2023 20:12:48 +0300
Subject: [PATCH] Fir write heading

---
 .../plus/plugins/monitoring/SavingTrackHelper.java       | 9 ++++++---
 .../bottomsheets/BooleanRadioButtonsBottomSheet.java     | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/plugins/monitoring/SavingTrackHelper.java b/OsmAnd/src/net/osmand/plus/plugins/monitoring/SavingTrackHelper.java
index eb9d548958d..32697ce4f29 100644
--- a/OsmAnd/src/net/osmand/plus/plugins/monitoring/SavingTrackHelper.java
+++ b/OsmAnd/src/net/osmand/plus/plugins/monitoring/SavingTrackHelper.java
@@ -387,8 +387,11 @@ private void collectDBTracks(@NonNull SQLiteDatabase db, @NonNull Map<String, GP
 				pt.hdop = query.getDouble(4);
 				pt.time = query.getLong(5);
 
-				float heading = query.getFloat(6);
-				pt.heading = heading == NO_HEADING ? Float.NaN : heading;
+				if (query.isNull(6)) {
+					pt.heading = Float.NaN;
+				} else {
+					pt.heading = query.getFloat(6);
+				}
 
 				Map<String, String> extensions = getPluginsExtensions(query.getString(7));
 				pt.getExtensionsToWrite().putAll(extensions);
@@ -764,7 +767,7 @@ private void executeInsertTrackQuery(double lat, double lon, double alt, double
 		rowsMap.put(TRACK_COL_SPEED, speed);
 		rowsMap.put(TRACK_COL_HDOP, hdop);
 		rowsMap.put(TRACK_COL_DATE, time);
-		rowsMap.put(TRACK_COL_HEADING, heading);
+		rowsMap.put(TRACK_COL_HEADING, Float.isNaN(heading) ? null : heading);
 		rowsMap.put(TRACK_COL_PLUGINS_INFO, pluginsInfo);
 		execWithClose(AndroidUtils.createDbInsertQuery(TRACK_NAME, rowsMap.keySet()), rowsMap.values().toArray());
 	}
diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanRadioButtonsBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanRadioButtonsBottomSheet.java
index 77ae4d42e66..6c6ef650496 100644
--- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanRadioButtonsBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/BooleanRadioButtonsBottomSheet.java
@@ -117,6 +117,7 @@ private void onRadioButtonClick(@NonNull View view, @NonNull SwitchPreferenceEx
 				}
 			}
 		}
+		dismiss();
 	}
 
 	private void updatePreferenceButtons(boolean checked) {