Skip to content

Commit 7eb1aba

Browse files
JaffaKetchupJaffaKetchup
authored
Prepare For v3 (#1355)
* Removed useless `subdomains` properties from examples Updated CHANGELOG Improved pubspec.yaml * Added new maintainer * Added improved support for Flutter 3.3.0 * Set minimum Flutter constraint to 3.3.0 Ignored FVM (@JaffaKetchup's machine)
1 parent 9ef8f68 commit 7eb1aba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+156
-198
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
.buildlog/
99
.history
1010
.svn/
11+
.fvm/
1112

1213
# IntelliJ related
1314
*.iml

‎CHANGELOG.md

+30-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,35 @@
11
# Changelog
22

3-
## [2.2.0] - 2022/XX/XX
3+
## [3.0.0] - 2022/09/04
4+
5+
Contains the following additions/removals:
6+
7+
- Multiple changes - [#1333](https://github.com/fleaflet/flutter_map/pull/1333)
8+
- Removed deprecated APIs from v2
9+
- Removed old layering system
10+
- Added new layering system
11+
- Removed old plugin registration system
12+
- Added `Polygon` label rotation (countered to the map rotation) - [#1332](https://github.com/fleaflet/flutter_map/pull/1332)
13+
14+
Contains the following bug fixes:
15+
16+
- Fixed missing widget sizing to fix multiple issues - [#1334](https://github.com/fleaflet/flutter_map/pull/1334)
17+
- Forced CRS changes to rebuild children - [#1322](https://github.com/fleaflet/flutter_map/issues/1322)
18+
- Allowed map to absorb gesture events correctly within other scrollables - [#1308](https://github.com/fleaflet/flutter_map/issues/1308)
19+
- Improved performance by harnessing the full power of Flutter widgets - [#1165](https://github.com/fleaflet/flutter_map/issues/1165), [#958](https://github.com/fleaflet/flutter_map/issues/958)
20+
21+
In other news:
22+
23+
- @MooNag & @TesteurManiak have joined the maintainer team!
24+
25+
Many thanks to these contributors (in no particular order):
26+
27+
- @MooNag
28+
- @jetpeter
29+
- @Firefishy
30+
- ... and all the maintainers
31+
32+
## [2.2.0] - 2022/08/02
433

534
Contains the following additions/removals:
635

‎example/lib/pages/animated_map_controller.dart

-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ class AnimatedMapControllerPageState extends State<AnimatedMapControllerPage>
183183
TileLayer(
184184
urlTemplate:
185185
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
186-
subdomains: ['a', 'b', 'c'],
187186
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
188187
),
189188
MarkerLayer(markers: markers),

‎example/lib/pages/circle.dart

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ class CirclePage extends StatelessWidget {
4141
TileLayer(
4242
urlTemplate:
4343
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
44-
subdomains: ['a', 'b', 'c'],
4544
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
4645
),
4746
CircleLayer(circles: circleMarkers),

‎example/lib/pages/home.dart

-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ class HomePage extends StatelessWidget {
6767
TileLayer(
6868
urlTemplate:
6969
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
70-
subdomains: ['a', 'b', 'c'],
7170
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
7271
),
7372
MarkerLayer(markers: markers),

‎example/lib/pages/interactive_test_page.dart

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import 'dart:async';
2-
31
import 'package:flutter/material.dart';
42
import 'package:flutter_map/flutter_map.dart';
53
import 'package:flutter_map_example/widgets/drawer.dart';
@@ -17,7 +15,6 @@ class InteractiveTestPage extends StatefulWidget {
1715
}
1816

1917
class _InteractiveTestPageState extends State<InteractiveTestPage> {
20-
2118
// Enable pinchZoom and doubleTapZoomBy by default
2219
int flags = InteractiveFlag.pinchZoom | InteractiveFlag.doubleTapZoom;
2320

@@ -142,9 +139,9 @@ class _InteractiveTestPageState extends State<InteractiveTestPage> {
142139
padding: const EdgeInsets.only(top: 8, bottom: 8),
143140
child: Center(
144141
child: Text(
145-
'Current event: ${_latestEvent?.runtimeType ?? "none"}\nSource: ${_latestEvent?.source ?? "none"}',
146-
textAlign: TextAlign.center,
147-
),
142+
'Current event: ${_latestEvent?.runtimeType ?? "none"}\nSource: ${_latestEvent?.source ?? "none"}',
143+
textAlign: TextAlign.center,
144+
),
148145
),
149146
),
150147
Flexible(
@@ -159,7 +156,6 @@ class _InteractiveTestPageState extends State<InteractiveTestPage> {
159156
TileLayer(
160157
urlTemplate:
161158
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
162-
subdomains: ['a', 'b', 'c'],
163159
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
164160
),
165161
],

‎example/lib/pages/latlng_to_screen_point.dart

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import 'dart:async';
2-
31
import 'package:flutter/material.dart';
42
import 'package:flutter_map/flutter_map.dart';
53
import 'package:flutter_map_example/widgets/drawer.dart';
@@ -58,9 +56,7 @@ class _LatLngScreenPointTestPageState extends State<LatLngScreenPointTestPage> {
5856
),
5957
children: [
6058
TileLayer(
61-
urlTemplate:
62-
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
63-
subdomains: ['a', 'b', 'c'],
59+
urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
6460
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
6561
),
6662
],

‎example/lib/pages/live_location.dart

-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ class _LiveLocationPageState extends State<LiveLocationPage> {
143143
TileLayer(
144144
urlTemplate:
145145
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
146-
subdomains: ['a', 'b', 'c'],
147146
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
148147
),
149148
MarkerLayer(markers: markers),

‎example/lib/pages/many_markers.dart

+1-3
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,7 @@ class _ManyMarkersPageState extends State<ManyMarkersPage> {
7979
),
8080
children: [
8181
TileLayer(
82-
urlTemplate:
83-
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
84-
subdomains: ['a', 'b', 'c'],
82+
urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
8583
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
8684
),
8785
MarkerLayer(

‎example/lib/pages/map_controller.dart

+1-8
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ class MapControllerPageState extends State<MapControllerPage> {
163163
TileLayer(
164164
urlTemplate:
165165
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
166-
subdomains: ['a', 'b', 'c'],
167166
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
168167
),
169168
MarkerLayer(markers: markers),
@@ -218,7 +217,6 @@ class _CurrentLocationState extends State<CurrentLocation> {
218217

219218
void onMapEvent(MapEvent mapEvent) {
220219
if (mapEvent is MapEventMove && mapEvent.id != _eventKey.toString()) {
221-
print("map event ${mapEvent.id}");
222220
setIcon(Icons.gps_not_fixed);
223221
}
224222
}
@@ -235,12 +233,7 @@ class _CurrentLocationState extends State<CurrentLocation> {
235233
id: _eventKey.toString(),
236234
);
237235

238-
if (moved) {
239-
print("moveed");
240-
setIcon(Icons.gps_fixed);
241-
} else {
242-
setIcon(Icons.gps_not_fixed);
243-
}
236+
setIcon(moved ? Icons.gps_fixed : Icons.gps_not_fixed);
244237
} catch (e) {
245238
setIcon(Icons.gps_off);
246239
}

‎example/lib/pages/map_inside_listview.dart

+4-5
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,10 @@ class MapInsideListViewPage extends StatelessWidget {
2929
),
3030
children: [
3131
TileLayer(
32-
urlTemplate:
33-
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
34-
subdomains: ['a', 'b', 'c'],
35-
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
36-
),
32+
urlTemplate:
33+
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
34+
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
35+
),
3736
const FlutterMapZoomButtons(
3837
minZoom: 4,
3938
maxZoom: 19,

‎example/lib/pages/marker_anchor.dart

-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ class MarkerAnchorPageState extends State<MarkerAnchorPage> {
116116
TileLayer(
117117
urlTemplate:
118118
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
119-
subdomains: ['a', 'b', 'c'],
120119
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
121120
),
122121
MarkerLayer(markers: markers),

‎example/lib/pages/marker_rotate.dart

-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ class MarkerRotatePageState extends State<MarkerRotatePage> {
141141
TileLayer(
142142
urlTemplate:
143143
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
144-
subdomains: ['a', 'b', 'c'],
145144
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
146145
),
147146
MarkerLayer(

‎example/lib/pages/max_bounds.dart

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ class MaxBoundsPage extends StatelessWidget {
3535
maxZoom: 15,
3636
urlTemplate:
3737
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
38-
subdomains: ['a', 'b', 'c'],
3938
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
4039
),
4140
],

‎example/lib/pages/moving_markers.dart

-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ class _MovingMarkersPageState extends State<MovingMarkersPage> {
6262
TileLayer(
6363
urlTemplate:
6464
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
65-
subdomains: ['a', 'b', 'c'],
6665
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
6766
),
6867
MarkerLayer(markers: [_marker!]),

‎example/lib/pages/network_tile_provider.dart

-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ class NetworkTileProviderPage extends StatelessWidget {
6868
TileLayer(
6969
urlTemplate:
7070
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
71-
subdomains: ['a', 'b', 'c'],
7271
tileProvider: NetworkTileProvider(),
7372
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
7473
),

‎example/lib/pages/on_tap.dart

-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ class OnTapPageState extends State<OnTapPage> {
8888
TileLayer(
8989
urlTemplate:
9090
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
91-
subdomains: ['a', 'b', 'c'],
9291
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
9392
),
9493
MarkerLayer(markers: markers),

‎example/lib/pages/overlay_image.dart

+1-3
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,9 @@ class OverlayImagePage extends StatelessWidget {
5050
TileLayer(
5151
urlTemplate:
5252
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
53-
subdomains: ['a', 'b', 'c'],
5453
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
5554
),
56-
OverlayImageLayer(
57-
overlayImages: overlayImages),
55+
OverlayImageLayer(overlayImages: overlayImages),
5856
MarkerLayer(markers: [
5957
Marker(
6058
point: topLeftCorner,

‎example/lib/pages/plugin_scalebar.dart

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ class PluginScaleBar extends StatelessWidget {
3838
TileLayer(
3939
urlTemplate:
4040
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
41-
subdomains: ['a', 'b', 'c'],
4241
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
4342
),
4443
],

‎example/lib/pages/plugin_zoombuttons.dart

+19-20
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,26 @@ class PluginZoomButtons extends StatelessWidget {
2020
children: [
2121
Flexible(
2222
child: FlutterMap(
23-
options: MapOptions(
24-
center: LatLng(51.5, -0.09),
25-
zoom: 5,
26-
),
27-
nonRotatedChildren: const [
28-
FlutterMapZoomButtons(
29-
minZoom: 4,
30-
maxZoom: 19,
31-
mini: true,
32-
padding: 10,
33-
alignment: Alignment.bottomRight,
23+
options: MapOptions(
24+
center: LatLng(51.5, -0.09),
25+
zoom: 5,
3426
),
35-
],
36-
children: [
37-
TileLayer(
38-
urlTemplate:
39-
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
40-
subdomains: ['a', 'b', 'c'],
41-
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
42-
),
43-
]),
27+
nonRotatedChildren: const [
28+
FlutterMapZoomButtons(
29+
minZoom: 4,
30+
maxZoom: 19,
31+
mini: true,
32+
padding: 10,
33+
alignment: Alignment.bottomRight,
34+
),
35+
],
36+
children: [
37+
TileLayer(
38+
urlTemplate:
39+
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
40+
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
41+
),
42+
]),
4443
),
4544
],
4645
),

‎example/lib/pages/point_to_latlng.dart

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import 'dart:async';
2-
31
import 'package:flutter/material.dart';
42
import 'package:flutter_map/flutter_map.dart';
53
import 'package:flutter_map_example/widgets/drawer.dart';
@@ -67,9 +65,7 @@ class PointToLatlngPage extends State<PointToLatLngPage> {
6765
),
6866
children: [
6967
TileLayer(
70-
urlTemplate:
71-
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
72-
subdomains: ['a', 'b', 'c'],
68+
urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
7369
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
7470
),
7571
if (latLng != null)

‎example/lib/pages/polygon.dart

+5-8
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ class PolygonPage extends StatelessWidget {
4949
LatLng(59.77, -10.28),
5050
];
5151

52-
5352
return Scaffold(
5453
appBar: AppBar(title: const Text('Polygons')),
5554
drawer: buildDrawer(context, PolygonPage.route),
@@ -71,7 +70,6 @@ class PolygonPage extends StatelessWidget {
7170
TileLayer(
7271
urlTemplate:
7372
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
74-
subdomains: ['a', 'b', 'c'],
7573
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
7674
),
7775
PolygonLayer(polygons: [
@@ -110,12 +108,11 @@ class PolygonPage extends StatelessWidget {
110108
label: "Label!",
111109
),
112110
Polygon(
113-
points: labelRotatedPoints,
114-
borderStrokeWidth: 4,
115-
borderColor: Colors.purple,
116-
label: "Rotated!",
117-
rotateLabel: true
118-
),
111+
points: labelRotatedPoints,
112+
borderStrokeWidth: 4,
113+
borderColor: Colors.purple,
114+
label: "Rotated!",
115+
rotateLabel: true),
119116
]),
120117
],
121118
),

‎example/lib/pages/polyline.dart

+4-3
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,19 @@ class _PolylinePageState extends State<PolylinePage> {
8484
TileLayer(
8585
urlTemplate:
8686
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
87-
subdomains: ['a', 'b', 'c'],
8887
userAgentPackageName:
8988
'dev.fleaflet.flutter_map.example',
9089
),
91-
PolylineLayer(polylines: [
90+
PolylineLayer(
91+
polylines: [
9292
Polyline(
9393
points: points,
9494
strokeWidth: 4,
9595
color: Colors.purple),
9696
],
9797
),
98-
PolylineLayer(polylines: [
98+
PolylineLayer(
99+
polylines: [
99100
Polyline(
100101
points: pointsGradient,
101102
strokeWidth: 4,

‎example/lib/pages/reset_tile_layer.dart

-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ class ResetTileLayerPageState extends State<ResetTileLayerPage> {
7979
TileLayer(
8080
reset: resetController.stream,
8181
urlTemplate: layerToggle ? layer1 : layer2,
82-
subdomains: ['a', 'b', 'c'],
8382
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
8483
),
8584
MarkerLayer(markers: markers)

‎example/lib/pages/scale_layer_plugin_option.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class ScaleLayerPluginOption {
1717
this.lineColor = Colors.white,
1818
this.lineWidth = 2,
1919
this.padding,
20-
}) ;
20+
});
2121
}
2222

2323
class ScaleLayerWidget extends StatelessWidget {

0 commit comments

Comments
 (0)