From cb94aa042af0ae8f4763f2312b329e8777cc425d Mon Sep 17 00:00:00 2001 From: "torok.istvan" Date: Sun, 5 Oct 2025 10:41:07 +0200 Subject: [PATCH] Update flutter_map package and dependencies, remove flutter_map_geojson --- .../presentation/controllers/map_controller.dart | 6 +++--- lib/pages/map/presentation/views/map_view.dart | 2 +- .../controllers/map_survey_controller.dart | 6 +++--- .../presentations/views/mapsurvey_view.dart | 2 +- .../controllers/navigation_controller.dart | 16 ++++++++-------- .../presentation/views/navigation_view.dart | 2 +- pubspec.yaml | 10 +++++----- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/pages/map/presentation/controllers/map_controller.dart b/lib/pages/map/presentation/controllers/map_controller.dart index dfbd0cf..87d1494 100644 --- a/lib/pages/map/presentation/controllers/map_controller.dart +++ b/lib/pages/map/presentation/controllers/map_controller.dart @@ -9,7 +9,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_bluetooth_serial/flutter_bluetooth_serial.dart'; import 'package:flutter_map/flutter_map.dart'; -import 'package:flutter_map_geojson/flutter_map_geojson.dart'; +// import 'package:flutter_map_geojson/flutter_map_geojson.dart'; import 'package:flutter_map_polywidget/flutter_map_polywidget.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; @@ -118,8 +118,8 @@ class MapViewController extends GetxController { late proj4.Projection eovProj, wgsProj; RxBool mapIsInitialized = false.obs; - GeoJsonParser parser = - GeoJsonParser(defaultMarkerColor: const Color.fromARGB(255, 85, 34, 49)); + // GeoJsonParser parser = + // GeoJsonParser(defaultMarkerColor: const Color.fromARGB(255, 85, 34, 49)); final CollectionReference _measuredPoints = FirebaseFirestore.instance.collection('measuredPoints'); diff --git a/lib/pages/map/presentation/views/map_view.dart b/lib/pages/map/presentation/views/map_view.dart index ced0159..18c13f7 100644 --- a/lib/pages/map/presentation/views/map_view.dart +++ b/lib/pages/map/presentation/views/map_view.dart @@ -263,7 +263,7 @@ class MapView extends GetView { ), MarkerLayer( markers: controller.currentLocationMarker), - MarkerLayer(markers: controller.parser.markers), + // MarkerLayer(markers: controller.parser.markers), MarkerLayer( markers: controller.pointsToMeasureMarker), // PolylineLayer( diff --git a/lib/pages/map_survey/presentations/controllers/map_survey_controller.dart b/lib/pages/map_survey/presentations/controllers/map_survey_controller.dart index 820c334..2b2f0e4 100644 --- a/lib/pages/map_survey/presentations/controllers/map_survey_controller.dart +++ b/lib/pages/map_survey/presentations/controllers/map_survey_controller.dart @@ -9,7 +9,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_bluetooth_serial/flutter_bluetooth_serial.dart'; import 'package:flutter_map/flutter_map.dart'; -import 'package:flutter_map_geojson/flutter_map_geojson.dart'; +// import 'package:flutter_map_geojson/flutter_map_geojson.dart'; import 'package:flutter_map_polywidget/flutter_map_polywidget.dart'; import 'package:get/get.dart'; import 'package:intl/intl.dart'; @@ -123,8 +123,8 @@ class MapSurveyController extends GetxController { late proj4.Projection eovProj, wgsProj; RxBool mapIsInitialized = false.obs; - GeoJsonParser parser = - GeoJsonParser(defaultMarkerColor: const Color.fromARGB(255, 85, 34, 49)); + // GeoJsonParser parser = + // GeoJsonParser(defaultMarkerColor: const Color.fromARGB(255, 85, 34, 49)); final CollectionReference _measuredPoints = FirebaseFirestore.instance.collection('measuredPoints'); diff --git a/lib/pages/map_survey/presentations/views/mapsurvey_view.dart b/lib/pages/map_survey/presentations/views/mapsurvey_view.dart index ebb182c..a3a66f7 100644 --- a/lib/pages/map_survey/presentations/views/mapsurvey_view.dart +++ b/lib/pages/map_survey/presentations/views/mapsurvey_view.dart @@ -215,7 +215,7 @@ class MapSurveyView extends GetView { ), MarkerLayer( markers: controller.currentLocationMarker), - MarkerLayer(markers: controller.parser.markers), + // MarkerLayer(markers: controller.parser.markers), MarkerLayer( markers: controller.pointsToMeasureMarker), // PolylineLayer( diff --git a/lib/pages/navigation/presentation/controllers/navigation_controller.dart b/lib/pages/navigation/presentation/controllers/navigation_controller.dart index 7e90165..fc7b507 100644 --- a/lib/pages/navigation/presentation/controllers/navigation_controller.dart +++ b/lib/pages/navigation/presentation/controllers/navigation_controller.dart @@ -9,7 +9,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_bluetooth_serial/flutter_bluetooth_serial.dart'; import 'package:flutter_map/flutter_map.dart'; -import 'package:flutter_map_geojson/flutter_map_geojson.dart'; +// import 'package:flutter_map_geojson/flutter_map_geojson.dart'; import 'package:flutter_map_polywidget/flutter_map_polywidget.dart'; import 'package:get/get.dart'; import 'package:get/get_connect/http/src/utils/utils.dart'; @@ -116,7 +116,7 @@ class NavigationViewController extends GetxController { late proj4.Projection eovProj, wgsProj; RxBool mapIsInitialized = false.obs; - GeoJsonParser parser = GeoJsonParser(defaultMarkerColor: Colors.yellow); + // GeoJsonParser parser = GeoJsonParser(defaultMarkerColor: Colors.yellow); final CollectionReference _vibratorTracker = FirebaseFirestore.instance.collection('vibratorTracker'); @@ -202,8 +202,8 @@ class NavigationViewController extends GetxController { _getInitialLocation(); - String data = await rootBundle.loadString('assets/Files/kozmuvek.geojson'); - parser.parseGeoJsonAsString(data); + // String data = await rootBundle.loadString('assets/Files/kozmuvek.geojson'); + // parser.parseGeoJsonAsString(data); if (await permission_handler.Permission.storage.isGranted) { print("Storage permission is ok ..."); @@ -1023,10 +1023,10 @@ class NavigationViewController extends GetxController { } if (await file!.exists()) { String data = await file.readAsString(); - parser.defaultPolylineColor = Colors.orangeAccent; - parser.defaultPolylineStroke = 5.0; - parser.parseGeoJsonAsString(data); - pathLayer = parser.polylines; + // parser.defaultPolylineColor = Colors.orangeAccent; + // parser.defaultPolylineStroke = 5.0; + // parser.parseGeoJsonAsString(data); + // pathLayer = parser.polylines; } } diff --git a/lib/pages/navigation/presentation/views/navigation_view.dart b/lib/pages/navigation/presentation/views/navigation_view.dart index e44f8c2..3c06d7f 100644 --- a/lib/pages/navigation/presentation/views/navigation_view.dart +++ b/lib/pages/navigation/presentation/views/navigation_view.dart @@ -252,7 +252,7 @@ class NavigationView extends GetView { ), MarkerLayer( markers: controller.currentLocationMarker), - MarkerLayer(markers: controller.parser.markers), + // MarkerLayer(markers: controller.parser.markers), PolylineLayer(polylines: controller.pathLayer), MarkerLayer( markers: controller.pointsToMeasureMarker), diff --git a/pubspec.yaml b/pubspec.yaml index 0e26843..09601e6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -28,7 +28,7 @@ environment: # versions available, run `flutter pub outdated`. dependencies: cupertino_icons: ^1.0.8 - flutter_map: ^7.0.2 + flutter_map: ^8.2.2 flutter_bluetooth_serial: ^0.4.0 get: ^4.7.2 latlong2: ^0.9.1 @@ -36,7 +36,7 @@ dependencies: intl: ^0.20.2 location: ^8.0.0 permission_handler: ^11.4.0 - flutter_map_location_marker: ^9.1.1 + flutter_map_location_marker: ^10.1.0 path_provider: ^2.1.5 rive: ^0.13.20 firebase_core: ^3.12.0 @@ -54,7 +54,7 @@ dependencies: # flutter_iconpicker: ^3.2.2 animated_text_kit: ^4.2.3 package_info_plus: ^8.2.1 - flutter_map_geojson: ^1.0.8 + # flutter_map_geojson: ^1.0.8 # geojson: ^1.0.0 syncfusion_flutter_datagrid: ^28.2.6 syncfusion_flutter_maps: ^28.2.6 @@ -63,8 +63,8 @@ dependencies: connectivity_plus: ^6.1.3 photo_view: ^0.15.0 widget_zoom: ^0.0.4 - supabase_flutter: ^2.8.4 - appwrite: ^14.0.0 + supabase_flutter: ^2.10.2 + appwrite: ^20.0.0 flutter: sdk: flutter