Skip to content

Add double-tap to zoom #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnpryan merged 1 commit into from
Jul 31, 2018
Merged

Add double-tap to zoom #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 47 additions & 1 deletion flutter_map/lib/src/gestures/gestures.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import 'package:latlong/latlong.dart';
import 'package:flutter_map/flutter_map.dart';

abstract class MapGestureMixin extends State<FlutterMap>
with SingleTickerProviderStateMixin {
with TickerProviderStateMixin {
static const double _kMinFlingVelocity = 800.0;

LatLng _mapCenterStart;
Expand All @@ -19,15 +19,22 @@ abstract class MapGestureMixin extends State<FlutterMap>
Animation<Offset> _flingAnimation;
Offset _animationOffset = Offset.zero;

AnimationController _doubleTapController;
Animation _doubleTapAnimation;

FlutterMap get widget;
MapState get mapState;
MapState get map => mapState;
MapOptions get options;

@override
void initState() {
super.initState();
_controller = new AnimationController(vsync: this)
..addListener(_handleFlingAnimation);
_doubleTapController = new AnimationController(
vsync: this, duration: Duration(milliseconds: 200))
..addListener(_handleDoubleTapZoomAnimation);
}

void handleScaleStart(ScaleStartDetails details) {
Expand Down Expand Up @@ -111,6 +118,38 @@ abstract class MapGestureMixin extends State<FlutterMap>
options.onTap(latlng);
}

void handleDoubleTap() {
///Currently zooms in the center of the screen
///TODO: change the newCenter to be where the user tapped, see https://github.com/flutter/flutter/issues/10048

_mapZoomStart = map.zoom;
_mapCenterStart = map.center;

double dScale = 2.0;
for (var i = 0; i < 2; i++) {
dScale = math.sqrt(dScale);
}

double newZoom = _mapZoomStart * dScale;

_doubleTapAnimation = new Tween<double>(
begin: _mapZoomStart,
end: newZoom,
)
.chain(new CurveTween(curve: Curves.fastOutSlowIn))
.animate(_doubleTapController);
_doubleTapController
..value = 0.0
..forward();
}

void _handleDoubleTapZoomAnimation() {
var newCenter = map.project(_mapCenterStart);
setState(() {
map.move(map.unproject(newCenter), _doubleTapAnimation.value);
});
}

void _handleFlingAnimation() {
setState(() {
_animationOffset = _flingAnimation.value;
Expand All @@ -128,4 +167,11 @@ abstract class MapGestureMixin extends State<FlutterMap>
Offset _pointToOffset(Point point) {
return new Offset(point.x.toDouble(), point.y.toDouble());
}

@override
void dispose() {
_controller.dispose();
_doubleTapController.dispose();
super.dispose();
}
}
1 change: 1 addition & 0 deletions flutter_map/lib/src/map/flutter_map_state.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class FlutterMapState extends MapGestureMixin {
onScaleUpdate: handleScaleUpdate,
onScaleEnd: handleScaleEnd,
onTapUp: handleTapUp,
onDoubleTap: handleDoubleTap,
child: new Container(
child: new Stack(
children: layerWidgets,
Expand Down