From 68a4bfd9489d2746eafb2a2a4de7a61be5ff148d Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Tue, 20 Feb 2024 10:30:24 +0100
Subject: [PATCH] fix: add body of water to json response
---
app/lib/pages/marker_handler/marker_data.dart | 6 +++---
app/lib/pages/widgets/sat_layer.dart | 2 +-
.../__pycache__/get_markers.cpython-311.pyc | Bin 4210 -> 4249 bytes
server/map/get_markers.py | 3 ++-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/app/lib/pages/marker_handler/marker_data.dart b/app/lib/pages/marker_handler/marker_data.dart
index 2fcc887a..5dbc70bb 100644
--- a/app/lib/pages/marker_handler/marker_data.dart
+++ b/app/lib/pages/marker_handler/marker_data.dart
@@ -92,7 +92,7 @@ class Data {
}
class Corner {
- double cornerID;
+ int cornerID;
double latitude;
double longitude;
@@ -105,8 +105,8 @@ class Corner {
factory Corner.fromJson(Map<String, dynamic> json) {
return Corner(
cornerID: json['CornerID'],
- latitude: json['CornerLatitude'],
- longitude: json['CornerLongitude'],
+ latitude: json['Latitude'],
+ longitude: json['Longitude'],
);
}
}
\ No newline at end of file
diff --git a/app/lib/pages/widgets/sat_layer.dart b/app/lib/pages/widgets/sat_layer.dart
index f5663b5e..107bf1c9 100644
--- a/app/lib/pages/widgets/sat_layer.dart
+++ b/app/lib/pages/widgets/sat_layer.dart
@@ -15,7 +15,7 @@ class SatLayer extends StatelessWidget {
Widget build(BuildContext context) {
return FlutterMap(
options: MapOptions(
- center: LatLng(31.0274,89.0065), // NB: random location in Tibet for testing purposes
+ center: LatLng(60.7666, 10.8471),
zoom: 9.0,
),
children: [
diff --git a/server/map/__pycache__/get_markers.cpython-311.pyc b/server/map/__pycache__/get_markers.cpython-311.pyc
index 33bb9f1fcd90bb46478879bc3fe3c70157a943a6..f1ffc5e1e2334b2d572c69c525febcab86c55e61 100644
GIT binary patch
delta 392
zcmeyQFjJ9tIWI340}yZ&UP<kq$Q#2rWn$JO#?Kr7o??`#VNDT}1WAHHiufG18kQP1
z8z8Ue%jBy}vt=cgF)}c$24V<cWJr;$<w}vN<<65xk)GVkEXyb}c{Q^!qwM7S%;KzI
zxyiqo<C*1B<R{0n6f-JJzR04?qUe{nVDnt|Xr|4<?3K*yFZqC`X|hc|$EDAEi`ywb
zrP4nwJh3FTX!Bn#0VW}5pe!2@7oTHdU}#|Yz!WuEo;Qt6i&N+WgVyG5UO7g&8!GB6
zn3lMI5al)j3Id4>0tyS{E(#c25HR>Ev-tp@24lUBn?A!aeJ*!N=3|y(?jp>`MOcAs
zP39t9pxH$lAOd95N`}uslA*{6Nc`fk$<0qG%}KQ@aszTf-Y&KR5+9fu85wUda5sSA
Z2d-pBMxzxX9~eM1E|MD}QRE8L4**A|V)g(4
delta 332
zcmbQK_(_3xIWI340}$|pTuzOh$Q#4hHZf}w<C~3tPcibPh|OWGVX0xW0m}Eho&1<-
zwygLvMh1q}Knwwl3@H+|Tq%;Z+<6iyQj=#h%Q8w&-pOptC^Pvjvp6eQZZaoJJhN<y
z+~jPQVn+GN_gR!#6#NnwY+lVC%{2J}2g~ME_EKghP1eZ|x%4;7atkmCIRXu51LET2
zObiSS3?G;xC)@L;v1xJ&ePGbsyqZ^zQT&52mkE#uBrXUjERee>U~oae;H%W;=X@HB
z_Ns0g497IM+=ZBr8Hu^`G9Tw<1+q1ni?o4;7O8;<kQFN#J_AXHA_pMxi^C>2KczG$
d)vm~8vY&vAei9?2(F&0d3?LdmS>z1V4*=K$RA~SJ
diff --git a/server/map/get_markers.py b/server/map/get_markers.py
index 0807fb7b..cb8e5804 100644
--- a/server/map/get_markers.py
+++ b/server/map/get_markers.py
@@ -75,7 +75,8 @@ def get_all_markers(self, cursor, valid: bool):
'Active': bool(row[10])
},
'Data': [data_object],
- 'Corners': [corner_object]
+ 'Corners': [corner_object],
+ 'BodyOfWater' : row[14]
}
# Convert dictionary values to list of measurements
--
GitLab