diff --git a/lib/ride/services/audio.dart b/lib/ride/services/audio.dart index 3fc721a5a..bbcdf4d0b 100644 --- a/lib/ride/services/audio.dart +++ b/lib/ride/services/audio.dart @@ -576,7 +576,6 @@ class Audio { int roundedDistance = (ride!.calcDistanceToNextSG! / 25).ceil() * 25; InstructionText instructionText = InstructionText( text: "In $roundedDistance meter $sgType", - type: InstructionTextType.signalGroup, distanceToNextSg: ride!.calcDistanceToNextSG!, ); diff --git a/lib/routing/models/instruction.dart b/lib/routing/models/instruction.dart index 5fcd21056..327f9d90c 100644 --- a/lib/routing/models/instruction.dart +++ b/lib/routing/models/instruction.dart @@ -1,24 +1,7 @@ -/// An enum for the type of the custom instruction -/// This type is derived from the InstructionTextType. -enum InstructionType { - directionOnly, - signalGroupOnly, - directionAndSignalGroup, -} - -/// An enum for the type of the instruction text. -enum InstructionTextType { - direction, - signalGroup, -} - class InstructionText { /// The instruction text. String text; - /// The type of the instruction text. - final InstructionTextType type; - /// The countdown of the instruction /// Only used for InstructionTextType signalGroup. int? countdown; @@ -29,36 +12,10 @@ class InstructionText { /// The distance to the next signal group. double distanceToNextSg = 0; - InstructionText({required this.text, required this.type, this.countdown, required this.distanceToNextSg}); + InstructionText({required this.text, this.countdown, required this.distanceToNextSg}); /// Adds a countdown to the instructionText as well as the current timestamp. void addCountdown(int countdown) { this.countdown = countdown; } } - -class Instruction { - /// The instruction latitude. - final double lat; - - /// The instruction longitude. - final double lon; - - /// The instruction text. - List text; - - /// If the instruction has already been executed. - bool executed = false; - - /// The instruction type. - InstructionType instructionType; - - /// The ID of the corresponding signal group. - String? signalGroupId; - - /// If the instruction has already been concatenated. - bool alreadyConcatenated = false; - - Instruction( - {required this.lat, required this.lon, required this.text, required this.instructionType, this.signalGroupId}); -} diff --git a/lib/routing/services/routing.dart b/lib/routing/services/routing.dart index d6a6c414b..1f6338a06 100644 --- a/lib/routing/services/routing.dart +++ b/lib/routing/services/routing.dart @@ -1,6 +1,5 @@ import 'dart:convert'; -import 'package:collection/collection.dart'; import 'package:flutter/foundation.dart'; import 'package:latlong2/latlong.dart'; import 'package:priobike/home/models/profile.dart'; @@ -12,8 +11,6 @@ import 'package:priobike/positioning/services/positioning.dart'; import 'package:priobike/routing/messages/graphhopper.dart'; import 'package:priobike/routing/messages/sgselector.dart'; import 'package:priobike/routing/models/crossing.dart'; -import 'package:priobike/routing/models/instruction.dart'; -import 'package:priobike/routing/models/navigation.dart'; import 'package:priobike/routing/models/poi.dart'; import 'package:priobike/routing/models/route.dart' as r; import 'package:priobike/routing/models/sg.dart'; @@ -533,213 +530,6 @@ class Routing with ChangeNotifier { notifyListeners(); } - /// Find the waypoint x meters before the current instruction - /// DistanceToInstructionPoint x must be given as an argument. - LatLng? findWaypointMetersBeforeInstruction(int distanceToInstructionPoint, SGSelectorResponse sgSelectorResponse, - int currentNavigationNodeIdx, LatLng? lastInstructionPoint, bool? isFirstInstruction) { - double totalDistanceToInstructionPoint = 0; - LatLng p2 = LatLng( - sgSelectorResponse.route[currentNavigationNodeIdx].lat, sgSelectorResponse.route[currentNavigationNodeIdx].lon); - LatLng p1; - // Iterating backwards from the current navigation node until the first matching node. - for (var j = currentNavigationNodeIdx - 1; j >= 0; j--) { - p1 = LatLng(sgSelectorResponse.route[j].lat, sgSelectorResponse.route[j].lon); - - var distanceToPreviousNavigationNode = Snapper.vincenty.distance(p1, p2); - totalDistanceToInstructionPoint += distanceToPreviousNavigationNode; - - if (lastInstructionPoint?.latitude == p1.latitude && lastInstructionPoint?.longitude == p1.longitude) { - // there is already an instruction at this instruction point - return null; - } - - if (totalDistanceToInstructionPoint == distanceToInstructionPoint) { - return p1; - } else if (totalDistanceToInstructionPoint > distanceToInstructionPoint) { - var distanceBefore = totalDistanceToInstructionPoint - distanceToPreviousNavigationNode; - var remainingDistance = distanceToInstructionPoint - distanceBefore; - // calculate point c between a and b such that distance between b and c is remainingDistance - double bearing = Snapper.vincenty.bearing(p2, p1); - LatLng c = Snapper.vincenty.offset(p2, remainingDistance, bearing); - return c; - } - p2 = p1; - } - return null; - } - - /// Get the text of all GraphHopper instructions that belong to a specific waypoint. - String getGHInstructionTextForWaypoint(GHRouteResponsePath path, NavigationNode waypoint) { - List instructionList = []; - - // Get the GraphHopper coordinates that matches lat and long of current waypoint. - final ghCoordinate = path.points.coordinates - .firstWhereOrNull((element) => element.lat == waypoint.lat && element.lon == waypoint.lon); - - if (ghCoordinate != null) { - final index = path.points.coordinates.indexOf(ghCoordinate); - - // Get all GraphHopper instructions that match the index of the coordinate. - for (final instruction in path.instructions) { - if (instruction.interval.first == index) { - // Skip waypoint instructions and "Dem Straßenverlauf folgen" instruction after a waypoint. - final isWaypoint = instruction.text.startsWith("Wegpunkt"); - - int instructionIndex = path.instructions.indexOf(instruction); - final previousInstruction = instructionIndex > 0 ? path.instructions[instructionIndex - 1] : null; - final isFollowTheRouteInstructionAfterWaypoint = instruction.text.startsWith("Dem Straßenverlauf") && - previousInstruction != null && - previousInstruction.text.startsWith("Wegpunkt"); - - if (!isWaypoint && !isFollowTheRouteInstructionAfterWaypoint) { - instructionList.add(instruction); - } - } - } - } - - // Compose all ghInstructions for waypoint to a single instruction text. - String completeInstructionText = ""; - for (int i = 0; i < instructionList.length; i++) { - completeInstructionText += instructionList[i].text; - if (i < instructionList.length - 1) { - completeInstructionText += " und "; - } - } - - return completeInstructionText; - } - - /// Get the signal group id that belongs to a specific waypoint. - String? getSignalGroupIdForWaypoint(NavigationNode waypoint, bool hasGHInstruction, double? distance) { - if (!hasGHInstruction && waypoint.distanceToNextSignal == 0.0 && waypoint.signalGroupId != null) { - // if waypoint does not belong to a GHInstruction check if there is a sg at the exact point - return waypoint.signalGroupId; - } else if (hasGHInstruction && - waypoint.distanceToNextSignal != null && - waypoint.distanceToNextSignal! <= distance!) { - // if waypoint belongs to a GHInstruction check if there is a sg near the point - return waypoint.signalGroupId; - } - return null; - } - - /// Create the instruction text based on the type of instruction. - List createInstructionText( - bool isFirstCall, - InstructionType instructionType, - String ghInstructionText, - String? signalGroupId, - String laneType, - double distanceToNextSg, - int distanceToNextInstruction) { - String prefix = isFirstCall ? "In $distanceToNextInstruction Metern" : ""; - String sgType = (laneType == "Radfahrer") ? "Radampel" : "Ampel"; - - switch (instructionType) { - case InstructionType.directionOnly: - return [ - InstructionText( - text: "$prefix $ghInstructionText", - type: InstructionTextType.direction, - distanceToNextSg: distanceToNextSg) - ]; - case InstructionType.signalGroupOnly: - return [ - InstructionText( - text: "$prefix $sgType", type: InstructionTextType.signalGroup, distanceToNextSg: distanceToNextSg) - ]; - case InstructionType.directionAndSignalGroup: - return [ - InstructionText( - text: "$prefix $ghInstructionText", - type: InstructionTextType.direction, - distanceToNextSg: distanceToNextSg), - InstructionText(text: sgType, type: InstructionTextType.signalGroup, distanceToNextSg: distanceToNextSg) - ]; - default: - return []; - } - } - - /// Get sgType for a specific signal group id. - String getSGTypeForSignalGroupId(String signalGroupId, SGSelectorResponse sgSelectorResponse) { - final signalGroup = sgSelectorResponse.signalGroups[signalGroupId]; - return signalGroup!.id; - } - - /// Get the actual position of the signal group. - getActualSgPosition(String sgId, SGSelectorResponse sgSelectorResponse) { - final length = sgSelectorResponse.signalGroups[sgId]!.geometry!.length; - final idx = round((length / 2), decimals: 0).toInt(); - return sgSelectorResponse.signalGroups[sgId]!.geometry![idx]; - } - - /// Determine the instruction type after concatenation. - InstructionType getInstructionTypeAfterConcatenation( - InstructionType originalInstructionType, InstructionType addedInstructionType) { - switch (originalInstructionType) { - case InstructionType.signalGroupOnly: - if (addedInstructionType == InstructionType.directionOnly || - addedInstructionType == InstructionType.directionAndSignalGroup) { - return InstructionType.directionAndSignalGroup; - } - return InstructionType.signalGroupOnly; - case InstructionType.directionOnly: - if (addedInstructionType == InstructionType.signalGroupOnly || - addedInstructionType == InstructionType.directionAndSignalGroup) { - return InstructionType.directionAndSignalGroup; - } - return InstructionType.directionOnly; - case InstructionType.directionAndSignalGroup: - return InstructionType.directionAndSignalGroup; - } - } - - /// Concatenate the current instruction with the previous one. - void concatenateInstructions(InstructionType instructionType, String ghInstructionText, String? signalGroupId, - List instructions, String laneType, int? distanceToActualInstructionPoint) { - if (instructions.last.instructionType == InstructionType.signalGroupOnly && - instructionType == InstructionType.signalGroupOnly && - instructions.last.signalGroupId == signalGroupId) { - // Do not concatenate two information about the same signal group. - return; - } - var previousDistToSg = instructions.last.text.last.distanceToNextSg; - var textToConcatenate = - createInstructionText(false, instructionType, ghInstructionText, signalGroupId, laneType, previousDistToSg, 0); - for (int i = 0; i < textToConcatenate.length; i++) { - if (distanceToActualInstructionPoint != null && i == 0) { - textToConcatenate[i].text = "und dann in $distanceToActualInstructionPoint Metern ${textToConcatenate[i].text}"; - } else if (i > 0 && instructionType != InstructionType.directionOnly) { - textToConcatenate[i].text = " ${textToConcatenate[i].text}"; - } else { - textToConcatenate[i].text = "und dann ${textToConcatenate[i].text}"; - } - - instructions.last.text.add(textToConcatenate[i]); - } - if (signalGroupId != null) { - instructions.last.signalGroupId = signalGroupId; - } - instructions.last.alreadyConcatenated = true; - instructions.last.instructionType = - getInstructionTypeAfterConcatenation(instructions.last.instructionType, instructionType); - } - - /// Determine the type of instruction to be created. - InstructionType? getInstructionType(String ghInstructionText, String? signalGroupId) { - if (ghInstructionText.isNotEmpty && signalGroupId != null) { - return InstructionType.directionAndSignalGroup; - } else if (ghInstructionText.isNotEmpty) { - return InstructionType.directionOnly; - } else if (signalGroupId != null) { - return InstructionType.signalGroupOnly; - } else { - return null; - } - } - /// Select a route. Future switchToRoute(int idx) async { if (idx < 0 || idx >= allRoutes!.length) return; diff --git a/lib/settings/services/settings.dart b/lib/settings/services/settings.dart index 441264be6..d48b3b1d4 100644 --- a/lib/settings/services/settings.dart +++ b/lib/settings/services/settings.dart @@ -457,15 +457,15 @@ class Settings with ChangeNotifier { } static const speechRateKey = "priobike.settings.speechRate"; - static const defaultSpeechRateFast = SpeechRate.normal; + static const defaultSpeechRate = SpeechRate.normal; - Future setSpeechRateFast(SpeechRate speechRate, [SharedPreferences? storage]) async { + Future setSpeechRate(SpeechRate speechRate, [SharedPreferences? storage]) async { storage ??= await SharedPreferences.getInstance(); final prev = this.speechRate; this.speechRate = speechRate; final bool success = await storage.setString(speechRateKey, speechRate.name); if (!success) { - log.e("Failed to set speechRateFast to $speechRate"); + log.e("Failed to set speechRate to $speechRate"); this.speechRate = prev; } else { notifyListeners(); @@ -495,7 +495,7 @@ class Settings with ChangeNotifier { this.enableSimulatorMode = defaultSimulatorMode, this.enableLiveTrackingMode = defaultLiveTrackingMode, this.isIncreasedSpeedPrecisionInSpeedometerEnabled = defaultIsIncreasedSpeedPrecisionInSpeedometerEnabled, - this.speechRate = defaultSpeechRateFast, + this.speechRate = defaultSpeechRate, }); /// Load the internal settings from the shared preferences. @@ -538,13 +538,7 @@ class Settings with ChangeNotifier { /* Do nothing and use the default value given by the constructor. */ } try { - audioSpeedAdvisoryInstructionsEnabled = - storage.getBool(audioInstructionsEnabledKey) ?? defaultAudioInstructionsEnabled; - } catch (e) { - /* Do nothing and use the default value given by the constructor. */ - } - try { - speechRate = SpeechRate.values.byName(storage.getString(speechRateKey) ?? defaultSpeechRateFast.name); + speechRate = SpeechRate.values.byName(storage.getString(speechRateKey) ?? defaultSpeechRate.name); } catch (e) { /* Do nothing and use the default value given by the constructor. */ } @@ -588,6 +582,12 @@ class Settings with ChangeNotifier { } catch (e) { /* Do nothing and use the default value given by the constructor. */ } + try { + audioSpeedAdvisoryInstructionsEnabled = + storage.getBool(audioInstructionsEnabledKey) ?? defaultAudioInstructionsEnabled; + } catch (e) { + /* Do nothing and use the default value given by the constructor. */ + } hasLoaded = true; notifyListeners(); diff --git a/lib/settings/views/main.dart b/lib/settings/views/main.dart index a4c65b871..f25ea2215 100644 --- a/lib/settings/views/main.dart +++ b/lib/settings/views/main.dart @@ -215,7 +215,7 @@ class SettingsViewState extends State { /// A callback that is executed when a tracking submission policy is selected. Future onSelectSpeechRate(SpeechRate speechRate) async { // Tell the settings service that we selected the new tracking submission policy. - await settings.setSpeechRateFast(speechRate); + await settings.setSpeechRate(speechRate); if (mounted) Navigator.pop(context); } diff --git a/test/audio_speed_advisory_text_generation.dart b/test/audio_speed_advisory_text_generation.dart index f9e3b1ef4..ff2fec54e 100644 --- a/test/audio_speed_advisory_text_generation.dart +++ b/test/audio_speed_advisory_text_generation.dart @@ -60,7 +60,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -85,7 +84,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -110,7 +108,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -135,7 +132,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -160,7 +156,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -196,7 +191,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -221,7 +215,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -246,7 +239,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -271,7 +263,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -296,7 +287,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -331,7 +321,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -356,7 +345,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -381,7 +369,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -406,7 +393,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -431,7 +417,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -466,7 +451,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -491,7 +475,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -516,7 +499,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -541,7 +523,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -566,7 +547,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -601,7 +581,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -626,7 +605,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -651,7 +629,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -676,7 +653,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -701,7 +677,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -736,7 +711,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -761,7 +735,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -786,7 +759,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -811,7 +783,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -836,7 +807,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -871,7 +841,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -896,7 +865,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -921,7 +889,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -946,7 +913,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -971,7 +937,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -1007,7 +972,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); @@ -1032,7 +996,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); @@ -1057,7 +1020,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); @@ -1082,7 +1044,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); @@ -1107,7 +1068,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); @@ -1142,7 +1102,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); @@ -1167,7 +1126,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); @@ -1192,7 +1150,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); @@ -1217,7 +1174,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); @@ -1242,7 +1198,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); @@ -1277,7 +1232,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); @@ -1302,7 +1256,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); @@ -1327,7 +1280,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); @@ -1352,7 +1304,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); @@ -1377,7 +1328,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); @@ -1412,7 +1362,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); @@ -1437,7 +1386,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); @@ -1462,7 +1410,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); @@ -1487,7 +1434,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); @@ -1512,7 +1458,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); @@ -1544,7 +1489,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); @@ -1577,7 +1521,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -1604,7 +1547,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -1644,7 +1586,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 300 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 300.0, ); @@ -1681,7 +1622,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); @@ -1716,7 +1656,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, ); diff --git a/test/audio_speed_advisory_text_generation_bad_quality.dart b/test/audio_speed_advisory_text_generation_bad_quality.dart index ba2e32d43..b93162bf1 100644 --- a/test/audio_speed_advisory_text_generation_bad_quality.dart +++ b/test/audio_speed_advisory_text_generation_bad_quality.dart @@ -53,7 +53,6 @@ void main() { InstructionText instructionText = InstructionText( text: "In 100 meter Ampel", - type: InstructionTextType.signalGroup, distanceToNextSg: 100.0, );