Merge branch 'main' into feat/android-hybrid-composition

josxha · web-flow · commit 9b3e3447e946 · 2024-10-31T22:15:56.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -196,7 +196,7 @@ jobs:
 #          name: maplibre-flutter-demo.app
 #          path: example/build/ios/iphonesimulator
   build-web:
-    name: "Build web"
+    name: "Build Web"
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -215,3 +215,23 @@ jobs:
         run: dart pub get
       - name: Build web
         run: flutter build web
+  build-web-wasm:
+    name: "Build Web WASM"
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: example
+    strategy:
+      fail-fast: false
+      matrix:
+        sdk: [ '3.24.3', '' ]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ matrix.sdk }}
+          cache: true
+      - name: "Get Flutter dependencies"
+        run: dart pub get
+      - name: Build web
+        run: flutter build web --wasm
diff --git a/.github/workflows/flutter-beta.yml b/.github/workflows/flutter-beta.yml
@@ -55,7 +55,7 @@ jobs:
 #          name: maplibre-flutter-demo.app
 #          path: example/build/ios/iphonesimulator
   build-web:
-    name: "Build web"
+    name: "Build Web"
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -67,4 +67,18 @@ jobs:
           channel: ${{ env.FLUTTER_CHANNEL }}
           cache: true
       - name: Build web
