feat: add ability to use meters to size Markers

.github/workflows/branch.yml

@@ -1,7 +1,7 @@
 name: "Branch & PR"
 on:
   push:
-    branches: [ "!master" ]
+    branches: ["!master"]
   pull_request:
   workflow_dispatch:
 
@@ -49,7 +49,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: [ "3.27.0", "" ]
+        sdk: ["3.27.0", ""]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v7
@@ -72,7 +72,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: [ "3.27.0", "" ]
+        sdk: ["3.27.0", ""]
     defaults:
       run:
         working-directory: ./example
@@ -91,7 +91,7 @@ jobs:
           flutter-version: ${{ matrix.sdk }}
           cache: true
       - name: Build Android Application
-        run: flutter build apk --dart-define=COMMIT_SHA=${{ github.sha }} --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
+        run: flutter build apk --dart-define=COMMIT_SHA=${{ github.sha }}
       - name: Archive Artifact
         if: ${{ matrix.sdk == '' }}
         uses: actions/upload-artifact@v7
@@ -106,7 +106,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: [ "3.27.0", "" ]
+        sdk: ["3.41.0", ""] # Can't use 3.27 on github because windows-latest is incompatible now
     defaults:
       run:
         working-directory: ./example
@@ -119,7 +119,7 @@ jobs:
           flutter-version: ${{ matrix.sdk }}
           cache: true
       - name: Build Windows Application
-        run: flutter build windows --dart-define=COMMIT_SHA=${{ github.sha }} --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
+        run: flutter build windows --dart-define=COMMIT_SHA=${{ github.sha }}
       - name: Install Inno Setup
         if: ${{ matrix.sdk == '' }}
         run: choco install innosetup --yes --no-progress
@@ -141,7 +141,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: [ "3.27.0", "" ]
+        sdk: ["3.27.0", ""]
     defaults:
       run:
         working-directory: ./example
@@ -154,7 +154,7 @@ jobs:
           flutter-version: ${{ matrix.sdk }}
           cache: true
       - name: Build Web Application
-        run: flutter build web --wasm --dart-define=COMMIT_SHA=${{ github.sha }} --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
+        run: flutter build web --wasm --dart-define=COMMIT_SHA=${{ github.sha }}
       - name: Archive Artifact
         uses: actions/upload-artifact@v7
         if: ${{ matrix.sdk == '' }}

.github/workflows/master.yml

@@ -31,7 +31,7 @@ jobs:
   build-android:
     name: "Build Android Example App"
     runs-on: ubuntu-latest
-    needs: [ run-tests ]
+    needs: [run-tests]
     if: github.repository == 'fleaflet/flutter_map'
     defaults:
       run:
@@ -44,14 +44,14 @@ jobs:
         with:
           distribution: "temurin"
           java-version: "21"
-          cache: 'gradle'
+          cache: "gradle"
       - name: Setup Flutter Environment
         uses: subosito/flutter-action@v2
         with:
           channel: "stable"
           cache: true
       - name: Build Android Application
-        run: flutter build apk --dart-define=COMMIT_SHA=${{ github.sha }} --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
+        run: flutter build apk --dart-define=COMMIT_SHA=${{ github.sha }}
       - name: Archive Artifact
         uses: actions/upload-artifact@v7
         with:
@@ -62,7 +62,7 @@ jobs:
   build-windows:
     name: "Build Windows Example App"
     runs-on: windows-latest
-    needs: [ run-tests ]
+    needs: [run-tests]
     if: github.repository == 'fleaflet/flutter_map'
     defaults:
       run:
@@ -75,7 +75,7 @@ jobs:
         with:
           cache: true
       - name: Build Windows Application
-        run: flutter build windows --dart-define=COMMIT_SHA=${{ github.sha }} --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
+        run: flutter build windows --dart-define=COMMIT_SHA=${{ github.sha }}
       - name: Install Inno Setup
         run: choco install innosetup --yes --no-progress
       - name: Create Windows Application Installer
@@ -91,7 +91,7 @@ jobs:
   build-web:
     name: "Build & Deploy Web Example App"
     runs-on: ubuntu-latest
-    needs: [ run-tests ]
+    needs: [run-tests]
     if: github.repository == 'fleaflet/flutter_map'
     defaults:
       run:
@@ -105,7 +105,7 @@ jobs:
           channel: "stable"
           cache: true
       - name: Build Web Application
-        run: flutter build web --wasm --dart-define=COMMIT_SHA=${{ github.sha }} --dart-define=flutter.flutter_map.unblockOSM="${{ secrets.UNBLOCK_OSM }}"
+        run: flutter build web --wasm --dart-define=COMMIT_SHA=${{ github.sha }}
       - name: Archive Artifact
         uses: actions/upload-artifact@v7
         with:
@@ -118,4 +118,4 @@ jobs:
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_FLEAFLET }}"
           channelId: live
-          projectId: fleaflet-firebase
+          projectId: fleaflet-firebase

example/lib/pages/many_circles.dart

