From db93fba382cb6ff89d84addbf8c679b4afa77fce Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Mon, 6 Apr 2020 10:23:01 -0600
Subject: [PATCH] [Maps] do not show circle border when symbol size is zero

---
 .../styles/vector/properties/dynamic_size_property.js  | 10 +++++++---
 .../styles/vector/properties/static_size_property.js   |  8 ++++++--
 .../maps/public/layers/styles/vector/vector_style.js   |  7 +++++--
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_size_property.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_size_property.js
index 8b3f670bfa528..71ac25f0c6e61 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_size_property.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_size_property.js
@@ -99,9 +99,13 @@ export class DynamicSizeProperty extends DynamicStyleProperty {
     }
   }
 
-  syncCircleStrokeWidthWithMb(mbLayerId, mbMap) {
-    const lineWidth = this.getMbSizeExpression();
-    mbMap.setPaintProperty(mbLayerId, 'circle-stroke-width', lineWidth);
+  syncCircleStrokeWidthWithMb(mbLayerId, mbMap, hasNoRadius) {
+    if (hasNoRadius) {
+      mbMap.setPaintProperty(mbLayerId, 'circle-stroke-width', 0);
+    } else {
+      const lineWidth = this.getMbSizeExpression();
+      mbMap.setPaintProperty(mbLayerId, 'circle-stroke-width', lineWidth);
+    }
   }
 
   syncCircleRadiusWithMb(mbLayerId, mbMap) {
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_size_property.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_size_property.js
index 2383a5932cb9b..d86556c6218cf 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_size_property.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/static_size_property.js
@@ -35,8 +35,12 @@ export class StaticSizeProperty extends StaticStyleProperty {
     mbMap.setLayoutProperty(symbolLayerId, 'icon-size', this._options.size / halfIconPixels);
   }
 
-  syncCircleStrokeWidthWithMb(mbLayerId, mbMap) {
-    mbMap.setPaintProperty(mbLayerId, 'circle-stroke-width', this._options.size);
+  syncCircleStrokeWidthWithMb(mbLayerId, mbMap, hasNoRadius) {
+    if (hasNoRadius) {
+      mbMap.setPaintProperty(mbLayerId, 'circle-stroke-width', 0);
+    } else {
+      mbMap.setPaintProperty(mbLayerId, 'circle-stroke-width', this._options.size);
+    }
   }
 
   syncCircleRadiusWithMb(mbLayerId, mbMap) {
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.js
index ae5d148e43cfd..b044c98d44d41 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.js
@@ -543,8 +543,11 @@ export class VectorStyle extends AbstractStyle {
   setMBPaintPropertiesForPoints({ alpha, mbMap, pointLayerId }) {
     this._fillColorStyleProperty.syncCircleColorWithMb(pointLayerId, mbMap, alpha);
     this._lineColorStyleProperty.syncCircleStrokeWithMb(pointLayerId, mbMap, alpha);
-    this._lineWidthStyleProperty.syncCircleStrokeWidthWithMb(pointLayerId, mbMap);
-    this._iconSizeStyleProperty.syncCircleRadiusWithMb(pointLayerId, mbMap);
+    const hasNoRadius =
+      !this._iconSizeStyleProperty.isDynamic() &&
+      this._iconSizeStyleProperty.getOptions().size === 0;
+    this._lineWidthStyleProperty.syncCircleStrokeWidthWithMb(pointLayerId, mbMap, hasNoRadius);
+    this._iconSizeStyleProperty.syncCircleRadiusWithMb(pointLayerId, mbMap, hasNoRadius);
   }
 
   setMBPropertiesForLabelText({ alpha, mbMap, textLayerId }) {