From 56b6a2f22104ae89454645773802d8491fe0fdcc Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Wed, 21 Feb 2024 11:42:20 +0100
Subject: [PATCH] update: revert to working commit
---
app/lib/pages/widgets/map_widget.dart | 2 +-
server/main.py | 6 ++++--
.../map/__pycache__/get_sat_query.cpython-311.pyc | Bin 0 -> 975 bytes
3 files changed, 5 insertions(+), 3 deletions(-)
create mode 100644 server/map/__pycache__/get_sat_query.cpython-311.pyc
diff --git a/app/lib/pages/widgets/map_widget.dart b/app/lib/pages/widgets/map_widget.dart
index 4e9688a7..ebb7521c 100644
--- a/app/lib/pages/widgets/map_widget.dart
+++ b/app/lib/pages/widgets/map_widget.dart
@@ -173,7 +173,7 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
child: GestureDetector(
onTap: () {
setState(() {
- //isMinimized = !isMinimized; // Toggle minimized state
+ isMinimized = !isMinimized; // Toggle minimized state
});
},
child: Icon(isMinimized ? Icons.arrow_drop_up : Icons.arrow_drop_down),
diff --git a/server/main.py b/server/main.py
index 47d94aad..92a0fa09 100644
--- a/server/main.py
+++ b/server/main.py
@@ -10,6 +10,7 @@ import sqlite3
app = Flask(__name__)
terminate_server = 0
+
class IceHTTPServer(HTTPServer):
def __init__(self, server_address, handler_class, cursor):
super().__init__(server_address, handler_class)
@@ -28,7 +29,7 @@ class IceHTTP(BaseHTTPRequestHandler):
def do_GET(self):
# Root path
- if self.path == '/': # NB: temporary root path behavior
+ if self.path == '/': # NB: temporary root path behavior
self.send_response(200)
self.send_header("Content-type", "text/plain")
self.end_headers()
@@ -36,7 +37,7 @@ class IceHTTP(BaseHTTPRequestHandler):
self.wfile.write(b"Root path hit!")
elif self.path == '/update_map': # NB: should be POST?
- get_all_markers(self, self.cursor, False) # Get all markers
+ get_all_markers(self, self.cursor, False) # Get all markers
elif self.path == '/get_valid_markers': # NB: should be POST?
get_all_markers(self, self.cursor, True) # Get only valid markers
@@ -45,6 +46,7 @@ class IceHTTP(BaseHTTPRequestHandler):
if self.path == '/get_weather_data':
get_weather(self)
+
# Terminate server on key press q
def on_key_press(server, event, cursor, conn):
if event.name == 'q':
diff --git a/server/map/__pycache__/get_sat_query.cpython-311.pyc b/server/map/__pycache__/get_sat_query.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..1f905358a99ee725129c808f8305930a2effa62c
GIT binary patch
literal 975
zcmZWoOHbQC5MGB(1cg)_AQz;HOH&2n_?3r)>Q)e3pdz4#M5UEgWa4!QO>Ece6cJI0
z13v)u!m&9~Rs4}26BLQc$M)1)q})&|b#0mm#K`mbX1`g_&e~tY;Rk@o-!EPChXUZ2
z2L?j0FZ~JP&VU9^z+0eETObxF57s<Fkmv}}{!d~EkNQL%ffkAHixxO1l^4Tm3J~TH
z-R5f}8axjWF3}tDxkEI_dj6c~#W3OV_Pu_5X~98s+aFOauj_lF1@HEE7g1ye<n*D9
zW`ECdEWE%l7}+1IWrPzL8BWzeHF~eHn<$%g#;lZ?gF0q(p5?V<HbV>iu1+UKu}tr>
zLXt))Rp$g<P*d5=^Md@UBySa^73AbqE4s9_xh-*=$cgD}LJ&A1E~e7ytSBVJRFaEx
zJe%U!bb=Ez*|?bIcn>6bL5Qv|zL5)CQn65ybDQf$vSl>CxSh*MZ1nZoa&cASL?OB=
zudS>WC4pz7FE$JL#iCTLs};oTTc{E(uH|Kkw9L{RPqQ3D!X(Y|G@t(cos6qFkuwd4
zoRxMCE!3P;Evr^7t4`H4n0;&-&0xdPX)zXZ!(<}bj*YNo8W_3bKHNj9hHQ7-Te^v{
z8$8gfHAI|Ub&wlEM%mO*EZ{<nYPuWz&_MPf_U?Ul_Ie?=pp?kWv0^wzLs>@ny<=L6
zWt$Z~%d(1h9mrPds-;wrvx8M<$FEOVhi>>z#txGmy)O@AVva#C0K!Y~Snh>DaO?_3
zE@9*pci>DH&a~mo4>)=Sr!L{t>AUvhOb3cxD7K+EOm|?U3nOh9@ykzM{wJ5tl+Q}*
zNoRVlJ3ZHd^IbUK9z1>WTCfqL{6@Y3`yqk0_orQtKCPQtqlTW@lLY!bJ|aPHgrcZk
NV2q0Qz<uM_{{yPb<);7u
literal 0
HcmV?d00001
--
GitLab