From 3efca356012597fbb108a770f1b902c41a864dc1 Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Tue, 1 Jun 2021 17:27:22 -0600
Subject: [PATCH] [Maps] fix line and polygon label regression (#101085)

---
 .../maps/public/classes/util/mb_filter_expressions.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts b/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts
index c798f05df981..f5df741759cb 100644
--- a/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts
+++ b/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts
@@ -65,5 +65,14 @@ export function getPointFilterExpression(hasJoins: boolean): unknown[] {
 }
 
 export function getCentroidFilterExpression(hasJoins: boolean): unknown[] {
-  return getFilterExpression(['==', ['get', KBN_IS_CENTROID_FEATURE], true], hasJoins);
+  const filters: unknown[] = [
+    EXCLUDE_TOO_MANY_FEATURES_BOX,
+    ['==', ['get', KBN_IS_CENTROID_FEATURE], true],
+  ];
+
+  if (hasJoins) {
+    filters.push(['==', ['get', FEATURE_VISIBLE_PROPERTY_NAME], true]);
+  }
+
+  return ['all', ...filters];
 }