From 1cbd985c15d6beb0bffb3bf0dfb5074e013ffba6 Mon Sep 17 00:00:00 2001 From: ImBenji <53883070+YesItsBenji@users.noreply.github.com> Date: Sat, 13 Jul 2024 19:25:15 +0100 Subject: [PATCH] Spring Cleaning --- assets/datasets/destinations.json | 12 ++++++++---- lib/backend/live_information.dart | 3 ++- lib/backend/modules/commands.dart | 1 + lib/backend/modules/tracker.dart | 3 ++- lib/backend/modules/tube_info.dart | 3 +-- lib/remaster/SearchArc.dart | 1 + pubspec.lock | 28 ++++++++++++++-------------- 7 files changed, 29 insertions(+), 22 deletions(-) diff --git a/assets/datasets/destinations.json b/assets/datasets/destinations.json index f2015c1..e23a48b 100644 --- a/assets/datasets/destinations.json +++ b/assets/datasets/destinations.json @@ -633,7 +633,7 @@ }, "Chiswick, Business Park": { "Contributor": "ImBenji", - "Location": "51.4930604, -0.2748696" + "Location": "51.496295432950795, -0.273234913584636" }, "Stamford Brook, Bus Garage": { "Contributor": "ImBenji", @@ -2969,7 +2969,7 @@ }, "Chingford Hatch": { "Contributor": "ImBenji", - "Location": "51.420389, -0.1287668" + "Location": "51.618849324988126, 0.008615860859173277" }, "Highams Park": { "Contributor": "ImBenji", @@ -5009,7 +5009,7 @@ }, "Gunnersbury": { "Contributor": "ImBenji", - "Location": "51.49335199999999, -0.278887" + "Location": "51.49264358318725, -0.27401010394321706" }, "High Barnet": { "Contributor": "ImBenji", @@ -5017,7 +5017,7 @@ }, "Acton": { "Contributor": "ImBenji", - "Location": "51.50837199999999, -0.27444" + "Location": "51.50600598150876, -0.266961842060624" }, "Willesden Green": { "Contributor": "ImBenji", @@ -5266,5 +5266,9 @@ "Limehouse": { "Contributor": "ImBenji", "Location": "51.5110598, -0.0366652" + }, + "Acton Town": { + "Contributor": "ImBenji", + "Location": "51.503057, -0.280303" } } diff --git a/lib/backend/live_information.dart b/lib/backend/live_information.dart index cc746fd..1454407 100644 --- a/lib/backend/live_information.dart +++ b/lib/backend/live_information.dart @@ -15,7 +15,6 @@ import 'package:bus_infotainment/backend/modules/networking.dart'; import 'package:bus_infotainment/backend/modules/synced_time.dart'; import 'package:bus_infotainment/backend/modules/tracker.dart'; import 'package:bus_infotainment/backend/modules/tube_info.dart'; -import 'package:bus_infotainment/tfl_datasets.dart'; import 'package:bus_infotainment/utils/audio%20wrapper.dart'; import 'package:bus_infotainment/utils/delegates.dart'; import 'package:bus_infotainment/workaround/keepalive_realtime.dart'; @@ -25,6 +24,8 @@ import 'package:http/http.dart' as http; import 'package:ntp/ntp.dart'; import 'package:permission_handler/permission_handler.dart'; +import '../tfl_datasets.dart'; + enum RoomConnectionMethod { Cloud, Local, diff --git a/lib/backend/modules/commands.dart b/lib/backend/modules/commands.dart index a365ad5..962eb36 100644 --- a/lib/backend/modules/commands.dart +++ b/lib/backend/modules/commands.dart @@ -4,6 +4,7 @@ import 'dart:convert'; import 'package:bus_infotainment/auth/api_constants.dart'; import 'package:bus_infotainment/backend/live_information.dart'; import 'package:bus_infotainment/tfl_datasets.dart'; + import 'package:bus_infotainment/utils/audio%20wrapper.dart'; import 'package:bus_infotainment/utils/delegates.dart'; import 'package:appwrite/appwrite.dart' as appwrite; diff --git a/lib/backend/modules/tracker.dart b/lib/backend/modules/tracker.dart index d09c041..b966245 100644 --- a/lib/backend/modules/tracker.dart +++ b/lib/backend/modules/tracker.dart @@ -5,13 +5,14 @@ import 'dart:typed_data'; import 'package:bus_infotainment/backend/live_information.dart'; import 'package:bus_infotainment/backend/modules/info_module.dart'; -import 'package:bus_infotainment/tfl_datasets.dart'; import 'package:bus_infotainment/utils/OrdinanceSurveyUtils.dart'; import 'package:bus_infotainment/utils/audio%20wrapper.dart'; import 'package:flutter/foundation.dart'; import 'package:geolocator/geolocator.dart'; import 'package:vector_math/vector_math.dart'; +import '../../tfl_datasets.dart'; + class TrackerModule extends InfoModule { // Constructor diff --git a/lib/backend/modules/tube_info.dart b/lib/backend/modules/tube_info.dart index 32e167d..a40345b 100644 --- a/lib/backend/modules/tube_info.dart +++ b/lib/backend/modules/tube_info.dart @@ -1,11 +1,10 @@ +import 'package:bus_infotainment/tfl_datasets.dart'; import 'package:bus_infotainment/utils/OrdinanceSurveyUtils.dart'; import 'package:bus_infotainment/utils/audio%20wrapper.dart'; import 'package:vector_math/vector_math.dart'; -import '../../tfl_datasets.dart'; - class TubeStations { List stations = []; diff --git a/lib/remaster/SearchArc.dart b/lib/remaster/SearchArc.dart index 26921b4..4eb6b24 100644 --- a/lib/remaster/SearchArc.dart +++ b/lib/remaster/SearchArc.dart @@ -3,6 +3,7 @@ import 'package:bus_infotainment/backend/live_information.dart'; import 'package:bus_infotainment/remaster/dashboard.dart'; import 'package:bus_infotainment/tfl_datasets.dart'; + import 'package:bus_infotainment/utils/OrdinanceSurveyUtils.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; diff --git a/pubspec.lock b/pubspec.lock index 15c0928..2a9af11 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -465,10 +465,10 @@ packages: dependency: "direct main" description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf url: "https://pub.dev" source: hosted - version: "0.18.1" + version: "0.19.0" just_audio: dependency: "direct main" description: @@ -529,26 +529,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "10.0.4" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.3" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" lints: dependency: transitive description: @@ -601,10 +601,10 @@ packages: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.12.0" mgrs_dart: dependency: transitive description: @@ -1046,10 +1046,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" text_scroll: dependency: "direct main" description: @@ -1206,10 +1206,10 @@ packages: dependency: transitive description: name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" url: "https://pub.dev" source: hosted - version: "13.0.0" + version: "14.2.1" web: dependency: transitive description: