Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Invalidate stale map viewport results

Neeraj Guptabdbf22d7a6b2
diff --git a/mobile/apps/photos/lib/ui/map/map_screen.dart b/mobile/apps/photos/lib/ui/map/map_screen.dart
index dfd6a2dc13..8c6daa56b5 100644
--- a/mobile/apps/photos/lib/ui/map/map_screen.dart
+++ b/mobile/apps/photos/lib/ui/map/map_screen.dart
@@ -3,6 +3,7 @@ import "dart:isolate";
import "dart:math";
import "package:computer/computer.dart";
+import "package:ente_pure_utils/ente_pure_utils.dart";
import "package:ente_strings/ente_strings.dart";
import "package:ente_ui/components/loading_widget.dart";
import "package:flutter/foundation.dart";
@@ -56,6 +57,10 @@ class _MapScreenState extends State<MapScreen> {
static const bottomSheetDraggableAreaHeight = 32.0;
List<int>? _previousVisibleIndexes;
int _viewportRequestID = 0;
+ final _viewportDebouncer = Debouncer(
+ const Duration(milliseconds: 300),
+ executionInterval: const Duration(milliseconds: 750),
+ );
static const _markerViewportPaddingPixels = 256.0;
@override
@@ -66,6 +71,7 @@ class _MapScreenState extends State<MapScreen> {
@override
void dispose() {
+ _viewportDebouncer.cancelDebounceTimer();
unawaited(_mapWorkerSubscription?.cancel());
_mapWorkerReceivePort?.close();
_mapWorkerIsolate?.kill();
@@ -130,7 +136,7 @@ class _MapScreenState extends State<MapScreen> {
WidgetsBinding.instance.addPostFrameCallback((_) {
if (!mounted) return;
- _requestViewport(mapController.camera);
+ _sendViewportRequest(mapController.camera, ++_viewportRequestID);
});
}
@@ -165,13 +171,20 @@ class _MapScreenState extends State<MapScreen> {
_mapWorkerIsolate = isolate;
}
- void _requestViewport(MapCamera camera) {
+ void _updateViewport(MapCamera camera) {
+ final requestID = ++_viewportRequestID;
+ _viewportDebouncer.run(() async {
+ _sendViewportRequest(camera, requestID);
+ });
+ }
+
+ void _sendViewportRequest(MapCamera camera, int requestID) {
final sendPort = _mapWorkerSendPort;
if (sendPort == null) return;
final pixelBounds = camera.pixelBounds;
sendPort.send(
MapViewportRequest(
- id: ++_viewportRequestID,
+ id: requestID,
bounds: camera.visibleBounds,
zoom: camera.zoom,
markerMinX: pixelBounds.left - _markerViewportPaddingPixels,
@@ -379,7 +392,7 @@ class _MapScreenState extends State<MapScreen> {
: MapView(
controller: mapController,
imageMarkers: imageMarkers,
- updateViewport: _requestViewport,
+ updateViewport: _updateViewport,
center: initialCenter,
initialZoom: widget.initialZoom,
minZoom: minZoom,
diff --git a/mobile/apps/photos/lib/ui/map/map_view.dart b/mobile/apps/photos/lib/ui/map/map_view.dart
index 0f774e29e1..ca6327a774 100644
--- a/mobile/apps/photos/lib/ui/map/map_view.dart
+++ b/mobile/apps/photos/lib/ui/map/map_view.dart
@@ -1,6 +1,5 @@
import "dart:io" show Platform;
-import "package:ente_pure_utils/ente_pure_utils.dart";
import "package:flutter/material.dart";
import "package:flutter_map/flutter_map.dart";
import "package:latlong2/latlong.dart";
@@ -73,10 +72,6 @@ class MapView extends StatefulWidget {
class _MapViewState extends State<MapView> {
late List<Marker> _markers;
- final _debouncer = Debouncer(
- const Duration(milliseconds: 300),
- executionInterval: const Duration(milliseconds: 750),
- );
@override
void initState() {
@@ -93,9 +88,7 @@ class _MapViewState extends State<MapView> {
}
void onChange(MapCamera camera) {
- _debouncer.run(() async {
- widget.updateViewport(camera);
- });
+ widget.updateViewport(camera);
}
@override