Merge remote-tracking branch 'upstream/master' into remove-task-logic-from-maps-telemetry

Aaron Caldwell · Aaron Caldwell · commit 422b3633d8ef · 2019-12-26T14:06:40.000-07:00
diff --git a/x-pack/legacy/plugins/maps/mappings.json b/x-pack/legacy/plugins/maps/mappings.json
@@ -26,6 +26,16 @@
   },
   "maps-telemetry": {
     "properties": {
+      "settings": {
+        "properties": {
+          "showMapVisualizationTypes": {
+            "type": "boolean"
+          }
+        }
+      },
+      "indexPatternsWithGeoFieldCount": {
+        "type": "long"
+      },
       "mapsTotalCount": {
         "type": "long"
       },
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/view.js b/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/view.js
@@ -46,7 +46,10 @@ export class TOCEntry extends React.Component {
   };
 
   async _loadHasLegendDetails() {
-    const hasLegendDetails = await this.props.layer.hasLegendDetails();
+    const hasLegendDetails =
+      (await this.props.layer.hasLegendDetails()) &&
+      this.props.layer.isVisible() &&
+      this.props.layer.showAtZoomLevel(this.props.zoom);
     if (this._isMounted && hasLegendDetails !== this.state.hasLegendDetails) {
       this.setState({ hasLegendDetails });
     }