-        run: flutter build web
+        run: flutter build web
+  build-web-wasm:
+    name: "Build Web WASM"
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: example
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: ${{ env.FLUTTER_CHANNEL }}
+          cache: true
+      - name: Build web
+        run: flutter build web --wasm
diff --git a/_headers b/_headers
@@ -0,0 +1,3 @@
+/*
+  Cross-Origin-Embedder-Policy: credentialless
+  Cross-Origin-Opener-Policy: same-origin
diff --git a/example/lib/controller_page.dart b/example/lib/controller_page.dart
@@ -147,8 +147,8 @@ pitch: ${camera.pitch}'''),
                   ),
                 ),
                 OutlinedButton(
-                  onPressed: () async {
-                    final region = await _controller.getVisibleRegion();
+                  onPressed: () {
+                    final region = _controller.getVisibleRegion();
                     if (context.mounted) {
                       ScaffoldMessenger.of(context)
                         ..hideCurrentSnackBar()
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -26,6 +26,7 @@ import 'package:maplibre_example/two_maps_page.dart';
 import 'package:maplibre_example/user_interface_page.dart';
 import 'package:maplibre_example/user_location_page.dart';
 import 'package:maplibre_example/web_controls_page.dart';
+import 'package:maplibre_example/widget_layer_page.dart';
 
 void main() {
   runApp(const MyApp());
@@ -53,6 +54,7 @@ class MyApp extends StatelessWidget {
         StyledMapPage.location: (context) => const StyledMapPage(),
         UserLocationPage.location: (context) => const UserLocationPage(),
         UserInterfacePage.location: (context) => const UserInterfacePage(),
+        WidgetLayerPage.location: (context) => const WidgetLayerPage(),
         OfflinePage.location: (context) => const OfflinePage(),
         PermissionsPage.location: (context) => const PermissionsPage(),
         LayersSymbolPage.location: (context) => const LayersSymbolPage(),
diff --git a/example/lib/menu_page.dart b/example/lib/menu_page.dart
@@ -25,6 +25,7 @@ import 'package:maplibre_example/two_maps_page.dart';
 import 'package:maplibre_example/user_interface_page.dart';
 import 'package:maplibre_example/user_location_page.dart';
 import 'package:maplibre_example/web_controls_page.dart';
+import 'package:maplibre_example/widget_layer_page.dart';
 
 class MenuPage extends StatelessWidget {
   const MenuPage({super.key});
@@ -118,6 +119,11 @@ class MenuPage extends StatelessWidget {
                 iconData: Icons.control_point_duplicate_outlined,
                 location: AnnotationsMixedPage.location,
               ),
+              ItemCard(
+                label: 'Widgets',
+                iconData: Icons.location_on,
+                location: WidgetLayerPage.location,
+              ),
               ItemCard(
                 label: 'Circles',
                 iconData: Icons.circle,
diff --git a/example/lib/widget_layer_page.dart b/example/lib/widget_layer_page.dart
@@ -0,0 +1,71 @@
+import 'package:flutter/material.dart';
+import 'package:maplibre/maplibre.dart';
+
+@immutable
+class WidgetLayerPage extends StatefulWidget {
+  const WidgetLayerPage({super.key});
+
+  static const location = '/widget-layer';
+
+  @override
+  State<WidgetLayerPage> createState() => _WidgetLayerPageState();
+}
+
+class _WidgetLayerPageState extends State<WidgetLayerPage> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: const Text('Widget Layer')),
+      body: MapLibreMap(
+        options: MapOptions(
+          initZoom: 3,
+          initCenter: Position(0, 0),
+          attribution: false,
+          nativeCompass: false,
+          nativeLogo: false,
+        ),
+        children: [
+          WidgetLayer(
+            markers: [
+              // A 3D marker
+              Marker(
+                size: const Size.square(50),
+                point: Position(-10, 0),
+                child:
+                    const Icon(Icons.location_on, color: Colors.red, size: 50),
+                alignment: Alignment.bottomCenter,
+              ),
+              Marker(
+                size: const Size.square(50),
+                point: Position(-5, 0),
+                child:
+                    const Icon(Icons.location_on, color: Colors.red, size: 50),
+                alignment: Alignment.bottomCenter,
+                rotate: true,
+              ),
+              Marker(
+                size: const Size.square(50),
+                point: Position(0, 0),
+                child:
+                    const Icon(Icons.location_on, color: Colors.red, size: 50),
+                alignment: Alignment.bottomCenter,
+                flat: true,
+              ),
+              Marker(
+                size: const Size.square(50),
+                point: Position(5, 0),
+                child:
+                    const Icon(Icons.location_on, color: Colors.red, size: 50),
+                alignment: Alignment.bottomCenter,
+                flat: true,
+                rotate: true,
+              ),
+            ],
+          ),
+          // display the UI widgets above the widget markers.
+          const SourceAttribution(),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/maplibre.dart b/lib/maplibre.dart
@@ -21,3 +21,4 @@ export 'src/ui/map_zoom_buttons.dart';
 export 'src/ui/source_attribution.dart';
 export 'src/utils.dart';
 export 'src/web_controls.dart';
+export 'src/widget_layer.dart';
diff --git a/lib/src/map_controller.dart b/lib/src/map_controller.dart
@@ -19,11 +19,21 @@ abstract interface class MapController {
       (throw StateError('Unable to find an instance of MapController'));
 
   /// Convert a latitude/longitude coordinate to a screen location.
+  // TODO: can be made sync when flutter raster and ui thread are merged
   Future<Offset> toScreenLocation(Position lngLat);
 
   /// Get the latitude/longitude coordinate for a screen location.
+  // TODO: can be made sync when flutter raster and ui thread are merged
   Future<Position> toLngLat(Offset screenLocation);
 
+  /// Convert a latitude/longitude coordinate to a screen location.
+  // TODO: can be made sync when flutter raster and ui thread are merged
+  Future<List<Offset>> toScreenLocations(List<Position> lngLats);
+
+  /// Get the latitude/longitude coordinate for a screen location.
+  // TODO: can be made sync when flutter raster and ui thread are merged
+  Future<List<Position>> toLngLats(List<Offset> screenLocations);
+
   /// Instantly move the map camera to a new location.
   Future<void> moveCamera({
     Position? center,
@@ -90,12 +100,14 @@ abstract interface class MapController {
   /// The distance between pixels decreases as the latitude approaches the
   /// poles. This relationship parallels the relationship between longitudinal
   /// coordinates at different latitudes.
+  // TODO: can be made sync when flutter raster and ui thread are merged
   Future<double> getMetersPerPixelAtLatitude(double latitude);
 
   /// Get a list of all attributions from the map style.
   Future<List<String>> getAttributions();
 
   /// The smallest bounding box that includes the visible region.
+  // TODO: can be made sync when flutter raster and ui thread are merged
   Future<LngLatBounds> getVisibleRegion();
 
   /// Add an image to the map.
diff --git a/lib/src/native/extensions.dart b/lib/src/native/extensions.dart
@@ -24,13 +24,21 @@ extension LngLatExt on pigeon.LngLat {
 /// Extension methods for the [jni.LatLng] class. Not exported publicly.
 extension JniLatLngExt on jni.LatLng {
   /// Convert an internal [jni.LatLng] to a [Position].
-  Position toPosition() => Position(getLongitude(), getLatitude());
+  Position toPosition({bool releaseOriginal = false}) {
+    final position = Position(getLongitude(), getLatitude());
+    if (releaseOriginal) release();
+    return position;
+  }
 }
 
 /// Extension methods for the [jni.PointF] class. Not exported publicly.
 extension PointExt on jni.PointF {
   /// Convert an [jni.PointF] to a [Offset].
-  Offset toOffset() => Offset(x, y);
+  Offset toOffset({bool releaseOriginal = false}) {
+    final offset = Offset(x, y);
+    if (releaseOriginal) release();
+    return offset;
+  }
 }
 
 /// Extension methods for the [Offset] class. Not exported publicly.
diff --git a/lib/src/native/widget_state_jni.dart b/lib/src/native/widget_state_jni.dart
@@ -195,23 +195,45 @@ final class MapLibreMapStateJni extends MapLibreMapState
   @override
   Future<Position> toLngLat(Offset screenLocation) async {
     final jniProjection = _jniProjection;
-    final jniLatLng = await runOnPlatformThread<jni.LatLng>(() {
-      return jniProjection.fromScreenLocation(screenLocation.toPointF());
+    return runOnPlatformThread<Position>(() {
+      return jniProjection
+          .fromScreenLocation(screenLocation.toPointF())
+          .toPosition(releaseOriginal: true);
     });
-    final position = jniLatLng.toPosition();
-    jniLatLng.release();
-    return position;
   }
 
   @override
   Future<Offset> toScreenLocation(Position lngLat) async {
     final jniProjection = _jniProjection;
-    final jniPoint = await runOnPlatformThread<jni.PointF>(() {
-      return jniProjection.toScreenLocation(lngLat.toLatLng());
+    return runOnPlatformThread<Offset>(() {
+      return jniProjection
+          .toScreenLocation(lngLat.toLatLng())
+          .toOffset(releaseOriginal: true);
+    });
+  }
+
+  @override
+  Future<List<Position>> toLngLats(List<Offset> screenLocations) async {
+    final jniProjection = _jniProjection;
+    return runOnPlatformThread<List<Position>>(() {
+      return screenLocations.map((screenLocation) {
+        return jniProjection
+            .fromScreenLocation(screenLocation.toPointF())
+            .toPosition(releaseOriginal: true);
+      }).toList(growable: false);
+    });
+  }
+
+  @override
+  Future<List<Offset>> toScreenLocations(List<Position> lngLats) async {
+    final jniProjection = _jniProjection;
+    return runOnPlatformThread<List<Offset>>(() {
+      return lngLats.map((lngLat) {
+        return jniProjection
+            .toScreenLocation(lngLat.toLatLng())
+            .toOffset(releaseOriginal: true);
+      }).toList(growable: false);
     });
-    final position = jniPoint.toOffset();
-    jniPoint.release();
-    return position;
   }
 
   @override
diff --git a/lib/src/platform_interface.dart b/lib/src/platform_interface.dart
@@ -1,7 +1,7 @@
 import 'package:maplibre/maplibre.dart';
 import 'package:maplibre/src/map_state.dart';
-import 'package:maplibre/src/native/platform_impl.dart'
-    if (dart.library.html) 'package:maplibre/src/web/platform_impl.dart';
+import 'package:maplibre/src/web/platform_impl.dart'
+    if (dart.library.io) 'package:maplibre/src/native/platform_impl.dart';
 
 /// https://pub.dev/packages/plugin_platform_interface#a-note-about-base
 abstract base class PlatformInterface {
diff --git a/lib/src/translucent_pointer.dart b/lib/src/translucent_pointer.dart
@@ -0,0 +1,26 @@
+import 'package:flutter/rendering.dart';
+import 'package:flutter/widgets.dart';
+
+/// Use the [TranslucentPointer] to allow the [child] widget to receive gestures
+/// as well as the widgets behind.
+///
+/// This widget is inspired by the
+/// [transparent_pointer](https://pub.dev/packages/transparent_pointer) package.
+class TranslucentPointer extends SingleChildRenderObjectWidget {
+  /// Create a new [TranslucentPointer] widget.
+  const TranslucentPointer({
+    required super.child,
+    super.key,
+  });
+
+  @override
+  RenderProxyBox createRenderObject(BuildContext context) =>
+      _TranslucentPointerRender();
+}
+
+class _TranslucentPointerRender extends RenderProxyBox {
+  _TranslucentPointerRender() : super(null);
+
+  @override
+  bool hitTest(BoxHitTestResult result, {required Offset position}) => false;
+}
diff --git a/lib/src/web/interop/map.dart b/lib/src/web/interop/map.dart
@@ -126,11 +126,11 @@ extension type MapOptions._(JSObject _) implements JSObject {
   external factory MapOptions({
     required String style,
     required JSObject container,
-    double zoom = 0,
-    LngLat? center,
-    double bearing = 0,
-    double pitch = 0,
-    bool attributionControl = true,
+    required double zoom,
+    required LngLat? center,
+    required double bearing,
+    required double pitch,
+    required bool attributionControl,
   });
 }
 
diff --git a/lib/src/web/widget_state.dart b/lib/src/web/widget_state.dart
diff --git a/lib/src/widget_layer.dart b/lib/src/widget_layer.dart

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+/*`
	`2`	`+ Cross-Origin-Embedder-Policy: credentialless`
	`3`	`+ Cross-Origin-Opener-Policy: same-origin`