Fehlerkorrekturen

lib/content_views/approach_area_page.dart

@@ -1,4 +1,3 @@
-import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:isar/isar.dart';
@@ -12,7 +11,6 @@ import 'package:stadtbote/tools/constants.dart';
 import 'package:stadtbote/tools/message_service.dart';
 import 'package:stadtbote/tools/messages/publish_payload_message.dart';
 import 'package:stadtbote/tools/messages/ranking_updated.dart';
-import 'package:stadtbote/tools/mqtt_core.dart';
 
 import '../tools/util.dart';
 

lib/content_views/assigned_jobs_page.dart

@@ -1,4 +1,3 @@
-import 'dart:convert';
 
 import 'package:expandable/expandable.dart';
 import 'package:flutter/material.dart';
@@ -12,7 +11,6 @@ import 'package:stadtbote/protocoll_messages/fin_task_message.dart';
 import 'package:stadtbote/tools/message_service.dart';
 import 'package:stadtbote/tools/messages/publish_payload_message.dart';
 import 'package:stadtbote/tools/messages/refresh_badges_message.dart';
-import 'package:stadtbote/tools/mqtt_core.dart';
 
 import '../main.dart';
 import '../model/job.dart';

lib/content_views/messages_page.dart

@@ -1,4 +1,3 @@
-import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_chat_ui/flutter_chat_ui.dart';
@@ -13,7 +12,6 @@ import 'package:stadtbote/model/session_status.dart';
 import 'package:stadtbote/tools/constants.dart';
 import 'package:stadtbote/tools/message_service.dart';
 import 'package:stadtbote/tools/messages/publish_payload_message.dart';
-import 'package:stadtbote/tools/mqtt_core.dart';
 
 import '../tools/util.dart';
 

lib/popups/accept_jobs_popup.dart

@@ -1,4 +1,3 @@
-import 'dart:convert';
 
 import 'package:expandable/expandable.dart';
 import 'package:flutter/material.dart';
@@ -12,7 +11,6 @@ import 'package:stadtbote/tools/message_service.dart';
 import 'package:stadtbote/tools/messages/job_deleted_message.dart';
 import 'package:stadtbote/tools/messages/job_received_message.dart';
 import 'package:stadtbote/tools/messages/refresh_badges_message.dart';
-import 'package:stadtbote/tools/mqtt_core.dart';
 import 'package:stadtbote/tools/util.dart';
 import 'package:badges/badges.dart' as badges;
 

lib/protocoll_messages/track_message.dart

@@ -2,17 +2,6 @@ import 'package:json_annotation/json_annotation.dart';
 
 part 'track_message.g.dart';
 
-@JsonSerializable()
-class TrackMessage {
-  TrackPosition? pos;
-
-  TrackMessage();
-
-  factory TrackMessage.fromJson(Map<String, dynamic> json) => _$TrackMessageFromJson(json);
-
-  Map<String, dynamic> toJson() => _$TrackMessageToJson(this);
-}
-
 @JsonSerializable()
 class TrackPosition {
   late String time;

lib/protocoll_messages/track_message.g.dart

@@ -6,16 +6,6 @@ part of 'track_message.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-TrackMessage _$TrackMessageFromJson(Map<String, dynamic> json) => TrackMessage()
-  ..pos = json['pos'] == null
-      ? null
-      : TrackPosition.fromJson(json['pos'] as Map<String, dynamic>);
-
-Map<String, dynamic> _$TrackMessageToJson(TrackMessage instance) =>
-    <String, dynamic>{
-      'pos': instance.pos,
-    };
-
 TrackPosition _$TrackPositionFromJson(Map<String, dynamic> json) =>
     TrackPosition()
       ..time = json['time'] as String

lib/tools/mqtt_core.dart

@@ -42,6 +42,7 @@ import 'package:stadtbote/tools/messages/status_info_update.dart';
 
 // ignore: depend_on_referenced_packages
 import 'package:typed_data/typed_buffers.dart';
+// ignore: unused_import
 import 'package:uuid/uuid.dart';
 
 import '../main.dart';
@@ -488,12 +489,11 @@ class MqttCore {
     _trackTimer ??= Timer.periodic(const Duration(seconds: 60), (Timer t) {
       var position = MyApp.currentPosition;
       if (position != null) {
-        var trackMessage = TrackMessage();
+        var trackMessage = TrackPosition();
-        trackMessage.pos = TrackPosition();
+        trackMessage.time = position.timestamp.toIso8601String();
-        trackMessage.pos!.time = position.timestamp.toIso8601String();
+        trackMessage.lat = position.latitude;
-        trackMessage.pos!.lat = position.latitude;
+        trackMessage.long = position.longitude;
-        trackMessage.pos!.long = position.longitude;
+        trackMessage.acc = position.accuracy.toInt();
-        trackMessage.pos!.acc = position.accuracy.toInt();
 
         _publishText("track", jsonEncode(trackMessage.toJson()));
       }