From 98426c702289e21fcd53e92b17b704376e793ca4 Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Tue, 19 Mar 2024 11:32:59 +0100
Subject: [PATCH] refactor: file, function, and class names

---
 app/lib/pages/default_page.dart                             | 6 +++---
 app/lib/server_requests/fetch_markers.dart                  | 4 ++--
 .../{map_widget.dart => main_widgets_container.dart}        | 2 +-
 app/lib/widgets/{osm_map.dart => osm_layer.dart}            | 4 ++--
 app/lib/widgets/{sat_layer.dart => satellite_layer.dart}    | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename app/lib/widgets/{map_widget.dart => main_widgets_container.dart} (99%)
 rename app/lib/widgets/{osm_map.dart => osm_layer.dart} (93%)
 rename app/lib/widgets/{sat_layer.dart => satellite_layer.dart} (90%)

diff --git a/app/lib/pages/default_page.dart b/app/lib/pages/default_page.dart
index 6e66746c..b7e66611 100644
--- a/app/lib/pages/default_page.dart
+++ b/app/lib/pages/default_page.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'dart:typed_data';
 
 import '../consts.dart';
-import '../widgets/map_widget.dart';
+import '../widgets/main_widgets_container.dart';
 import '../data_classes.dart';
 import '../server_requests/fetch_markers.dart';
 import '../server_requests/fetch_relation.dart';
@@ -27,7 +27,7 @@ class _DefaultPageState extends State<DefaultPage> {
   void initState() {
     super.initState();
     // Try to fetch measurement data from server
-    markerListFuture = fetchMarkerData().then((fetchResult) {
+    markerListFuture = fetchMeasurements().then((fetchResult) {
       List<Measurement> measurements = fetchResult.measurements;
       serverConnection = fetchResult.connected;
 
@@ -44,7 +44,7 @@ class _DefaultPageState extends State<DefaultPage> {
     // Schedule fetchMarkerData to run periodically based on fetchInterval from consts
     const Duration interval = Duration(minutes: fetchInterval); // NB fetchInterval value to be determined
     _timer = Timer.periodic(interval, (timer) {
-      fetchMarkerData();
+      fetchMeasurements();
     });
   }
 
diff --git a/app/lib/server_requests/fetch_markers.dart b/app/lib/server_requests/fetch_markers.dart
index 19a208db..410a25df 100644
--- a/app/lib/server_requests/fetch_markers.dart
+++ b/app/lib/server_requests/fetch_markers.dart
@@ -14,8 +14,8 @@ class FetchResult {
   FetchResult(this.measurements, this.connected);
 }
 
-// fetchMarkerTemplate requests all marker data from the server
-Future<FetchResult> fetchMarkerData() async {
+/// fetchMarkerData fetches measurement data from the server
+Future<FetchResult> fetchMeasurements() async {
   try {
     // Custom HTTP client
     HttpClient client = HttpClient()
diff --git a/app/lib/widgets/map_widget.dart b/app/lib/widgets/main_widgets_container.dart
similarity index 99%
rename from app/lib/widgets/map_widget.dart
rename to app/lib/widgets/main_widgets_container.dart
index 80c74ecd..227e09df 100644
--- a/app/lib/widgets/map_widget.dart
+++ b/app/lib/widgets/main_widgets_container.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
-import 'sat_layer.dart';
+import 'satellite_layer.dart';
 import 'stat_charts.dart';
 import '../../consts.dart';
 import 'choropleth_map.dart';
diff --git a/app/lib/widgets/osm_map.dart b/app/lib/widgets/osm_layer.dart
similarity index 93%
rename from app/lib/widgets/osm_map.dart
rename to app/lib/widgets/osm_layer.dart
index 5690c5d2..33b000b6 100644
--- a/app/lib/widgets/osm_map.dart
+++ b/app/lib/widgets/osm_layer.dart
@@ -4,10 +4,10 @@ import 'package:flutter_map/flutter_map.dart';
 import '../../consts.dart';
 import '../data_classes.dart';
 
-class OSMmap extends StatelessWidget {
+class OSM extends StatelessWidget {
   final List<Measurement> markerList;
 
-  const OSMmap({
+  const OSM({
     Key? key,
     required this.markerList,
   }) : super(key: key);
diff --git a/app/lib/widgets/sat_layer.dart b/app/lib/widgets/satellite_layer.dart
similarity index 90%
rename from app/lib/widgets/sat_layer.dart
rename to app/lib/widgets/satellite_layer.dart
index 0e3749eb..a82614bc 100644
--- a/app/lib/widgets/sat_layer.dart
+++ b/app/lib/widgets/satellite_layer.dart
@@ -4,10 +4,10 @@ import 'package:flutter_map/flutter_map.dart';
 
 import '../data_classes.dart';
 
-class SatLayer extends StatelessWidget {
+class SatelliteLayer extends StatelessWidget {
   final List<Measurement> markerList;
 
-  const SatLayer({
+  const SatelliteLayer({
     Key? key,
     required this.markerList,
   }) : super(key: key);
-- 
GitLab