From 78f9e06b926ee461f9d28412bff2ce8dfacd70f9 Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Tue, 19 Mar 2024 14:58:05 +0100
Subject: [PATCH] update: server json response
---
app/lib/data_classes.dart | 3 ---
.../__pycache__/get_markers.cpython-311.pyc | Bin 3203 -> 3745 bytes
server/map/get_markers.py | 6 +++---
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/app/lib/data_classes.dart b/app/lib/data_classes.dart
index c2eae490..8de99433 100644
--- a/app/lib/data_classes.dart
+++ b/app/lib/data_classes.dart
@@ -9,7 +9,6 @@ class Measurement {
String bodyOfWater;
LatLng center;
List <SubDiv> subDivs;
- List <LatLng> corners;
Measurement({
required this.measurementID,
@@ -18,7 +17,6 @@ class Measurement {
required this.bodyOfWater,
required this.center,
required this.subDivs,
- required this.corners,
});
factory Measurement.fromJson(Map<String, dynamic> json) {
@@ -29,7 +27,6 @@ class Measurement {
bodyOfWater: json['BodyOfWater'] ?? 'nil',
center: LatLng(json['CenterLat'], json['CenterLon']),
subDivs: (json['Subdivisions'] as List<dynamic>).map((data) => SubDiv.fromJson(data)).toList(),
- corners: (json['Corners'] as List<dynamic>).map((corner) => LatLng(corner[0], corner[1])).toList(),
);
}
}
diff --git a/server/map/__pycache__/get_markers.cpython-311.pyc b/server/map/__pycache__/get_markers.cpython-311.pyc
index 73cd772e302589d49fcad61810dfeecc73eafbdd..e5f3f09001f62f2c0a6fd0b6f4fc14e388ba52d8 100644
GIT binary patch
delta 1040
zcma)4O-NKx6u$Sq-+7Mn<7hhOh@_<>7PE*T7+Ux<A(R-BmWx2%ed5n+q&Lryn3^!5
zL0ULmC<7PMrp(&8X=`LqZAOWZfuL=>DQi)S?A-Sp6(Q(y-*?V;?sx7z_uX?Z{3POg
zR#~Yb7|F-K48K3;tLtt8_6Si#v5AHeC39#PQ^6pkgo<<Gut4zuib`L3QlBnxvpc+C
zIp5aA+%*Hg&%LobY^l78P+F#Pc#l5C2)%&M9aLLVSseFZfz9GpoMkJx7kk(be5#R#
zmgKaQR^p(1@WHMqr@)3%Ud}x{#wZD5Kf6he11<pu*=y2V8QK?4XzV*_4jtK#v>>bT
zc7+{eZ9*6JGE<1MHKB&B2({P;Tee}8Mic(BJ|8H12W?u*2Uoq~JAzgANxm#gT~p?i
z#oCpNSY|UyT;vt7HD$J?s;C$<hCXc@MRnA$^|2AtEc)~jQ=c|RY{SW09a4v|)&(gt
ze5pb9$}=DN9By3}mOEc68{yc;aI6&cH26vgAbX)y$NIJVwWXSh(^Vw|PzW^T8#e;6
zLLm0DVfCAK6lbD69caBnOH>Q%XQ~r^;jLc+zv!{Y#`VdhkxJ=%4*+NKw{zZa798jR
zoJKmCA(OxmvSeEJq$I&8NvJRY-El}G?y4P421F8w#6u$apa?X|0Q_w#Pm0b#gsPC^
zfhN=XEW(fG?`HDK5c-o5kj0zG<<&c!^E{Vlbl{G=Gl=h$eHLm3_c@AUs~e;#e(5Hw
z6VN(QhAVtw9^fw8Qq=6(f>H-_)4_!su61L8TmEqN)|N-hUM+a)VQxCO7<8>01I+xV
zZdX>daA`i0jX3NJKVcinK~d2<3C7}`Q543Lwp(+8$If%$_xP>GuTRlw(>Q1K0_7J>
XB@pZPHn&rv;rd0rguwh0oSpsxM~dNT
delta 487
zcmZ1|+bqeqoR^o20SI2r_?eo*JCRSqLIlX0&XB^8!kEJl#gM|(!Vtxn!Whh;$@~(e
z&@Y)8L_q;JkOuKTKVhDjmCCq%;)N2H6s|e!lM5JK8JQ+;V^n7>nS77YlaYP029usb
zIzx)^9QGR48g?6?rk))ooKSOsR1NC_*2yJI#*Dm^S1_pp$#X!GfASY5WnMvqsw~dQ
zD$L5lAV)%h3PX`xEq4k3<S1rmM()Y;m^B%BCZAx|o_w5HbTS8vureP^<pO>f3z@Fr
zS|G65j^!j1(2X4Ip_5bCeSoZu>^8hYKxMbso%4(GQj3Zwe`IeG5xm8oT9KMuT9SH;
zBQ3QgIU_MAXY+K9a7HdCpjtK{F7}%IgR_h813!lh-v<UD(c$w!Z1Q}rcBvckiXX&z
zOoTo#0Er6%3Jc^e3K(1vF!(CB*_K<H(OJw@lHsT%mm4GVQDqTV8|I@ntU$IVQ;`nP
z*dmbmD;YimNroavAn}XCCO1E&G$+-r$Q8(C1ma?y$-#Uo0t^9+j7A^8WRVL{7y$99
BYQg{j
diff --git a/server/map/get_markers.py b/server/map/get_markers.py
index 2c8c4039..799f723a 100644
--- a/server/map/get_markers.py
+++ b/server/map/get_markers.py
@@ -38,7 +38,8 @@ def get_all_markers(self, cursor, waterBodyName):
'AvgThickness': row[11],
'CenLatitude': row[12],
'CenLongitude': row[13],
- 'Accuracy': row[14]
+ 'Accuracy': row[14],
+ 'Color': calculateColor(row[11]) # NB color calculated based on average thickness, should be minimum
}
# Check if measurement ID already exists in measurement_data
@@ -60,7 +61,6 @@ def get_all_markers(self, cursor, waterBodyName):
'Active': bool(row[6])
},
'Subdivisions': [sub_division], # Array of sub_division objects
- 'Corners': [], # NB remove value if not used
}
# Convert dictionary values to list of measurements
@@ -85,6 +85,7 @@ def get_all_markers(self, cursor, waterBodyName):
# Write marker data to response object
self.wfile.write(marker_data.encode('utf-8'))
+
def calculateColor(thickness: int): # NB not final colors nor ranges
if 0 < thickness < 4:
return 0xFFff0000 # Red
@@ -96,4 +97,3 @@ def calculateColor(thickness: int): # NB not final colors nor ranges
return 0xFF00d6ff # Blue
else:
return 0xFF939393 # Gray
-
--
GitLab