Don't feed sounding with an Iterable of samples, but a list

This commit is contained in:
XANTRONIX 2025-02-25 20:56:35 -05:00
parent 9494b53105
commit bcf0fa2f97

View file

@ -148,9 +148,9 @@ class Sounding(DatabaseTable):
}) })
sounding = st.fetchone() sounding = st.fetchone()
sounding.samples = db.query(SoundingSample, { sounding.samples = list(db.query(SoundingSample, {
'sounding_id': sounding.id 'sounding_id': sounding.id
}, [['elapsed', DatabaseOrder.ASC]]).fetchall() }, [['pressure', DatabaseOrder.DESC]]).fetchall())
return sounding return sounding
@ -169,7 +169,7 @@ class Sounding(DatabaseTable):
where where
timestamp_released <= :timestamp timestamp_released <= :timestamp
order by order by
distance desc, distance asc,
timestamp_released desc timestamp_released desc
limit 1 limit 1
""".format(crs=COORD_SYSTEM) """.format(crs=COORD_SYSTEM)
@ -184,8 +184,8 @@ class Sounding(DatabaseTable):
}) })
sounding = st.fetchone() sounding = st.fetchone()
sounding.samples = db.query(SoundingSample, { sounding.samples = list(db.query(SoundingSample, {
'sounding_id': sounding.id 'sounding_id': sounding.id
}, [['elapsed', DatabaseOrder.ASC]]).fetchall() }, [['pressure', DatabaseOrder.DESC]]).fetchall())
return sounding return sounding