GNSS/MobilApp
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Update flutter_map package and dependencies, remove flutter_map_geojson

Browse Source
This commit is contained in:
torok.istvan 2025-10-05 10:41:07 +02:00
parent 1293176f89
commit cb94aa042a
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pages/map/presentation/controllers/map_controller.dart
View File

@ -9,7 +9,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_bluetooth_serial/flutter_bluetooth_serial.dart'; import 'package:flutter_bluetooth_serial/flutter_bluetooth_serial.dart';
import 'package:flutter_map/flutter_map.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:flutter_map_polywidget/flutter_map_polywidget.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
@ -118,8 +118,8 @@ class MapViewController extends GetxController {
late proj4.Projection eovProj, wgsProj; late proj4.Projection eovProj, wgsProj;
RxBool mapIsInitialized = false.obs; RxBool mapIsInitialized = false.obs;
GeoJsonParser parser = // GeoJsonParser parser =
GeoJsonParser(defaultMarkerColor: const Color.fromARGB(255, 85, 34, 49)); // GeoJsonParser(defaultMarkerColor: const Color.fromARGB(255, 85, 34, 49));
final CollectionReference _measuredPoints = final CollectionReference _measuredPoints =
FirebaseFirestore.instance.collection('measuredPoints'); FirebaseFirestore.instance.collection('measuredPoints');

2
lib/pages/map/presentation/views/map_view.dart
View File

@ -263,7 +263,7 @@ class MapView extends GetView<MapViewController> {
), ),
MarkerLayer( MarkerLayer(
markers: controller.currentLocationMarker), markers: controller.currentLocationMarker),
MarkerLayer(markers: controller.parser.markers), // MarkerLayer(markers: controller.parser.markers),
MarkerLayer( MarkerLayer(
markers: controller.pointsToMeasureMarker), markers: controller.pointsToMeasureMarker),
// PolylineLayer( // PolylineLayer(

6
lib/pages/map_survey/presentations/controllers/map_survey_controller.dart
View File

@ -9,7 +9,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_bluetooth_serial/flutter_bluetooth_serial.dart'; import 'package:flutter_bluetooth_serial/flutter_bluetooth_serial.dart';
import 'package:flutter_map/flutter_map.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:flutter_map_polywidget/flutter_map_polywidget.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
@ -123,8 +123,8 @@ class MapSurveyController extends GetxController {
late proj4.Projection eovProj, wgsProj; late proj4.Projection eovProj, wgsProj;
RxBool mapIsInitialized = false.obs; RxBool mapIsInitialized = false.obs;
GeoJsonParser parser = // GeoJsonParser parser =
GeoJsonParser(defaultMarkerColor: const Color.fromARGB(255, 85, 34, 49)); // GeoJsonParser(defaultMarkerColor: const Color.fromARGB(255, 85, 34, 49));
final CollectionReference _measuredPoints = final CollectionReference _measuredPoints =
FirebaseFirestore.instance.collection('measuredPoints'); FirebaseFirestore.instance.collection('measuredPoints');

2
lib/pages/map_survey/presentations/views/mapsurvey_view.dart
View File

@ -215,7 +215,7 @@ class MapSurveyView extends GetView<MapSurveyController> {
), ),
MarkerLayer( MarkerLayer(
markers: controller.currentLocationMarker), markers: controller.currentLocationMarker),
MarkerLayer(markers: controller.parser.markers), // MarkerLayer(markers: controller.parser.markers),
MarkerLayer( MarkerLayer(
markers: controller.pointsToMeasureMarker), markers: controller.pointsToMeasureMarker),
// PolylineLayer( // PolylineLayer(

16
lib/pages/navigation/presentation/controllers/navigation_controller.dart
View File

