diff --git a/app/lib/pages/marker_handler/marker_data.dart b/app/lib/pages/marker_handler/marker_data.dart index 2fcc887a9d9c938426f4806c7f89336caecaec6a..5dbc70bbf88bbdfd4559c3b352a967c042f9c1ad 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 f5663b5eefe71de46f045b5a8e5834a9348e5391..107bf1c9076a3fe18dabf0c43c2069a58462204b 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 Binary files a/server/map/__pycache__/get_markers.cpython-311.pyc and b/server/map/__pycache__/get_markers.cpython-311.pyc differ diff --git a/server/map/get_markers.py b/server/map/get_markers.py index 0807fb7b580f6152b7b8950dc0efc96e9bb538d8..cb8e58044e6b1559803514085107690eb5e2a78c 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