From 21d66318c3c45a71cf257a1226aa9f4466b8cf98 Mon Sep 17 00:00:00 2001 From: Sara <sarasdj@stud.ntnu.no> Date: Wed, 14 Feb 2024 13:46:35 +0100 Subject: [PATCH] update: marker parsing --- .../__pycache__/get_markers.cpython-311.pyc | Bin 3243 -> 3282 bytes server/map/get_markers.py | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/map/__pycache__/get_markers.cpython-311.pyc b/server/map/__pycache__/get_markers.cpython-311.pyc index 078d2229e68ac680f9151b17632da553101f0b6c..09577cf8e7125f13454aa159548ac4e9b12001dd 100644 GIT binary patch delta 364 zcmZ22c}bFYIWI340}veFcqaAUMqV#Q#&we;7?T)hOy13yrc=X`!YK)o27?r?IqbD; zHLNwvWei11HOw`vNOIhh?U{^~Q-HE8DLe>qAdeS?$2oZ_lRM+g&3BoUm>6>>v997s z(R0o(%1bSpyn^*1`%6xsRhsORyV*QM*dXG!SX>fI5??X`C0;U3e!>>OCJba&=}vBB z*WH}XewtCp2FT|D;$mGU28ITP4@{PmT{tb-q&S5>Fi1^q<}??*AtgH_agN#tehz8A z4-7z}!~28S<`bMt7)32zY#5H%aJi~6A7vABRb)P@$m*&#xsf|kO%Z5hkvfO~S+J7f oGmvB`vIY{rIBatBQ%ZAE?TS1n@pLIVF)|u`V8Bimc>py409-s)^#A|> delta 328 zcmca4xmuEUIWI340}#BJeI|9|MqV#Q#s!lj7?T($PTtL!CYQoFhpm>ahP8&djG;)W zhPj4S5~LUmQn)7jG8rq!0%ciJxDnz&9uEqSck*H;cg9JZUo$B&F(yyuV_h}*5bJ#= zO}5D^*gOPTToOwXUorxXe8~hNI485P2e1hOnN_-z7qaVaZf8HuC}a)f^8j(N8c<OK z!v`jd$tj$cY?7Qp9~dMjFXlAo`@qXC&G&%;NOX9A5ZU~ma|xrUk&7wA5mPQ#dFCVb zVy;rmN2OR@<tMM;j#N_snpLC*B0wguWcUmu8H%ic#4iq;-29Z%oK(9akICvhU5bv3 Oj7A?Au#-jZKpg<GQcT$Z diff --git a/server/map/get_markers.py b/server/map/get_markers.py index ce82e44d..1ca3bc89 100644 --- a/server/map/get_markers.py +++ b/server/map/get_markers.py @@ -14,7 +14,7 @@ def get_all_markers(self, cursor): # Fetch all data cursor.execute(''' SELECT m.MeasurementID, m.SensorID, m.TimeMeasured, d.Latitude, d.Longitude, - d.IceTop, d.IceBottom, d.CalculatedThickness, d.Accuracy, s.SensorType, s.Active + d.IceTop, d.IceBottom, d.CalculatedThickness, d.Accuracy, d.Corner, s.SensorType, s.Active FROM Measurement m INNER JOIN Sensor s ON m.SensorID = s.SensorID INNER JOIN Data d ON m.MeasurementID = d.MeasurementID @@ -32,7 +32,8 @@ def get_all_markers(self, cursor): 'IceTop': row[5], 'IceBottom': row[6], 'CalculatedThickness': row[7], - 'Accuracy': row[8] + 'Accuracy': row[8], + 'Corner': row[9] } # Append data with measurement ID x to measurement x object -- GitLab