Minor improvements to circle layer example

Renamed 'layers/misc' to 'layers/shared'
fleaflet · May 23, 2024 · f5df8c8 · f5df8c8
1 parent 19b1a3f
commit f5df8c8
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 18 deletions.
diff --git a/example/lib/pages/circle.dart b/example/lib/pages/circle.dart
@@ -24,12 +24,24 @@ class _CirclePageState extends State<CirclePage> {
   final _circlesRaw = <CircleMarker<HitValue>>[
     CircleMarker(
       point: const LatLng(51.5, -0.09),
-      color: Colors.blue.withOpacity(0.7),
+      color: Colors.white.withOpacity(0.7),
       borderColor: Colors.black,
       borderStrokeWidth: 2,
       useRadiusInMeter: false,
       radius: 100,
-      hitValue: (title: 'Blue', subtitle: 'Radius in logical pixels'),
+      hitValue: (title: 'White', subtitle: 'Radius in logical pixels'),
+    ),
+    CircleMarker(
+      point: const LatLng(51.5, -0.09),
+      color: Colors.black.withOpacity(0.7),
+      borderColor: Colors.black,
+      borderStrokeWidth: 2,
+      useRadiusInMeter: false,
+      radius: 50,
+      hitValue: (
+        title: 'Black',
+        subtitle: 'Radius in logical pixels, should be above white.',
+      ),
     ),
     CircleMarker(
       point: const LatLng(51.4937, -0.6638),
@@ -75,7 +87,7 @@ class _CirclePageState extends State<CirclePage> {
 
                 return CircleMarker<HitValue>(
                   point: original.point,
-                  radius: original.radius,
+                  radius: original.radius + (15 / 2) - 1,
                   useRadiusInMeter: original.useRadiusInMeter,
                   color: Colors.transparent,
                   borderStrokeWidth: 15,
@@ -106,7 +118,10 @@ class _CirclePageState extends State<CirclePage> {
               ),
               child: CircleLayer(
                 hitNotifier: _hitNotifier,
-                circles: [..._circlesRaw, ...?_hoverCircles],
+                circles: [
+                  ..._circlesRaw,
+                  ...?_hoverCircles,
+                ],
               ),
             ),
           ),

diff --git a/lib/flutter_map.dart b/lib/flutter_map.dart
@@ -29,15 +29,15 @@ export 'package:flutter_map/src/layer/attribution_layer/rich/widget.dart';
 export 'package:flutter_map/src/layer/attribution_layer/simple.dart';
 export 'package:flutter_map/src/layer/circle_layer/circle_layer.dart';
 export 'package:flutter_map/src/layer/marker_layer/marker_layer.dart';
-export 'package:flutter_map/src/layer/misc/layer_interactivity/layer_hit_notifier.dart';
-export 'package:flutter_map/src/layer/misc/layer_interactivity/layer_hit_result.dart';
-export 'package:flutter_map/src/layer/misc/line_patterns/stroke_pattern.dart';
-export 'package:flutter_map/src/layer/misc/mobile_layer_transformer.dart';
-export 'package:flutter_map/src/layer/misc/translucent_pointer.dart';
 export 'package:flutter_map/src/layer/overlay_image_layer/overlay_image_layer.dart';
 export 'package:flutter_map/src/layer/polygon_layer/polygon_layer.dart';
 export 'package:flutter_map/src/layer/polyline_layer/polyline_layer.dart';
 export 'package:flutter_map/src/layer/scalebar/scalebar.dart';
+export 'package:flutter_map/src/layer/shared/layer_interactivity/layer_hit_notifier.dart';
+export 'package:flutter_map/src/layer/shared/layer_interactivity/layer_hit_result.dart';
+export 'package:flutter_map/src/layer/shared/line_patterns/stroke_pattern.dart';
+export 'package:flutter_map/src/layer/shared/mobile_layer_transformer.dart';
+export 'package:flutter_map/src/layer/shared/translucent_pointer.dart';
 export 'package:flutter_map/src/layer/tile_layer/tile_builder.dart';
 export 'package:flutter_map/src/layer/tile_layer/tile_coordinates.dart';
 export 'package:flutter_map/src/layer/tile_layer/tile_display.dart';

diff --git a/lib/src/layer/circle_layer/circle_layer.dart b/lib/src/layer/circle_layer/circle_layer.dart
@@ -3,7 +3,7 @@ import 'dart:ui';
 
 import 'package:flutter/widgets.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:flutter_map/src/layer/misc/layer_interactivity/internal_hit_detectable.dart';
+import 'package:flutter_map/src/layer/shared/layer_interactivity/internal_hit_detectable.dart';
 import 'package:latlong2/latlong.dart' hide Path;
 
 part 'circle_marker.dart';

diff --git a/lib/src/layer/polygon_layer/polygon_layer.dart b/lib/src/layer/polygon_layer/polygon_layer.dart
@@ -6,8 +6,8 @@ import 'package:dart_earcut/dart_earcut.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:flutter_map/src/layer/misc/layer_interactivity/internal_hit_detectable.dart';
-import 'package:flutter_map/src/layer/misc/line_patterns/pixel_hiker.dart';
+import 'package:flutter_map/src/layer/shared/layer_interactivity/internal_hit_detectable.dart';
+import 'package:flutter_map/src/layer/shared/line_patterns/pixel_hiker.dart';
 import 'package:flutter_map/src/misc/offsets.dart';
 import 'package:flutter_map/src/misc/simplify.dart';
 import 'package:latlong2/latlong.dart' hide Path;

diff --git a/lib/src/layer/polyline_layer/polyline_layer.dart b/lib/src/layer/polyline_layer/polyline_layer.dart
@@ -5,8 +5,8 @@ import 'dart:ui' as ui;
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_map/flutter_map.dart';
-import 'package:flutter_map/src/layer/misc/layer_interactivity/internal_hit_detectable.dart';
-import 'package:flutter_map/src/layer/misc/line_patterns/pixel_hiker.dart';
+import 'package:flutter_map/src/layer/shared/layer_interactivity/internal_hit_detectable.dart';
+import 'package:flutter_map/src/layer/shared/line_patterns/pixel_hiker.dart';
 import 'package:flutter_map/src/misc/offsets.dart';
 import 'package:flutter_map/src/misc/simplify.dart';
 import 'package:latlong2/latlong.dart';

diff --git a/...nteractivity/internal_hit_detectable.dart → ...nteractivity/internal_hit_detectable.dart b/...nteractivity/internal_hit_detectable.dart → ...nteractivity/internal_hit_detectable.dart
diff --git a/...yer_interactivity/layer_hit_notifier.dart → ...yer_interactivity/layer_hit_notifier.dart b/...yer_interactivity/layer_hit_notifier.dart → ...yer_interactivity/layer_hit_notifier.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/foundation.dart';
 
-import 'package:flutter_map/src/layer/misc/layer_interactivity/layer_hit_result.dart';
+import 'package:flutter_map/src/layer/shared/layer_interactivity/layer_hit_result.dart';
 
 /// A [ValueNotifier] that notifies:
 ///

diff --git a/...layer_interactivity/layer_hit_result.dart → ...layer_interactivity/layer_hit_result.dart b/...layer_interactivity/layer_hit_result.dart → ...layer_interactivity/layer_hit_result.dart
diff --git a/...layer/misc/line_patterns/pixel_hiker.dart → ...yer/shared/line_patterns/pixel_hiker.dart b/...layer/misc/line_patterns/pixel_hiker.dart → ...yer/shared/line_patterns/pixel_hiker.dart
diff --git a/...er/misc/line_patterns/stroke_pattern.dart → .../shared/line_patterns/stroke_pattern.dart b/...er/misc/line_patterns/stroke_pattern.dart → .../shared/line_patterns/stroke_pattern.dart
diff --git a/...r/misc/line_patterns/visible_segment.dart → ...shared/line_patterns/visible_segment.dart b/...r/misc/line_patterns/visible_segment.dart → ...shared/line_patterns/visible_segment.dart
diff --git a/.../layer/misc/mobile_layer_transformer.dart → ...ayer/shared/mobile_layer_transformer.dart b/.../layer/misc/mobile_layer_transformer.dart → ...ayer/shared/mobile_layer_transformer.dart
diff --git a/lib/src/layer/misc/translucent_pointer.dart → ...src/layer/shared/translucent_pointer.dart b/lib/src/layer/misc/translucent_pointer.dart → ...src/layer/shared/translucent_pointer.dart
diff --git a/test/full_coverage_test.dart b/test/full_coverage_test.dart
@@ -14,12 +14,12 @@ import 'package:flutter_map/src/layer/attribution_layer/rich/widget.dart';
 import 'package:flutter_map/src/layer/attribution_layer/simple.dart';
 import 'package:flutter_map/src/layer/circle_layer/circle_layer.dart';
 import 'package:flutter_map/src/layer/marker_layer/marker_layer.dart';
-import 'package:flutter_map/src/layer/misc/layer_interactivity/internal_hit_detectable.dart';
-import 'package:flutter_map/src/layer/misc/mobile_layer_transformer.dart';
-import 'package:flutter_map/src/layer/misc/translucent_pointer.dart';
 import 'package:flutter_map/src/layer/overlay_image_layer/overlay_image_layer.dart';
 import 'package:flutter_map/src/layer/polygon_layer/polygon_layer.dart';
 import 'package:flutter_map/src/layer/polyline_layer/polyline_layer.dart';
+import 'package:flutter_map/src/layer/shared/layer_interactivity/internal_hit_detectable.dart';
+import 'package:flutter_map/src/layer/shared/mobile_layer_transformer.dart';
+import 'package:flutter_map/src/layer/shared/translucent_pointer.dart';
 import 'package:flutter_map/src/layer/tile_layer/tile.dart';
 import 'package:flutter_map/src/layer/tile_layer/tile_bounds/tile_bounds.dart';
 import 'package:flutter_map/src/layer/tile_layer/tile_bounds/tile_bounds_at_zoom.dart';