fix license check and review feedback

elastic · Jul 30, 2020 · 3d9565d · 3d9565d
1 parent da4096a
commit 3d9565d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts
@@ -79,7 +79,7 @@ export const DEV_ONLY_LICENSE_WHITELIST = ['MPL-2.0'];
 
 // Globally overrides a license for a given package@version
 export const LICENSE_OVERRIDES = {
-  'jsts@1.1.2': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts
+  'jsts@1.6.2': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts
   '@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
 
   // TODO can be removed if the https://github.com/jindw/xmldom/issues/239 is released

diff --git a/x-pack/plugins/maps/public/actions/map_actions.ts b/x-pack/plugins/maps/public/actions/map_actions.ts
@@ -6,7 +6,7 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
 import { Dispatch } from 'redux';
-import bboxPolygon from '@turf/bbox-polygon';
+import turfBboxPolygon from '@turf/bbox-polygon';
 import turfBooleanContains from '@turf/boolean-contains';
 import uuid from 'uuid/v4';
 
@@ -126,13 +126,13 @@ export function mapExtentChanged(newMapConstants: { zoom: number; extent: MapExt
     if (extent) {
       let doesBufferContainExtent = false;
       if (buffer) {
-        const bufferGeometry = bboxPolygon([
+        const bufferGeometry = turfBboxPolygon([
           buffer.minLon,
           buffer.minLat,
           buffer.maxLon,
           buffer.maxLat,
         ]);
-        const extentGeometry = bboxPolygon([
+        const extentGeometry = turfBboxPolygon([
           extent.minLon,
           extent.minLat,
           extent.maxLon,

diff --git a/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/es_pew_pew_source.js b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/es_pew_pew_source.js
@@ -6,7 +6,7 @@
 
 import React from 'react';
 import uuid from 'uuid/v4';
-import bbox from '@turf/bbox';
+import turfBbox from '@turf/bbox';
 import { multiPoint } from '@turf/helpers';
 
 import { UpdateSourceEditor } from './update_source_editor';
@@ -217,7 +217,7 @@ export class ESPewPewSource extends AbstractESAggSource {
       return null;
     }
 
-    return turfBboxToBounds(bbox(multiPoint(corners)));
+    return turfBboxToBounds(turfBbox(multiPoint(corners)));
   }
 
   canFormatFeatureProperties() {

diff --git a/x-pack/plugins/maps/public/classes/util/can_skip_fetch.ts b/x-pack/plugins/maps/public/classes/util/can_skip_fetch.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import _ from 'lodash';
-import bboxPolygon from '@turf/bbox-polygon';
+import turfBboxPolygon from '@turf/bbox-polygon';
 import turfBooleanContains from '@turf/boolean-contains';
 import { isRefreshOnlyQuery } from './is_refresh_only_query';
 import { ISource } from '../sources/source';
@@ -26,13 +26,13 @@ export function updateDueToExtent(prevMeta: DataMeta = {}, nextMeta: DataMeta =
     return NO_SOURCE_UPDATE_REQUIRED;
   }
 
-  const previousBufferGeometry = bboxPolygon([
+  const previousBufferGeometry = turfBboxPolygon([
     previousBuffer.minLon,
     previousBuffer.minLat,
     previousBuffer.maxLon,
     previousBuffer.maxLat,
   ]);
-  const newBufferGeometry = bboxPolygon([
+  const newBufferGeometry = turfBboxPolygon([
     newBuffer.minLon,
     newBuffer.minLat,
     newBuffer.maxLon,