Mirrors/nc-photos
1
0
Fork 0
mirror of https://gitlab.com/nkming2/nc-photos.git synced 2025-03-25 00:14:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use actual type for map coord

Browse source
This commit is contained in:
Ming Ming 2024-07-20 03:28:38 +08:00
parent 63eb4d6c88
commit 0d68fdff4a
6 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/lib/widget/viewer_detail_pane.dart
View file

@ -399,7 +399,7 @@ class _ViewerDetailPaneState extends State<ViewerDetailPane> {
final lng = exif.gpsLongitudeDeg; final lng = exif.gpsLongitudeDeg;
if (lat != null && lng != null) { if (lat != null && lng != null) {
_log.fine("GPS: ($lat, $lng)"); _log.fine("GPS: ($lat, $lng)");
_gps = (lat: lat, lng: lng); _gps = MapCoord(lat, lng);
_location = _file!.location; _location = _file!.location;
} }
} }
@ -497,7 +497,7 @@ class _ViewerDetailPaneState extends State<ViewerDetailPane> {
if (getRawPlatform() == NpPlatform.android) { if (getRawPlatform() == NpPlatform.android) {
final intent = AndroidIntent( final intent = AndroidIntent(
action: "action_view", action: "action_view",
data: Uri.encodeFull("geo:${_gps!.lat},${_gps!.lng}?z=16"), data: Uri.encodeFull("geo:${_gps!.latitude},${_gps!.longitude}?z=16"),
); );
intent.launch(); intent.launch();
} }
@ -591,7 +591,7 @@ class _ViewerDetailPaneState extends State<ViewerDetailPane> {
String? _exposureTime; String? _exposureTime;
double? _focalLength; double? _focalLength;
int? _isoSpeedRatings; int? _isoSpeedRatings;
({double lat, double lng})? _gps; MapCoord? _gps;
ImageLocation? _location; ImageLocation? _location;
final _tags = <String>[]; final _tags = <String>[];

1
np_gps_map/lib/np_gps_map.dart
View file

@ -1,3 +1,4 @@
library np_gps_map; library np_gps_map;
export 'src/gps_map.dart'; export 'src/gps_map.dart';
export 'src/map_coord.dart';

3
np_gps_map/lib/src/gps_map.dart
View file

@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:np_gps_map/src/map_coord.dart';
import 'package:np_gps_map/src/native.dart'; import 'package:np_gps_map/src/native.dart';
import 'package:np_gps_map/src/native/google_gps_map.dart' import 'package:np_gps_map/src/native/google_gps_map.dart'
if (dart.library.html) 'package:np_gps_map/src/web/google_gps_map.dart'; if (dart.library.html) 'package:np_gps_map/src/web/google_gps_map.dart';
@ -49,7 +50,7 @@ class GpsMap extends StatelessWidget {
final GpsMapProvider providerHint; final GpsMapProvider providerHint;
/// A pair of latitude and longitude coordinates, stored as degrees /// A pair of latitude and longitude coordinates, stored as degrees
final ({double lat, double lng}) center; final MapCoord center;
final double zoom; final double zoom;
final void Function()? onTap; final void Function()? onTap;

9
np_gps_map/lib/src/map_coord.dart Normal file
View file

@ -0,0 +1,9 @@
class MapCoord {
const MapCoord(this.latitude, this.longitude);
@override
String toString() => "MapCoord {latitude: $latitude, longitude: $longitude}";
final double latitude;
final double longitude;
}

5
np_gps_map/lib/src/native/google_gps_map.dart
View file

@ -1,5 +1,6 @@
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:np_gps_map/src/map_coord.dart';
class GoogleGpsMap extends StatelessWidget { class GoogleGpsMap extends StatelessWidget {
const GoogleGpsMap({ const GoogleGpsMap({
@ -11,7 +12,7 @@ class GoogleGpsMap extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final centerLl = LatLng(center.lat, center.lng); final centerLl = LatLng(center.latitude, center.longitude);
return GoogleMap( return GoogleMap(
compassEnabled: false, compassEnabled: false,
mapToolbarEnabled: false, mapToolbarEnabled: false,
@ -40,7 +41,7 @@ class GoogleGpsMap extends StatelessWidget {
); );
} }
final ({double lat, double lng}) center; final MapCoord center;
final double zoom; final double zoom;
final VoidCallback? onTap; final VoidCallback? onTap;
} }

7
np_gps_map/lib/src/osm_gps_map.dart
View file

@ -1,6 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_map/flutter_map.dart';
import 'package:latlong2/latlong.dart'; import 'package:latlong2/latlong.dart';
import 'package:np_gps_map/src/map_coord.dart';
import 'package:url_launcher/url_launcher_string.dart'; import 'package:url_launcher/url_launcher_string.dart';
class OsmGpsMap extends StatelessWidget { class OsmGpsMap extends StatelessWidget {
@ -14,11 +15,11 @@ class OsmGpsMap extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
const double pinSize = 48; const double pinSize = 48;
final centerLl = LatLng(center.lat, center.lng); final centerLl = LatLng(center.latitude, center.longitude);
return GestureDetector( return GestureDetector(
onTap: () { onTap: () {
launchUrlString( launchUrlString(
"https://www.openstreetmap.org/?mlat=${center.lat}&mlon=${center.lng}#map=${zoom.toInt()}/${center.lat}/${center.lng}", "https://www.openstreetmap.org/?mlat=${center.latitude}&mlon=${center.longitude}#map=${zoom.toInt()}/${center.latitude}/${center.longitude}",
mode: LaunchMode.externalApplication, mode: LaunchMode.externalApplication,
); );
}, },
@ -61,7 +62,7 @@ class OsmGpsMap extends StatelessWidget {
); );
} }
final ({double lat, double lng}) center; final MapCoord center;
final double zoom; final double zoom;
final void Function()? onTap; final void Function()? onTap;
} }