Remove weird left-side label pruning and add an option to draw labels…

… last on top of all the polygons.
fleaflet · Oct 27, 2023 · 18f352a · 18f352a
1 parent 6e8cc20
commit 18f352a
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 41 deletions.
diff --git a/lib/src/layer/polygon_layer/label.dart b/lib/src/layer/polygon_layer/label.dart
@@ -17,46 +17,38 @@ void Function(Canvas canvas)? buildLabelTextPainter(
   TextStyle? labelStyle,
   double padding = 0,
 }) {
-  double dx = placementPoint.dx;
-  double dy = placementPoint.dy;
+  final textSpan = TextSpan(text: labelText, style: labelStyle);
+  final textPainter = TextPainter(
+    text: textSpan,
+    textAlign: TextAlign.center,
+    textDirection: TextDirection.ltr,
+    maxLines: 2,
+  )..layout();
 
-  if (dx > 0) {
-    final textSpan = TextSpan(text: labelText, style: labelStyle);
-    final textPainter = TextPainter(
-      text: textSpan,
-      textAlign: TextAlign.center,
-      textDirection: TextDirection.ltr,
-      maxLines: 1,
-    );
+  final dx = placementPoint.dx - textPainter.width / 2;
+  final dy = placementPoint.dy - textPainter.height / 2;
 
-    textPainter.layout();
-    dx -= textPainter.width / 2;
-    dy -= textPainter.height / 2;
+  double maxDx = 0;
+  var minDx = double.infinity;
+  for (final point in points) {
+    maxDx = math.max(maxDx, point.dx);
+    minDx = math.min(minDx, point.dx);
+  }
 
-    var maxDx = 0.0;
-    var minDx = double.infinity;
-    for (final point in points) {
-      maxDx = math.max(maxDx, point.dx);
-      minDx = math.min(minDx, point.dx);
-    }
+  if (maxDx - minDx - padding > textPainter.width) {
+    return (canvas) {
+      if (rotate) {
+        canvas.save();
+        canvas.translate(placementPoint.dx, placementPoint.dy);
+        canvas.rotate(-rotationRad);
+        canvas.translate(-placementPoint.dx, -placementPoint.dy);
+      }
 
-    if (maxDx - minDx - padding > textPainter.width) {
-      return (canvas) {
-        if (rotate) {
-          canvas.save();
-          canvas.translate(placementPoint.dx, placementPoint.dy);
-          canvas.rotate(-rotationRad);
-          canvas.translate(-placementPoint.dx, -placementPoint.dy);
-        }
-        textPainter.paint(
-          canvas,
-          Offset(dx, dy),
-        );
-        if (rotate) {
-          canvas.restore();
-        }
-      };
-    }
+      textPainter.paint(canvas, Offset(dx, dy));
+      if (rotate) {
+        canvas.restore();
+      }
+    };
   }
   return null;
 }
@@ -89,9 +81,8 @@ LatLng _computePolylabel(List<LatLng> points) {
     // i.e. cheaper at the expense off less optimal label placement.
     precision: 0.000001,
   );
-  final latlng = LatLng(
+  return LatLng(
     labelPosition.point.y.toDouble(),
     labelPosition.point.x.toDouble(),
   );
-  return latlng;
 }
diff --git a/lib/src/layer/polygon_layer/polygon_layer.dart b/lib/src/layer/polygon_layer/polygon_layer.dart
@@ -98,11 +98,15 @@ class PolygonLayer extends StatelessWidget {
   // Turn on/off per-polygon label drawing on the layer-level.
   final bool polygonLabels;
 
+  // Whether to draw labels last and thus over all the polygons.
+  final bool drawLabelsLast;
+
   const PolygonLayer({
     super.key,
     required this.polygons,
     this.polygonCulling = false,
     this.polygonLabels = true,
+    this.drawLabelsLast = false,
   });
 
   @override
@@ -118,7 +122,7 @@ class PolygonLayer extends StatelessWidget {
 
     return MobileLayerTransformer(
       child: CustomPaint(
-        painter: PolygonPainter(pgons, map, polygonLabels),
+        painter: PolygonPainter(pgons, map, polygonLabels, drawLabelsLast),
         size: size,
         isComplex: true,
       ),
@@ -131,8 +135,10 @@ class PolygonPainter extends CustomPainter {
   final MapCamera map;
   final LatLngBounds bounds;
   final bool polygonLabels;
+  final bool drawLabelsLast;
 
-  PolygonPainter(this.polygons, this.map, this.polygonLabels)
+  PolygonPainter(
+      this.polygons, this.map, this.polygonLabels, this.drawLabelsLast)
       : bounds = map.visibleBounds;
 
   int get hash {
@@ -235,7 +241,7 @@ class PolygonPainter extends CustomPainter {
         }
       }
 
-      if (polygonLabels && polygon.label != null) {
+      if (polygonLabels && !drawLabelsLast && polygon.label != null) {
         // Labels are expensive because:
         //  * they themselves cannot easily be pulled into our batched path
         //    painting with the given text APIs
@@ -267,6 +273,31 @@ class PolygonPainter extends CustomPainter {
     }
 
     drawPaths();
+
+    if (polygonLabels && drawLabelsLast) {
+      for (final polygon in polygons) {
+        final offsets = getOffsets(polygon.points);
+        if (offsets.isEmpty) {
+          continue;
+        }
+
+        if (polygon.label != null) {
+          final painter = buildLabelTextPainter(
+            polygon.points,
+            polygon.labelPosition,
+            placementPoint: map.getOffsetFromOrigin(polygon.labelPosition),
+            points: offsets,
+            labelText: polygon.label!,
+            labelStyle: polygon.labelStyle,
+            rotationRad: map.rotationRad,
+            rotate: polygon.rotateLabel,
+            padding: 50,
+          );
+
+          painter?.call(canvas);
+        }
+      }
+    }
   }
 
   Paint _getBorderPaint(Polygon polygon) {