Skip to content

Commit 0361ef1

Browse files
authored
feat: flutter map v8 (#79)
vector_map_tiles packages not included
1 parent e841ebf commit 0361ef1

File tree

32 files changed

+301
-140
lines changed

32 files changed

+301
-140
lines changed

.github/workflows/on-commit-main.yml

Lines changed: 58 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,14 @@ jobs:
1818
uses: subosito/flutter-action@v2
1919
with:
2020
cache: true
21-
- name: Install melos
22-
run: dart pub global activate melos
23-
- name: Bootstrap melos
24-
run: melos bootstrap
2521
- name: Get dependencies
26-
run: melos run pub_get --no-select
22+
run: flutter pub get
2723
- name: Analyze all projects
2824
run: dart analyze --fatal-infos --fatal-warnings
2925
- name: Format all projects
3026
run: dart format --output=none --set-exit-if-changed .
3127
test:
32-
# run on windows because
33-
runs-on: windows-latest
28+
runs-on: ubuntu-latest
3429
name: Test
3530
steps:
3631
- name: Checkout project
@@ -39,14 +34,40 @@ jobs:
3934
uses: subosito/flutter-action@v2
4035
with:
4136
cache: true
42-
- name: Install melos
43-
run: dart pub global activate melos
44-
- name: Bootstrap melos
45-
run: melos bootstrap
4637
- name: Install coverde
4738
run: dart pub global activate coverde
48-
- name: Run tests with coverage
49-
run: melos run test_with_coverage --no-select
39+
- name: Run Test with Coverage
40+
run: |
41+
rm -rf coverage
42+
cd flutter_map_cache
43+
flutter test --no-pub -r expanded --coverage
44+
coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
45+
cd ..
46+
cd flutter_map_compass
47+
flutter test --no-pub -r expanded --coverage
48+
coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
49+
cd ..
50+
# cd flutter_map_maplibre
51+
# flutter test --no-pub -r expanded --coverage
52+
# coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
53+
# cd ..
54+
cd flutter_map_mbtiles
55+
flutter test --no-pub -r expanded --coverage
56+
coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
57+
cd ..
58+
cd flutter_map_pmtiles
59+
flutter test --no-pub -r expanded --coverage
60+
coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
61+
cd ..
62+
# cd vector_map_tiles_mbtiles
63+
# flutter test --no-pub -r expanded --coverage
64+
# coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
65+
# cd ..
66+
# cd vector_map_tiles_pmtiles
67+
# flutter test --no-pub -r expanded --coverage
68+
# coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
69+
# cd ..
70+
coverde value -i coverage/filtered.lcov.info > coverage/result.txt
5071
- name: Run Codecov
5172
uses: codecov/codecov-action@v5
5273
env:
@@ -61,14 +82,33 @@ jobs:
6182
uses: subosito/flutter-action@v2
6283
with:
6384
cache: true
64-
- name: Install melos
65-
run: dart pub global activate melos
66-
- name: Bootstrap melos
67-
run: melos bootstrap
85+
- name: Get Dependencies
86+
run: flutter pub get
6887
- name: Install pana
6988
run: dart pub global activate pana
7089
- name: Check package score for all
71-
run: melos run package_score --no-select
90+
run: |
91+
cd flutter_map_cache
92+
pana --exit-code-threshold 0 --no-dartdoc .
93+
cd ..
94+
cd flutter_map_compass
95+
pana --exit-code-threshold 0 --no-dartdoc .
96+
cd ..
97+
cd flutter_map_maplibre
98+
pana --exit-code-threshold 0 --no-dartdoc .
99+
cd ..
100+
cd flutter_map_mbtiles
101+
pana --exit-code-threshold 0 --no-dartdoc .
102+
cd ..
103+
cd flutter_map_pmtiles
104+
pana --exit-code-threshold 0 --no-dartdoc .
105+
cd ..
106+
# cd vector_map_tiles_mbtiles
107+
# pana --exit-code-threshold 0 --no-dartdoc .
108+
# cd ..
109+
# cd vector_map_tiles_pmtiles
110+
# pana --exit-code-threshold 0 --no-dartdoc .
111+
# cd ..
72112
build-android:
73113
runs-on: ubuntu-latest
74114
name: Build Android

.github/workflows/on-pull-request.yml

Lines changed: 57 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,8 @@ jobs:
1818
uses: subosito/flutter-action@v2
1919
with:
2020
cache: true
21-
- name: Install melos
22-
run: dart pub global activate melos
23-
- name: Bootstrap melos
24-
run: melos bootstrap
2521
- name: Get dependencies
26-
run: melos run pub_get --no-select
22+
run: flutter pub get
2723
- name: Analyze all projects
2824
run: dart analyze --fatal-infos --fatal-warnings
2925
- name: Format all projects
@@ -38,14 +34,40 @@ jobs:
3834
uses: subosito/flutter-action@v2
3935
with:
4036
cache: true
41-
- name: Install melos
42-
run: dart pub global activate melos
43-
- name: Bootstrap melos
44-
run: melos bootstrap
4537
- name: Install coverde
4638
run: dart pub global activate coverde
47-
- name: Run tests with coverage
48-
run: melos run test_with_coverage --no-select
39+
- name: Run Test with Coverage
40+
run: |
41+
rm -rf coverage
42+
cd flutter_map_cache
43+
flutter test --no-pub -r expanded --coverage
44+
coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
45+
cd ..
46+
cd flutter_map_compass
47+
flutter test --no-pub -r expanded --coverage
48+
coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
49+
cd ..
50+
# cd flutter_map_maplibre
51+
# flutter test --no-pub -r expanded --coverage
52+
# coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
53+
# cd ..
54+
cd flutter_map_mbtiles
55+
flutter test --no-pub -r expanded --coverage
56+
coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
57+
cd ..
58+
cd flutter_map_pmtiles
59+
flutter test --no-pub -r expanded --coverage
60+
coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
61+
cd ..
62+
# cd vector_map_tiles_mbtiles
63+
# flutter test --no-pub -r expanded --coverage
64+
# coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
65+
# cd ..
66+
# cd vector_map_tiles_pmtiles
67+
# flutter test --no-pub -r expanded --coverage
68+
# coverde filter --input ./coverage/lcov.info --output ../coverage/filtered.lcov.info --filters \.g\.dart
69+
# cd ..
70+
coverde value -i coverage/filtered.lcov.info > coverage/result.txt
4971
- name: Run Codecov
5072
uses: codecov/codecov-action@v5
5173
env:
@@ -60,14 +82,33 @@ jobs:
6082
uses: subosito/flutter-action@v2
6183
with:
6284
cache: true
63-
- name: Install melos
64-
run: dart pub global activate melos
65-
- name: Bootstrap melos
66-
run: melos bootstrap
85+
- name: Get Dependencies
86+
run: flutter pub get
6787
- name: Install pana
6888
run: dart pub global activate pana
6989
- name: Check package score for all
70-
run: melos run package_score --no-select
90+
run: |
91+
cd flutter_map_cache
92+
pana --exit-code-threshold 0 --no-dartdoc .
93+
cd ..
94+
cd flutter_map_compass
95+
pana --exit-code-threshold 0 --no-dartdoc .
96+
cd ..
97+
cd flutter_map_maplibre
98+
pana --exit-code-threshold 0 --no-dartdoc .
99+
cd ..
100+
cd flutter_map_mbtiles
101+
pana --exit-code-threshold 0 --no-dartdoc .
102+
cd ..
103+
cd flutter_map_pmtiles
104+
pana --exit-code-threshold 0 --no-dartdoc .
105+
cd ..
106+
# cd vector_map_tiles_mbtiles
107+
# pana --exit-code-threshold 0 --no-dartdoc .
108+
# cd ..
109+
# cd vector_map_tiles_pmtiles
110+
# pana --exit-code-threshold 0 --no-dartdoc .
111+
# cd ..
71112
build-android:
72113
runs-on: ubuntu-latest
73114
name: Build Android

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ functionality of [flutter_map](https://pub.dev/packages/flutter_map).
2323

2424
[![Pub Version](https://img.shields.io/pub/v/flutter_map_cache)](https://pub.dev/packages/flutter_map_cache)
2525
[![likes](https://img.shields.io/pub/likes/flutter_map_cache?logo=flutter)](https://pub.dev/packages/flutter_map_cache)
26-
[![Pub Popularity](https://img.shields.io/pub/popularity/flutter_map_cache)](https://pub.dev/packages/flutter_map_cache)
26+
[![Pub Downloads](https://img.shields.io/pub/dm/flutter_map_cache)](https://pub.dev/packages/flutter_map_cache)
2727

2828
A slim yet powerful caching plugin for flutter_map tile layers. Supports any
2929
storage backend you would possibly want.
@@ -37,7 +37,7 @@ storage backend you would possibly want.
3737

3838
[![Pub Version](https://img.shields.io/pub/v/flutter_map_compass)](https://pub.dev/packages/flutter_map_compass)
3939
[![likes](https://img.shields.io/pub/likes/flutter_map_compass?logo=flutter)](https://pub.dev/packages/flutter_map_compass)
40-
[![Pub Popularity](https://img.shields.io/pub/popularity/flutter_map_compass)](https://pub.dev/packages/flutter_map_compass)
40+
[![Pub Downloads](https://img.shields.io/pub/dm/flutter_map_compass)](https://pub.dev/packages/flutter_map_compass)
4141

4242
A compass for flutter_map that indicates the map rotation. It rotates the map
4343
back to north on top when clicked.
@@ -46,7 +46,7 @@ back to north on top when clicked.
4646

4747
[![Pub Version](https://img.shields.io/pub/v/flutter_map_maplibre)](https://pub.dev/packages/flutter_map_maplibre)
4848
[![likes](https://img.shields.io/pub/likes/flutter_map_maplibre?logo=flutter)](https://pub.dev/packages/flutter_map_maplibre)
49-
[![Pub Popularity](https://img.shields.io/pub/popularity/flutter_map_maplibre)](https://pub.dev/packages/flutter_map_maplibre)
49+
[![Pub Downloads](https://img.shields.io/pub/dm/flutter_map_maplibre)](https://pub.dev/packages/flutter_map_maplibre)
5050

5151
Performant Mapbox Vector Tiles (MVT) support for flutter_map powered by native
5252
MapLibre SDKs.
@@ -55,7 +55,7 @@ MapLibre SDKs.
5555

5656
[![Pub Version](https://img.shields.io/pub/v/flutter_map_mbtiles)](https://pub.dev/packages/flutter_map_mbtiles)
5757
[![likes](https://img.shields.io/pub/likes/flutter_map_mbtiles?logo=flutter)](https://pub.dev/packages/flutter_map_mbtiles)
58-
[![Pub Popularity](https://img.shields.io/pub/popularity/flutter_map_mbtiles)](https://pub.dev/packages/flutter_map_mbtiles)
58+
[![Pub Downloads](https://img.shields.io/pub/dm/flutter_map_mbtiles)](https://pub.dev/packages/flutter_map_mbtiles)
5959

6060
This package provides the `MbTilesTileProvider` that can be used with
6161
flutter_map tile layers.
@@ -68,7 +68,7 @@ flutter_map tile layers.
6868

6969
[![Pub Version](https://img.shields.io/pub/v/flutter_map_pmtiles)](https://pub.dev/packages/flutter_map_pmtiles)
7070
[![likes](https://img.shields.io/pub/likes/flutter_map_pmtiles?logo=flutter)](https://pub.dev/packages/flutter_map_pmtiles)
71-
[![Pub Popularity](https://img.shields.io/pub/popularity/flutter_map_pmtiles)](https://pub.dev/packages/flutter_map_pmtiles)
71+
[![Pub Downloads](https://img.shields.io/pub/dm/flutter_map_pmtiles)](https://pub.dev/packages/flutter_map_pmtiles)
7272

7373
This package provides the `PmTilesTileProvider` that can be used with
7474
flutter_map tile layers.
@@ -84,7 +84,7 @@ flutter_map tile layers.
8484

8585
[![Pub Version](https://img.shields.io/pub/v/vector_map_tiles_mbtiles)](https://pub.dev/packages/vector_map_tiles_mbtiles)
8686
[![likes](https://img.shields.io/pub/likes/vector_map_tiles_mbtiles?logo=flutter)](https://pub.dev/packages/vector_map_tiles_mbtiles)
87-
[![Pub Popularity](https://img.shields.io/pub/popularity/vector_map_tiles_mbtiles)](https://pub.dev/packages/vector_map_tiles_mbtiles)
87+
[![Pub Downloads](https://img.shields.io/pub/dm/vector_map_tiles_mbtiles)](https://pub.dev/packages/vector_map_tiles_mbtiles)
8888

8989
This package provides the `MbTilesVectorTileProvider` that can be used with
9090
the [vector_map_tiles](https://pub.dev/packages/vector_map_tiles) which itself
@@ -98,7 +98,7 @@ adds support for vector tiles to flutter_map.
9898

9999
[![Pub Version](https://img.shields.io/pub/v/vector_map_tiles_pmtiles)](https://pub.dev/packages/vector_map_tiles_pmtiles)
100100
[![likes](https://img.shields.io/pub/likes/vector_map_tiles_pmtiles?logo=flutter)](https://pub.dev/packages/vector_map_tiles_pmtiles)
101-
[![Pub Popularity](https://img.shields.io/pub/popularity/vector_map_tiles_pmtiles)](https://pub.dev/packages/vector_map_tiles_pmtiles)
101+
[![Pub Downloads](https://img.shields.io/pub/dm/vector_map_tiles_pmtiles)](https://pub.dev/packages/vector_map_tiles_pmtiles)
102102

103103
This package provides the `PmTilesVectorTileProvider` that can be used with
104104
the [vector_map_tiles](https://pub.dev/packages/vector_map_tiles) which itself

example/lib/main.dart

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ import 'package:flutter_map_plugins_example/flutter_map_maplibre/page.dart';
88
import 'package:flutter_map_plugins_example/flutter_map_maplibre/page2.dart';
99
import 'package:flutter_map_plugins_example/flutter_map_mbtiles/page.dart';
1010
import 'package:flutter_map_plugins_example/flutter_map_pmtiles/page.dart';
11-
import 'package:flutter_map_plugins_example/vector_map_tiles_mbtiles/page.dart';
12-
import 'package:flutter_map_plugins_example/vector_map_tiles_pmtiles/page.dart';
1311
import 'package:flutter_web_plugins/url_strategy.dart';
1412
import 'package:url_launcher/url_launcher_string.dart';
1513

@@ -35,10 +33,10 @@ class MyApp extends StatelessWidget {
3533
'/flutter_map_pmtiles': (context) => const FlutterMapPmTilesPage(),
3634
'/flutter_map_maplibre': (context) => const MapLibreFlutterMapPage(),
3735
'/flutter_map_maplibre2': (context) => const FlutterMapMapLibrePage(),
38-
'/vector_map_tiles_pmtiles': (context) => VectorMapTilesPmTilesPage(),
36+
// '/vector_map_tiles_pmtiles': (context) => VectorMapTilesPmTilesPage(),
3937
'/flutter_map_mbtiles': (context) => const FlutterMapMbTilesPage(),
40-
'/vector_map_tiles_mbtiles': (context) =>
41-
const VectorMapTilesMbTilesPage(),
38+
// '/vector_map_tiles_mbtiles': (context) =>
39+
// const VectorMapTilesMbTilesPage(),
4240
'/flutter_map_compass': (context) => const FlutterMapCompassPage(),
4341
},
4442
);
@@ -83,25 +81,27 @@ class SelectionPage extends StatelessWidget {
8381
desc: 'PMTiles for flutter_map',
8482
routeName: '/flutter_map_pmtiles',
8583
),
86-
SelectionItemWidget.disabledOnWeb(
87-
title: 'vector_map_tiles_mbtiles',
88-
desc: 'MBTiles for vector_map_files / flutter_map',
89-
routeName: '/vector_map_tiles_mbtiles',
90-
),
91-
SelectionItemWidget.disabledOnWeb(
92-
title: 'vector_map_tiles_pmtiles',
93-
desc: 'PMTiles for vector_map_files / flutter_map',
94-
routeName: '/vector_map_tiles_pmtiles',
95-
),
84+
// SelectionItemWidget.disabledOnWeb(
85+
// title: 'vector_map_tiles_mbtiles',
86+
// desc: 'MBTiles for vector_map_files / flutter_map',
87+
// routeName: '/vector_map_tiles_mbtiles',
88+
// ),
89+
// SelectionItemWidget.disabledOnWeb(
90+
// title: 'vector_map_tiles_pmtiles',
91+
// desc: 'PMTiles for vector_map_files / flutter_map',
92+
// routeName: '/vector_map_tiles_pmtiles',
93+
// ),
9694
];
9795

98-
final width = MediaQuery.sizeOf(context).width;
96+
final width = MediaQuery
97+
.sizeOf(context)
98+
.width;
9999
final githubButton = width < 350
100100
? IconButton(onPressed: _openGithub, icon: const Icon(Icons.link))
101101
: TextButton(
102-
onPressed: _openGithub,
103-
child: const Text('Source Code'),
104-
);
102+
onPressed: _openGithub,
103+
child: const Text('Source Code'),
104+
);
105105
return Scaffold(
106106
appBar: AppBar(
107107
title: const Text('flutter_map_plugins'),
@@ -121,7 +121,8 @@ class SelectionPage extends StatelessWidget {
121121
);
122122
}
123123

124-
void _openGithub() => launchUrlString(
124+
void _openGithub() =>
125+
launchUrlString(
125126
'https://github.com/josxha/flutter_map_plugins',
126127
);
127128
}
@@ -141,7 +142,8 @@ class SelectionItemWidget extends StatelessWidget {
141142
required this.desc,
142143
required this.routeName,
143144
super.key,
144-
}) : disabled = kIsWeb,
145+
})
146+
: disabled = kIsWeb,
145147
disabledMessage = 'Not on web';
146148
static const _titleStyle = TextStyle(
147149
fontSize: 16,
@@ -178,17 +180,17 @@ class SelectionItemWidget extends StatelessWidget {
178180
color: disabled ? Colors.white70 : Colors.white,
179181
child: InkWell(
180182
onTap:
181-
disabled ? null : () => Navigator.of(context).pushNamed(routeName),
183+
disabled ? null : () => Navigator.of(context).pushNamed(routeName),
182184
child: disabled
183185
? ClipRect(
184-
child: Banner(
185-
message: disabledMessage,
186-
textStyle: _bannerTextStyle,
187-
color: Colors.grey,
188-
location: BannerLocation.bottomEnd,
189-
child: content,
190-
),
191-
)
186+
child: Banner(
187+
message: disabledMessage,
188+
textStyle: _bannerTextStyle,
189+
color: Colors.grey,
190+
location: BannerLocation.bottomEnd,
191+
child: content,
192+
),
193+
)
192194
: content,
193195
),
194196
);

example/lib/vector_map_tiles_mbtiles/page.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/*
12
import 'package:flutter/material.dart';
23
import 'package:flutter_map/flutter_map.dart';
34
import 'package:flutter_map_plugins_example/common/utils.dart';
@@ -99,3 +100,4 @@ class _VectorMapTilesMbTilesPageState extends State<VectorMapTilesMbTilesPage> {
99100
super.dispose();
100101
}
101102
}
103+
*/

0 commit comments

Comments
 (0)