@@ -99,14 +99,14 @@ class _ManyCirclesPageState extends State<ManyCirclesPage> {
             right: 16,
             child: RepaintBoundary(
               child: Column(
+                spacing: 12,
                 children: [
                   NumberOfItemsSlider(
                     number: displayedCirclesCount,
                     onChanged: (v) => setState(() => displayedCirclesCount = v),
                     maxNumber: _maxCirclesCount,
                     itemDescription: 'Circle',
                   ),
-                  const SizedBox(height: 12),
                   UnconstrainedBox(
                     child: Container(
                       decoration: BoxDecoration(
@@ -117,71 +117,70 @@ class _ManyCirclesPageState extends State<ManyCirclesPage> {
                         vertical: 4,
                         horizontal: 16,
                       ),
-                      child: Row(
-                        children: [
-                          const Tooltip(
-                            message: 'Use Borders',
-                            child: Icon(Icons.circle_outlined),
-                          ),
-                          const SizedBox(width: 8),
-                          Switch.adaptive(
-                            value: useBorders,
-                            onChanged: (v) {
-                              allCircles = allCircles
-                                  .map(
-                                    (c) => CircleMarker(
-                                      point: c.point,
-                                      radius: c.radius,
-                                      color: c.color,
-                                      useRadiusInMeter: c.useRadiusInMeter,
-                                      borderColor: c.borderColor,
-                                      borderStrokeWidth: v ? 5 : 0,
-                                    ),
-                                  )
-                                  .toList(growable: false);
-                              useBorders = v;
-                              setState(() {});
-                            },
-                          ),
-                          const SizedBox(width: 16),
-                          const Tooltip(
-                            message: 'Use Radius In Meters',
-                            child: Icon(Icons.straighten),
-                          ),
-                          const SizedBox(width: 8),
-                          Switch.adaptive(
-                            value: useRadiusInMeters,
-                            onChanged: (v) {
-                              allCircles = allCircles
-                                  .map(
-                                    (c) => CircleMarker(
-                                      point: c.point,
-                                      radius: v ? 25000 : 5,
-                                      color: c.color,
-                                      useRadiusInMeter: v,
-                                      borderColor: c.borderColor,
-                                      borderStrokeWidth: c.borderStrokeWidth,
-                                    ),
-                                  )
-                                  .toList(growable: false);
-                              useRadiusInMeters = v;
-                              setState(() {});
-                            },
-                          ),
-                          const SizedBox(width: 16),
-                          const Tooltip(
-                            message: 'Optimise Meters Radius',
-                            child: Icon(Icons.speed_rounded),
-                          ),
-                          const SizedBox(width: 8),
-                          Switch.adaptive(
-                            value: optimizeRadiusInMeters,
-                            onChanged: useRadiusInMeters
-                                ? (v) =>
-                                    setState(() => optimizeRadiusInMeters = v)
-                                : null,
-                          ),
-                        ],
+                      child: IntrinsicHeight(
+                        child: Row(
+                          spacing: 8,
+                          children: [
+                            const Tooltip(
+                              message: 'Use Borders',
+                              child: Icon(Icons.circle_outlined),
+                            ),
+                            Switch.adaptive(
+                              value: useBorders,
+                              onChanged: (v) {
+                                allCircles = allCircles
+                                    .map(
+                                      (c) => CircleMarker(
+                                        point: c.point,
+                                        radius: c.radius,
+                                        color: c.color,
+                                        useRadiusInMeter: c.useRadiusInMeter,
+                                        borderColor: c.borderColor,
+                                        borderStrokeWidth: v ? 5 : 0,
+                                      ),
+                                    )
+                                    .toList(growable: false);
+                                useBorders = v;
+                                setState(() {});
+                              },
+                            ),
+                            const VerticalDivider(),
+                            const Tooltip(
+                              message: 'Use Radius In Meters',
+                              child: Icon(Icons.straighten),
+                            ),
+                            Switch.adaptive(
+                              value: useRadiusInMeters,
+                              onChanged: (v) {
+                                allCircles = allCircles
+                                    .map(
+                                      (c) => CircleMarker(
+                                        point: c.point,
+                                        radius: v ? 25000 : 5,
+                                        color: c.color,
+                                        useRadiusInMeter: v,
+                                        borderColor: c.borderColor,
+                                        borderStrokeWidth: c.borderStrokeWidth,
+                                      ),
+                                    )
+                                    .toList(growable: false);
+                                useRadiusInMeters = v;
+                                setState(() {});
+                              },
+                            ),
+                            const Tooltip(
+                              message: 'Optimise Meters Radius',
+                              child: Icon(Icons.speed_rounded),
+                            ),
+                            Switch.adaptive(
+                              value: optimizeRadiusInMeters,
+                              onChanged: useRadiusInMeters
+                                  ? (v) =>
+                                      setState(() => optimizeRadiusInMeters = v)
+                                  : null,
+                            ),
+                          ],
+                        ),
                       ),
                     ),
                   ),