Skip to content
Snippets Groups Projects
Commit 98426c70 authored by Sara Savanovic Djordjevic's avatar Sara Savanovic Djordjevic
Browse files

refactor: file, function, and class names

parent 9967fd92
No related branches found
No related tags found
2 merge requests!9Clhp map,!8Clhp map
...@@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; ...@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
import 'dart:typed_data'; import 'dart:typed_data';
import '../consts.dart'; import '../consts.dart';
import '../widgets/map_widget.dart'; import '../widgets/main_widgets_container.dart';
import '../data_classes.dart'; import '../data_classes.dart';
import '../server_requests/fetch_markers.dart'; import '../server_requests/fetch_markers.dart';
import '../server_requests/fetch_relation.dart'; import '../server_requests/fetch_relation.dart';
...@@ -27,7 +27,7 @@ class _DefaultPageState extends State<DefaultPage> { ...@@ -27,7 +27,7 @@ class _DefaultPageState extends State<DefaultPage> {
void initState() { void initState() {
super.initState(); super.initState();
// Try to fetch measurement data from server // Try to fetch measurement data from server
markerListFuture = fetchMarkerData().then((fetchResult) { markerListFuture = fetchMeasurements().then((fetchResult) {
List<Measurement> measurements = fetchResult.measurements; List<Measurement> measurements = fetchResult.measurements;
serverConnection = fetchResult.connected; serverConnection = fetchResult.connected;
...@@ -44,7 +44,7 @@ class _DefaultPageState extends State<DefaultPage> { ...@@ -44,7 +44,7 @@ class _DefaultPageState extends State<DefaultPage> {
// Schedule fetchMarkerData to run periodically based on fetchInterval from consts // Schedule fetchMarkerData to run periodically based on fetchInterval from consts
const Duration interval = Duration(minutes: fetchInterval); // NB fetchInterval value to be determined const Duration interval = Duration(minutes: fetchInterval); // NB fetchInterval value to be determined
_timer = Timer.periodic(interval, (timer) { _timer = Timer.periodic(interval, (timer) {
fetchMarkerData(); fetchMeasurements();
}); });
} }
......
...@@ -14,8 +14,8 @@ class FetchResult { ...@@ -14,8 +14,8 @@ class FetchResult {
FetchResult(this.measurements, this.connected); FetchResult(this.measurements, this.connected);
} }
// fetchMarkerTemplate requests all marker data from the server /// fetchMarkerData fetches measurement data from the server
Future<FetchResult> fetchMarkerData() async { Future<FetchResult> fetchMeasurements() async {
try { try {
// Custom HTTP client // Custom HTTP client
HttpClient client = HttpClient() HttpClient client = HttpClient()
......
...@@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; ...@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart'; import 'package:google_fonts/google_fonts.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import 'sat_layer.dart'; import 'satellite_layer.dart';
import 'stat_charts.dart'; import 'stat_charts.dart';
import '../../consts.dart'; import '../../consts.dart';
import 'choropleth_map.dart'; import 'choropleth_map.dart';
......
...@@ -4,10 +4,10 @@ import 'package:flutter_map/flutter_map.dart'; ...@@ -4,10 +4,10 @@ import 'package:flutter_map/flutter_map.dart';
import '../../consts.dart'; import '../../consts.dart';
import '../data_classes.dart'; import '../data_classes.dart';
class OSMmap extends StatelessWidget { class OSM extends StatelessWidget {
final List<Measurement> markerList; final List<Measurement> markerList;
const OSMmap({ const OSM({
Key? key, Key? key,
required this.markerList, required this.markerList,
}) : super(key: key); }) : super(key: key);
......
...@@ -4,10 +4,10 @@ import 'package:flutter_map/flutter_map.dart'; ...@@ -4,10 +4,10 @@ import 'package:flutter_map/flutter_map.dart';
import '../data_classes.dart'; import '../data_classes.dart';
class SatLayer extends StatelessWidget { class SatelliteLayer extends StatelessWidget {
final List<Measurement> markerList; final List<Measurement> markerList;
const SatLayer({ const SatelliteLayer({
Key? key, Key? key,
required this.markerList, required this.markerList,
}) : super(key: key); }) : super(key: key);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment