refactor(mobile): maplibre (#6087)

* chore: maplibre gl pubspec * refactor(wip): maplibre for maps * refactor(wip): dual pane + location button * chore: remove flutter_map and deps * refactor(wip): map zoom to location * refactor: location picker * open gallery_viewer on marker tap * remove detectScaleGesture param * test: debounce and throttle * chore: rename get location method * feat(mobile): Adds gps locator to map prompt for easy geolocation (#6282) * Refactored get gps coords * Use var for linter's sake, should handle errors better * Cleanup * Fix linter issues * chore(dep): update maplibre to official lib --------- Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com> Co-authored-by: Joshua Herrera <joshua.herrera227@gmail.com>
2024-01-15 15:26:13 +00:00
parent aa8c54e248
commit e6c0f0e3aa
64 changed files with 2858 additions and 2171 deletions
@@ -96,3 +96,9 @@ extension AssetListExtension on Iterable<Asset> {
    return this;
  }
 }
+
+extension SortedByProperty<T> on Iterable<T> {
+  Iterable<T> sortedByField(Comparable Function(T e) key) {
+    return sorted((a, b) => key(a).compareTo(key(b)));
+  }
+}
@@ -1,67 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_map/flutter_map.dart';
-import 'package:latlong2/latlong.dart';
-import 'dart:math' as math;
-
-extension MoveByBounds on MapController {
-  // TODO: Remove this in favor of built-in method when upgrading flutter_map to 5.0.0
-  LatLng? centerBoundsWithPadding(
-    LatLng coordinates,
-    Offset offset, {
-    double? zoomLevel,
-  }) {
-    const crs = Epsg3857();
-    final oldCenterPt = crs.latLngToPoint(coordinates, zoomLevel ?? zoom);
-    final mapCenterPoint = _rotatePoint(
-      oldCenterPt,
-      oldCenterPt - CustomPoint(offset.dx, offset.dy),
-    );
-    return crs.pointToLatLng(mapCenterPoint, zoomLevel ?? zoom);
-  }
-
-  CustomPoint<double> _rotatePoint(
-    CustomPoint<double> mapCenter,
-    CustomPoint<double> point, {
-    bool counterRotation = true,
-  }) {
-    final counterRotationFactor = counterRotation ? -1 : 1;
-
-    final m = Matrix4.identity()
-      ..translate(mapCenter.x, mapCenter.y)
-      ..rotateZ(degToRadian(rotation) * counterRotationFactor)
-      ..translate(-mapCenter.x, -mapCenter.y);
-
-    final tp = MatrixUtils.transformPoint(m, Offset(point.x, point.y));
-
-    return CustomPoint(tp.dx, tp.dy);
-  }
-
-  double getTapThresholdForZoomLevel() {
-    const scale = [
-      25000000,
-      15000000,
-      8000000,
-      4000000,
-      2000000,
-      1000000,
-      500000,
-      250000,
-      100000,
-      50000,
-      25000,
-      15000,
-      8000,
-      4000,
-      2000,
-      1000,
-      500,
-      250,
-      100,
-      50,
-      25,
-      10,
-      5,
-    ];
-    return scale[math.max(0, math.min(20, zoom.round() + 2))].toDouble() / 6;
-  }
-}
@@ -0,0 +1,20 @@
+import 'package:maplibre_gl/maplibre_gl.dart';
+
+extension WithinBounds on LatLngBounds {
+  /// Checks whether [point] is inside bounds
+  bool contains(LatLng point) {
+    final sw = point;
+    final ne = point;
+    return containsBounds(LatLngBounds(southwest: sw, northeast: ne));
+  }
+
+  /// Checks whether [bounds] is contained inside bounds
+  bool containsBounds(LatLngBounds bounds) {
+    final sw = bounds.southwest;
+    final ne = bounds.northeast;
+    return (sw.latitude >= southwest.latitude) &&
+        (ne.latitude <= northeast.latitude) &&
+        (sw.longitude >= southwest.longitude) &&
+        (ne.longitude <= northeast.longitude);
+  }
+}
@@ -0,0 +1,71 @@
+import 'dart:math';
+
+import 'package:flutter/services.dart';
+import 'package:immich_mobile/modules/map/models/map_marker.dart';
+import 'package:immich_mobile/modules/map/utils/map_utils.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
+
+extension MapMarkers on MaplibreMapController {
+  Future<void> addGeoJSONSourceForMarkers(List<MapMarker> markers) async {
+    return addSource(
+      MapUtils.defaultSourceId,
+      GeojsonSourceProperties(
+        data: MapUtils.generateGeoJsonForMarkers(markers.toList()),
+      ),
+    );
+  }
+
+  Future<void> reloadAllLayersForMarkers(List<MapMarker> markers) async {
+    // !! Make sure to remove layers before sources else the native
+    // maplibre library would crash when removing the source saying that
+    // the source is still in use
+    final existingLayers = await getLayerIds();
+    if (existingLayers.contains(MapUtils.defaultHeatMapLayerId)) {
+      await removeLayer(MapUtils.defaultHeatMapLayerId);
+    }
+
+    final existingSources = await getSourceIds();
+    if (existingSources.contains(MapUtils.defaultSourceId)) {
+      await removeSource(MapUtils.defaultSourceId);
+    }
+
+    await addGeoJSONSourceForMarkers(markers);
+
+    await addHeatmapLayer(
+      MapUtils.defaultSourceId,
+      MapUtils.defaultHeatMapLayerId,
+      MapUtils.defaultHeatMapLayerProperties,
+    );
+  }
+
+  Future<Symbol?> addMarkerAtLatLng(LatLng centre) async {
+    // no marker is displayed if asset-path is incorrect
+    try {
+      final ByteData bytes = await rootBundle.load("assets/location-pin.png");
+      await addImage("mapMarker", bytes.buffer.asUint8List());
+      return addSymbol(
+        SymbolOptions(
+          geometry: centre,
+          iconImage: "mapMarker",
+          iconSize: 0.15,
+          iconAnchor: "bottom",
+        ),
+      );
+    } finally {
+      // no-op
+    }
+  }
+
+  Future<LatLngBounds> getBoundsFromPoint(
+    Point<double> point,
+    double distance,
+  ) async {
+    final southWestPx = Point(point.x - distance, point.y + distance);
+    final northEastPx = Point(point.x + distance, point.y - distance);
+
+    final southWest = await toLatLng(southWestPx);
+    final northEast = await toLatLng(northEastPx);
+
+    return LatLngBounds(southwest: southWest, northeast: northEast);
+  }
+}