Merge pull request #4 from DISCOOS/issue/150

Merge Issue/150 to master
fleaflet · Oct 26, 2018 · 47b3b1a · 47b3b1a
2 parents 3ed9b8b + 747333c
commit 47b3b1a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/src/layer/circle_layer.dart b/lib/src/layer/circle_layer.dart
@@ -7,7 +7,8 @@ import 'package:latlong/latlong.dart' hide Path; // conflict with Path from UI
 
 class CircleLayerOptions extends LayerOptions {
   final List<CircleMarker> circles;
-  CircleLayerOptions({this.circles = const []});
+  CircleLayerOptions({this.circles = const [], rebuild})
+      : super(rebuild: rebuild);
 }
 
 class CircleMarker {
@@ -29,7 +30,8 @@ class CircleMarker {
 class CircleLayer extends StatelessWidget {
   final CircleLayerOptions circleOpts;
   final MapState map;
-  CircleLayer(this.circleOpts, this.map);
+  final Stream<Null> stream;
+  CircleLayer(this.circleOpts, this.map, this.stream);
 
   Widget build(BuildContext context) {
     return new LayoutBuilder(
@@ -42,7 +44,7 @@ class CircleLayer extends StatelessWidget {
 
   Widget _build(BuildContext context, Size size) {
     return new StreamBuilder<int>(
-      stream: map.onMoved, // a Stream<int> or null
+      stream: stream, // a Stream<int> or null
       builder: (BuildContext context, _) {
         var circleWidgets = <Widget>[];
         for (var circle in circleOpts.circles) {

diff --git a/lib/src/map/flutter_map_state.dart b/lib/src/map/flutter_map_state.dart
@@ -82,7 +82,7 @@ class FlutterMapState extends MapGestureMixin {
       return new PolygonLayer(options, mapState, _merge(options));
     }
     if (options is CircleLayerOptions) {
-      return new CircleLayer(options, mapState);
+      return new CircleLayer(options, mapState, _merge(options));
     }
     for (var plugin in plugins) {
       if (plugin.supportsLayer(options)) {