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

Update flutter_map package and dependencies, remove flutter_map_geojson

Browse Source
This commit is contained in:
gitea_admin
2025-10-05 10:41:07 +02:00
parent 1293176f89
commit cb94aa042a
7 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/pages/map/presentation/controllers/map_controller.dart
+3 -3
View File
@@ -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');
lib/pages/map/presentation/views/map_view.dart
+1 -1
View File
@@ -263,7 +263,7 @@ class MapView extends GetView<MapViewController> {
),
MarkerLayer(
markers: controller.currentLocationMarker),
MarkerLayer(markers: controller.parser.markers),
// MarkerLayer(markers: controller.parser.markers),
MarkerLayer(
markers: controller.pointsToMeasureMarker),
// PolylineLayer(
lib/pages/map_survey/presentations/controllers/map_survey_controller.dart
+3 -3
View File
@@ -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');
lib/pages/map_survey/presentations/views/mapsurvey_view.dart
+1 -1
View File
@@ -215,7 +215,7 @@ class MapSurveyView extends GetView<MapSurveyController> {
),
MarkerLayer(
markers: controller.currentLocationMarker),
MarkerLayer(markers: controller.parser.markers),
// MarkerLayer(markers: controller.parser.markers),
MarkerLayer(
markers: controller.pointsToMeasureMarker),
// PolylineLayer(
lib/pages/navigation/presentation/controllers/navigation_controller.dart
+8 -8
View File
@@ -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;
}
}
lib/pages/navigation/presentation/views/navigation_view.dart
+1 -1
View File
@@ -252,7 +252,7 @@ class NavigationView extends GetView<NavigationViewController> {
),
MarkerLayer(
markers: controller.currentLocationMarker),
MarkerLayer(markers: controller.parser.markers),
// MarkerLayer(markers: controller.parser.markers),
PolylineLayer(polylines: controller.pathLayer),
MarkerLayer(
markers: controller.pointsToMeasureMarker),