diff --git a/app/lib/pages/default_page.dart b/app/lib/pages/default_page.dart
index 4f0fe3b14a56814ad72875532185c1a6df5cecb5..a0a5b7177a3cab6b248916d99e075c8519ed766b 100644
--- a/app/lib/pages/default_page.dart
+++ b/app/lib/pages/default_page.dart
@@ -1,10 +1,10 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'widgets/map_widget.dart';
-import 'marker_handler/marker_data.dart';
+import 'server_requests/data_classes.dart';
import 'consts.dart';
-import 'marker_handler/get_markers.dart';
-import 'marker_handler/get_relation.dart';
+import 'server_requests/fetch_markers.dart';
+import 'server_requests/fetch_relation.dart';
import 'dart:typed_data';
class DefaultPage extends StatefulWidget {
diff --git a/app/lib/pages/marker_handler/marker_data.dart b/app/lib/pages/server_requests/data_classes.dart
similarity index 100%
rename from app/lib/pages/marker_handler/marker_data.dart
rename to app/lib/pages/server_requests/data_classes.dart
diff --git a/app/lib/pages/marker_handler/get_markers.dart b/app/lib/pages/server_requests/fetch_markers.dart
similarity index 99%
rename from app/lib/pages/marker_handler/get_markers.dart
rename to app/lib/pages/server_requests/fetch_markers.dart
index 89db2d36d4e2f32339588f1bd863a73486176ba3..2e0e967976808a900ac1997b55be0827023a264d 100644
--- a/app/lib/pages/marker_handler/get_markers.dart
+++ b/app/lib/pages/server_requests/fetch_markers.dart
@@ -2,7 +2,7 @@ import 'dart:async';
import 'dart:convert';
import 'dart:io';
import '../consts.dart';
-import 'marker_data.dart';
+import 'data_classes.dart';
import 'package:path_provider/path_provider.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:flutter/material.dart';
diff --git a/app/lib/pages/marker_handler/get_relation.dart b/app/lib/pages/server_requests/fetch_relation.dart
similarity index 100%
rename from app/lib/pages/marker_handler/get_relation.dart
rename to app/lib/pages/server_requests/fetch_relation.dart
diff --git a/app/lib/pages/widgets/cloropleth_map.dart b/app/lib/pages/widgets/choropleth_map.dart
similarity index 98%
rename from app/lib/pages/widgets/cloropleth_map.dart
rename to app/lib/pages/widgets/choropleth_map.dart
index ea33009a252ee2efb5cc34af16d580ab190035fa..c6371034c4421705b0610d20bffd723fca9a3354 100644
--- a/app/lib/pages/widgets/cloropleth_map.dart
+++ b/app/lib/pages/widgets/choropleth_map.dart
@@ -1,5 +1,5 @@
import 'dart:typed_data';
-import '../marker_handler/marker_data.dart';
+import '../server_requests/data_classes.dart';
import 'package:flutter/material.dart';
import 'package:syncfusion_flutter_maps/maps.dart';
import 'dart:math';
diff --git a/app/lib/pages/widgets/map_widget.dart b/app/lib/pages/widgets/map_widget.dart
index 7d824eef6f43bbdfdfd7c80fe579bee0470c81af..510d1c631cd6250ff27cfab6d22fce2f5f92d120 100644
--- a/app/lib/pages/widgets/map_widget.dart
+++ b/app/lib/pages/widgets/map_widget.dart
@@ -1,11 +1,11 @@
import 'package:flutter/material.dart';
-import '../marker_handler/marker_data.dart';
+import '../server_requests/data_classes.dart';
import '../consts.dart';
import 'quick_view_chart.dart';
import 'stat_charts.dart';
import 'sat_layer.dart';
import 'package:flutter_map/flutter_map.dart';
-import 'cloropleth_map.dart';
+import 'choropleth_map.dart';
import 'dart:typed_data';
import 'package:google_fonts/google_fonts.dart';
import 'package:shared_preferences/shared_preferences.dart';
@@ -27,8 +27,8 @@ class MapContainerWidget extends StatefulWidget {
class _MapContainerWidgetState extends State<MapContainerWidget> {
- Measurement? selectedMarker; // Containing data for selected marker
- int selectedMarkerIndex = 0;
+ Measurement? selectedTile; // Containing data for selected marker
+ int selectedTileIndex = 0;
bool isMinimized = true; // Quick view box state tacker
bool satLayer = false; // Satellite layer visibility tracker
bool isTapped = false; // Button tap state tracker
@@ -57,14 +57,14 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
// Tile selection handler
void handleSelection(int index) {
setState(() {
- selectedMarkerIndex = index;
+ selectedTileIndex = index;
});
}
@override
Widget build(BuildContext context) {
// Initialise selectedMarker to first element in markerList
- selectedMarker ??= widget.markerList[selectedMarkerIndex];
+ selectedTile ??= widget.markerList[selectedTileIndex];
checkAndSetLastUpdate();
@@ -180,7 +180,7 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
child: Stack(
children: [
Visibility( // Graph only visible when box is maximized and a marker is selected
- visible: !isMinimized && selectedMarker != null,
+ visible: !isMinimized && selectedTile != null,
child: Center(
child: Padding(
padding: const EdgeInsets.only(right: 16.0, top: 17.0),
@@ -284,16 +284,16 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
style: subHeadingStyle,
),
Text(
- 'Date ${(selectedMarker?.timeMeasured.day ?? '-')}/${(selectedMarker?.timeMeasured.month ?? '-')}/${(selectedMarker?.timeMeasured.year ?? '-')}',
+ 'Date ${(selectedTile?.timeMeasured.day ?? '-')}/${(selectedTile?.timeMeasured.month ?? '-')}/${(selectedTile?.timeMeasured.year ?? '-')}',
style: regTextStyle,
),
Text(
- 'Time: ${selectedMarker?.timeMeasured.hour}:00',
+ 'Time: ${selectedTile?.timeMeasured.hour}:00',
style: regTextStyle,
),
const SizedBox(height: contPadding),
Text(
- 'Measuring point: (${selectedMarker?.measurementID}, ${selectedMarker?.measurementID})',
+ 'Measuring point: (${selectedTile?.measurementID}, ${selectedTile?.measurementID})',
style: regTextStyle,
),
const SizedBox(height: contPadding),
diff --git a/app/lib/pages/widgets/osm_map.dart b/app/lib/pages/widgets/osm_map.dart
index 9324c2bb80fec1d940b0b155e125c8ecf30c67c0..44aa3614943e45055986b9d9f8c6868b26963356 100644
--- a/app/lib/pages/widgets/osm_map.dart
+++ b/app/lib/pages/widgets/osm_map.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import '../marker_handler/marker_data.dart';
+import '../server_requests/data_classes.dart';
import '../consts.dart';
import 'package:flutter_map/flutter_map.dart';
import 'package:latlong2/latlong.dart';
diff --git a/app/lib/pages/widgets/sat_layer.dart b/app/lib/pages/widgets/sat_layer.dart
index 107bf1c9076a3fe18dabf0c43c2069a58462204b..c3b65fafd88c15838b800fa0a37936110fbe8861 100644
--- a/app/lib/pages/widgets/sat_layer.dart
+++ b/app/lib/pages/widgets/sat_layer.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import '../marker_handler/marker_data.dart';
+import '../server_requests/data_classes.dart';
import 'package:flutter_map/flutter_map.dart';
import 'package:latlong2/latlong.dart';