Skip to content

redacted fix of polyline overlap issue by avioli #67

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 6, 2018
Merged

redacted fix of polyline overlap issue by avioli #67

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
25 changes: 19 additions & 6 deletions flutter_map/lib/src/layer/polyline_layer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import 'dart:ui';

import 'package:flutter/widgets.dart';
import 'package:flutter_map/flutter_map.dart';
import 'package:flutter_map/src/map/map.dart';
import 'package:latlong/latlong.dart';
import 'package:flutter_map/flutter_map.dart';
import 'dart:ui';

class PolylineLayerOptions extends LayerOptions {
final List<Polyline> polylines;
Expand All @@ -27,6 +28,15 @@ class PolylineLayer extends StatelessWidget {
PolylineLayer(this.polylineOpts, this.map);

Widget build(BuildContext context) {
return new LayoutBuilder(
builder: (BuildContext context, BoxConstraints bc) {
final size = new Size(bc.maxWidth, bc.maxHeight);
return _build(context, size);
},
);
}

Widget _build(BuildContext context, Size size) {
return new StreamBuilder<int>(
stream: map.onMoved, // a Stream<int> or null
builder: (BuildContext context, _) {
Expand All @@ -35,8 +45,7 @@ class PolylineLayer extends StatelessWidget {
var i = 0;
for (var point in polylineOpt.points) {
var pos = map.project(point);
pos = pos.multiplyBy(map.getZoomScale(map.zoom, map.zoom)) -
map.getPixelOrigin();
pos = pos.multiplyBy(map.getZoomScale(map.zoom, map.zoom)) - map.getPixelOrigin();
polylineOpt.offsets.add(new Offset(pos.x.toDouble(), pos.y.toDouble()));
if (i > 0 && i < polylineOpt.points.length) {
polylineOpt.offsets.add(new Offset(pos.x.toDouble(), pos.y.toDouble()));
Expand All @@ -50,6 +59,7 @@ class PolylineLayer extends StatelessWidget {
polylines.add(
new CustomPaint(
painter: new PolylinePainter(polylineOpt),
size: size,
),
);
}
Expand All @@ -73,8 +83,11 @@ class PolylinePainter extends CustomPainter {
if (polylineOpt.offsets.isEmpty) {
return;
}
var paint = new Paint()..color = polylineOpt.color;
paint.strokeWidth = polylineOpt.strokeWidth;
final rect = Offset.zero & size;
canvas.clipRect(rect);
final paint = new Paint()
..color = polylineOpt.color
..strokeWidth = polylineOpt.strokeWidth;
canvas.drawPoints(PointMode.lines, polylineOpt.offsets, paint);
}

Expand Down