@ -9,7 +9,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_bluetooth_serial/flutter_bluetooth_serial.dart'; import 'package:flutter_bluetooth_serial/flutter_bluetooth_serial.dart';
import 'package:flutter_map/flutter_map.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:flutter_map_polywidget/flutter_map_polywidget.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:get/get_connect/http/src/utils/utils.dart'; import 'package:get/get_connect/http/src/utils/utils.dart';
@ -116,7 +116,7 @@ class NavigationViewController extends GetxController {
late proj4.Projection eovProj, wgsProj; late proj4.Projection eovProj, wgsProj;
RxBool mapIsInitialized = false.obs; RxBool mapIsInitialized = false.obs;
GeoJsonParser parser = GeoJsonParser(defaultMarkerColor: Colors.yellow); // GeoJsonParser parser = GeoJsonParser(defaultMarkerColor: Colors.yellow);
final CollectionReference _vibratorTracker = final CollectionReference _vibratorTracker =
FirebaseFirestore.instance.collection('vibratorTracker'); FirebaseFirestore.instance.collection('vibratorTracker');
@ -202,8 +202,8 @@ class NavigationViewController extends GetxController {
_getInitialLocation(); _getInitialLocation();
String data = await rootBundle.loadString('assets/Files/kozmuvek.geojson'); // String data = await rootBundle.loadString('assets/Files/kozmuvek.geojson');
parser.parseGeoJsonAsString(data); // parser.parseGeoJsonAsString(data);
if (await permission_handler.Permission.storage.isGranted) { if (await permission_handler.Permission.storage.isGranted) {
print("Storage permission is ok ..."); print("Storage permission is ok ...");
@ -1023,10 +1023,10 @@ class NavigationViewController extends GetxController {
} }
if (await file!.exists()) { if (await file!.exists()) {
String data = await file.readAsString(); String data = await file.readAsString();
parser.defaultPolylineColor = Colors.orangeAccent; // parser.defaultPolylineColor = Colors.orangeAccent;
parser.defaultPolylineStroke = 5.0; // parser.defaultPolylineStroke = 5.0;
parser.parseGeoJsonAsString(data); // parser.parseGeoJsonAsString(data);
pathLayer = parser.polylines; // pathLayer = parser.polylines;
} }
} }

2
lib/pages/navigation/presentation/views/navigation_view.dart
View File

@ -252,7 +252,7 @@ class NavigationView extends GetView<NavigationViewController> {
), ),
MarkerLayer( MarkerLayer(
markers: controller.currentLocationMarker), markers: controller.currentLocationMarker),
MarkerLayer(markers: controller.parser.markers), // MarkerLayer(markers: controller.parser.markers),
PolylineLayer(polylines: controller.pathLayer), PolylineLayer(polylines: controller.pathLayer),
MarkerLayer( MarkerLayer(
markers: controller.pointsToMeasureMarker), markers: controller.pointsToMeasureMarker),

10
pubspec.yaml
View File

@ -28,7 +28,7 @@ environment:
# versions available, run `flutter pub outdated`. # versions available, run `flutter pub outdated`.
dependencies: dependencies:
cupertino_icons: ^1.0.8 cupertino_icons: ^1.0.8
flutter_map: ^7.0.2 flutter_map: ^8.2.2
flutter_bluetooth_serial: ^0.4.0 flutter_bluetooth_serial: ^0.4.0
get: ^4.7.2 get: ^4.7.2
latlong2: ^0.9.1 latlong2: ^0.9.1
@ -36,7 +36,7 @@ dependencies:
intl: ^0.20.2 intl: ^0.20.2
location: ^8.0.0 location: ^8.0.0
permission_handler: ^11.4.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 path_provider: ^2.1.5
rive: ^0.13.20 rive: ^0.13.20
firebase_core: ^3.12.0 firebase_core: ^3.12.0
@ -54,7 +54,7 @@ dependencies:
# flutter_iconpicker: ^3.2.2 # flutter_iconpicker: ^3.2.2
animated_text_kit: ^4.2.3 animated_text_kit: ^4.2.3
package_info_plus: ^8.2.1 package_info_plus: ^8.2.1
flutter_map_geojson: ^1.0.8 # flutter_map_geojson: ^1.0.8
# geojson: ^1.0.0 # geojson: ^1.0.0
syncfusion_flutter_datagrid: ^28.2.6 syncfusion_flutter_datagrid: ^28.2.6
syncfusion_flutter_maps: ^28.2.6 syncfusion_flutter_maps: ^28.2.6
@ -63,8 +63,8 @@ dependencies:
connectivity_plus: ^6.1.3 connectivity_plus: ^6.1.3
photo_view: ^0.15.0 photo_view: ^0.15.0
widget_zoom: ^0.0.4 widget_zoom: ^0.0.4
supabase_flutter: ^2.8.4 supabase_flutter: ^2.10.2
appwrite: ^14.0.0 appwrite: ^20.0.0
flutter: flutter:
sdk: flutter sdk: flutter