fit only on visible features (#42020)

elastic · Jul 26, 2019 · ec82c13 · ec82c13
1 parent 3229834
commit ec82c13
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/x-pack/legacy/plugins/maps/public/layers/vector_layer.js b/x-pack/legacy/plugins/maps/public/layers/vector_layer.js
@@ -196,7 +196,12 @@ export class VectorLayer extends AbstractLayer {
     if (!featureCollection) {
       return null;
     }
-    const bbox = turf.bbox(featureCollection);
+
+    const visibleFeatures = featureCollection.features.filter(feature => feature.properties[FEATURE_VISIBLE_PROPERTY_NAME]);
+    const bbox = turf.bbox({
+      type: 'FeatureCollection',
+      features: visibleFeatures
+    });
     return {
       min_lon: bbox[0],
       min_lat: bbox[1],
@@ -206,11 +211,14 @@ export class VectorLayer extends AbstractLayer {
   }
 
   async getBounds(dataFilters) {
-    if (this._source.isBoundsAware()) {
-      const searchFilters = this._getSearchFilters(dataFilters);
-      return await this._source.getBoundsForFilters(searchFilters);
+
+    const isStaticLayer = !this._source.isBoundsAware() || !this._source.isFilterByMapBounds();
+    if (isStaticLayer) {
+      return this._getBoundsBasedOnData();
     }
-    return this._getBoundsBasedOnData();
+
+    const searchFilters = this._getSearchFilters(dataFilters);
+    return await this._source.getBoundsForFilters(searchFilters);
   }
 
   async getLeftJoinFields() {