cleanup(transport_helper): privatise functions where possible

lib/transport_helper.dart

@@ -62,12 +62,12 @@ class Route {
   });
 
   /// toMap for Route but it's just route ids for now
-  Map<String, Object?> toMapRoute() {
+  Map<String, Object?> _toMapRoute() {
     return {"id": id, "startstation": startStation, "endstation": endStation};
   }
 
   /// toMap for routesegments relational table
-  List<Map<String, Object?>> toMapRouteSegments() {
+  List<Map<String, Object?>> _toMapRouteSegments() {
     //asMap() apparently enumerates
     List<Map<String, Object?>> tmp = List.empty();
     for (final (segmentIdx, segment) in segments.indexed) {
@@ -110,7 +110,7 @@ class Route {
           json["LegList"]["Leg"][-1]["Origin"]["time"] -
           json["LegList"]["Leg"][0]["Origin"]["time"],
     );
-    newRoute.dbInsert();
+    newRoute._dbInsert();
     return newRoute;
   }
 
@@ -132,17 +132,17 @@ class Route {
 
   void addSegment(Segment newSeg) {
     segments.add(newSeg);
-    dbInsertLastRouteSegment();
+    _dbInsertLastRouteSegment();
   }
 
   void removeLastSegment() {
-    dbDeleteLastRouteSegment();
+    _dbDeleteLastRouteSegment();
     segments.removeLast();
   }
 
   void removeSegmentsTillEnd(int idx) {
     segments.removeRange(idx, segments.length - 1);
-    dbDeleteTrailingRouteSegments(idx);
+    _dbDeleteTrailingRouteSegments(idx);
   }
 
   void _removeSegment(int idx) {
@@ -151,10 +151,10 @@ class Route {
 
   void replaceSegment(int idx, Segment replacement) {
     if ((idx < segments.length - 1 &&
-            replacement.fitsBetween(segments[idx - 1], segments[idx + 1])) ||
+            replacement._fitsBetween(segments[idx - 1], segments[idx + 1])) ||
         replacement.startTime.isAfter(segments[idx - 1].endTime)) {
       segments[idx] = replacement;
-      dbUpdateRouteSegments();
+      _dbUpdateRouteSegments();
     } else if (idx >= segments.length) {
       addSegment(replacement);
     } else {
@@ -190,7 +190,7 @@ class Route {
 
   static Future<Route> dbGet(int id) async {
     Database database = DbHelper.db;
-    Future<List<Segment>> routeSegments = dbGetRouteSegments(id);
+    Future<List<Segment>> routeSegments = _dbGetRouteSegments(id);
     var result = await database.query(
       "route",
       where: "id = ?",
@@ -201,7 +201,7 @@ class Route {
     return route;
   }
 
-  static Future<List<Segment>> dbGetRouteSegments(
+  static Future<List<Segment>> _dbGetRouteSegments(
     int routeId,
   ) async {
     Database database = DbHelper.db;
@@ -214,24 +214,24 @@ class Route {
     return tmp.map((x) => Segment.fromMap(x)).toList();
   }
 
-  void dbInsert() async {
+  void _dbInsert() async {
     Database database = DbHelper.db;
     id = await database.insert(
       "route",
-      toMapRoute(),
+      _toMapRoute(),
       conflictAlgorithm: ConflictAlgorithm.replace,
     );
   }
 
-  void dbInsertLastRouteSegment() async {
+  void _dbInsertLastRouteSegment() async {
     Database database = DbHelper.db;
-    var lastRouteSegment = toMapRouteSegments().last;
+    var lastRouteSegment = _toMapRouteSegments().last;
     database.insert("routesegments", lastRouteSegment);
   }
 
-  void dbInsertRouteSegments() async {
+  void _dbInsertRouteSegments() async {
     Database database = DbHelper.db;
-    var routeSegments = toMapRouteSegments();
+    var routeSegments = _toMapRouteSegments();
     for (var i = 0; i < routeSegments.length; i++) {
       database.insert(
         "routesegments",
@@ -240,20 +240,20 @@ class Route {
     }
   }
 
-  void dbUpdate() async {
+  void _dbUpdate() async {
     Database database = DbHelper.db;
     id = await database.update(
       "route",
-      toMapRoute(),
+      _toMapRoute(),
       where: "id = ?",
       whereArgs: [id],
       conflictAlgorithm: ConflictAlgorithm.replace,
     );
   }
 
-  void dbUpdateRouteSegments() async {
+  void _dbUpdateRouteSegments() async {
     Database database = DbHelper.db;
-    var routeSegments = toMapRouteSegments();
+    var routeSegments = _toMapRouteSegments();
     for (var i = 0; i < routeSegments.length; i++) {
       database.update(
         "routesegments",
@@ -274,7 +274,7 @@ class Route {
     assert(result == 0);
   }
 
-  void dbDeleteRouteSegment(int idx) {
+  void _dbDeleteRouteSegment(int idx) {
     Database database = DbHelper.db;
     database.delete(
       "routesegments",
@@ -283,7 +283,7 @@ class Route {
     );
   }
 
-  void dbDeleteLastRouteSegment() {
+  void _dbDeleteLastRouteSegment() {
     Database database = DbHelper.db;
     database.delete(
       "routesegments",
@@ -292,7 +292,7 @@ class Route {
     );
   }
 
-  void dbDeleteTrailingRouteSegments(int position) {
+  void _dbDeleteTrailingRouteSegments(int position) {
     Database database = DbHelper.db;
     if (position <= segments.length) {
       database.delete(
@@ -358,11 +358,11 @@ class Segment {
     return tmp;
   }
 
-  bool fitsBetween(Segment prev, Segment next) {
+  bool _fitsBetween(Segment prev, Segment next) {
     return startTime.isAfter(prev.endTime) && endTime.isBefore(next.startTime);
   }
 
-  bool sameEndpoints(Segment other) {
+  bool _sameEndpoints(Segment other) {
     return startPoint == other.startPoint && endPoint == other.endPoint;
   }
 
@@ -437,11 +437,11 @@ class Station {
     required this.transportLines,
   });
 
-  Map<String, Object?> toMap() {
+  Map<String, Object?> _toMap() {
     return {"id": id, "name": name};
   }
 
-  List<Map<String, Object?>> toMapLines() {
+  List<Map<String, Object?>> _toMapLines() {
     return transportLines
         .map(
           (line) => {"stationid": id, "lineid": line},
@@ -494,7 +494,7 @@ class Station {
 
   static Future<Station> dbGet(String stationId) async {
     Database database = DbHelper.db;
-    var stationLines = dbGetStationLines(stationId);
+    var stationLines = _dbGetStationLines(stationId);
     var stationMap = await database.query(
       tableName,
       where: "stationid = ?",
@@ -505,7 +505,7 @@ class Station {
     return station;
   }
 
-  static Future<List<Line>> dbGetStationLines(String stationId) async {
+  static Future<List<Line>> _dbGetStationLines(String stationId) async {
     Database database = DbHelper.db;
     var lines = await database.rawQuery("""
         SELECT * FROM lines
@@ -518,12 +518,12 @@ class Station {
 
   void dbInsert() async {
     Database database = DbHelper.db;
-    database.insert(tableName, toMap());
+    database.insert(tableName, _toMap());
   }
 
-  void dbInsertStationLines() async {
+  void _dbInsertStationLines() async {
     Database database = DbHelper.db;
-    var stationLines = toMapLines();
+    var stationLines = _toMapLines();
     for (var i = 0; i < stationLines.length; i++) {
       database.insert("stationlines", stationLines[i]);
     }
@@ -531,12 +531,12 @@ class Station {
 
   void dbUpdate() async {
     Database database = DbHelper.db;
-    database.update(tableName, toMap(), where: "id = ?", whereArgs: [id]);
+    database.update(tableName, _toMap(), where: "id = ?", whereArgs: [id]);
   }
 
   void dbUpdateStationLines() async {
     Database database = DbHelper.db;
-    var stationLines = toMapLines();
+    var stationLines = _toMapLines();
     for (var i = 0; i < stationLines.length; i++) {
       database.update(
         "stationlines",
@@ -553,7 +553,7 @@ class Station {
   }
 
   /// remove all Lines connected to a Station - should be used together with some kind of reparsing.
-  void dbDeleteStationLines() async {
+  void _dbDeleteStationLines() async {
     Database database = DbHelper.db;
     database.delete("stationlines", where: "stationid = ?", whereArgs: [id]);
   }
@@ -570,7 +570,7 @@ class Vehicle {
     required this.vehicleLineId,
   });
 
-  Map<String, Object?> toMap() {
+  Map<String, Object?> _toMap() {
     return {
       "id": id,
       "line": vehicleLineId,
@@ -616,12 +616,12 @@ class Vehicle {
 
   void dbInsert() async {
     Database database = DbHelper.db;
-    database.insert(tableName, toMap());
+    database.insert(tableName, _toMap());
   }
 
   void dbUpdate() async {
     Database database = DbHelper.db;
-    database.update(tableName, toMap(), where: "id=?", whereArgs: [id]);
+    database.update(tableName, _toMap(), where: "id=?", whereArgs: [id]);
   }
 
   void dbDelete() async {
@@ -651,7 +651,7 @@ class Line {
     this.bgColor,
   });
 
-  Map<String, Object?> toMap() {
+  Map<String, Object?> _toMap() {
     return {
       "lineid": lineId,
       "destination": destination,
@@ -720,14 +720,14 @@ class Line {
 
   void dbInsert() async {
     Database database = DbHelper.db;
-    database.insert(tableName, toMap());
+    database.insert(tableName, _toMap());
   }
 
   void dbUpdate() async {
     Database database = DbHelper.db;
     database.update(
       tableName,
-      toMap(),
+      _toMap(),
       where: "lineid = ?",
       whereArgs: [lineId],
     );
@@ -755,7 +755,7 @@ class Departure {
     required this.departureTime,
   });
 
-  Map<String, Object?> toMap() {
+  Map<String, Object?> _toMap() {
     return {
       "id": id,
       "vehicle": vehicleId,
@@ -836,14 +836,14 @@ class Departure {
 
   void dbInsert() async {
     Database database = DbHelper.db;
-    id = await database.insert(tableName, toMap());
+    id = await database.insert(tableName, _toMap());
   }
 
   void dbUpdate() async {
     Database database = DbHelper.db;
     id = await database.update(
       tableName,
-      toMap(),
+      _toMap(),
       where: "id = ?",
       whereArgs: [id],
     );