From bcf0fa2f973c4e270858bb0e8ec3395038654832 Mon Sep 17 00:00:00 2001 From: XANTRONIX Industrial Date: Tue, 25 Feb 2025 20:56:35 -0500 Subject: [PATCH] Don't feed sounding with an Iterable of samples, but a list --- lib/xmet/sounding.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/xmet/sounding.py b/lib/xmet/sounding.py index f715a3c..9551cd2 100644 --- a/lib/xmet/sounding.py +++ b/lib/xmet/sounding.py @@ -148,9 +148,9 @@ class Sounding(DatabaseTable): }) sounding = st.fetchone() - sounding.samples = db.query(SoundingSample, { + sounding.samples = list(db.query(SoundingSample, { 'sounding_id': sounding.id - }, [['elapsed', DatabaseOrder.ASC]]).fetchall() + }, [['pressure', DatabaseOrder.DESC]]).fetchall()) return sounding @@ -169,7 +169,7 @@ class Sounding(DatabaseTable): where timestamp_released <= :timestamp order by - distance desc, + distance asc, timestamp_released desc limit 1 """.format(crs=COORD_SYSTEM) @@ -184,8 +184,8 @@ class Sounding(DatabaseTable): }) sounding = st.fetchone() - sounding.samples = db.query(SoundingSample, { + sounding.samples = list(db.query(SoundingSample, { 'sounding_id': sounding.id - }, [['elapsed', DatabaseOrder.ASC]]).fetchall() + }, [['pressure', DatabaseOrder.DESC]]).fetchall()) return sounding