Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Maps] upgrade turf #73816

Merged
merged 4 commits into from
Jul 30, 2020
Merged

[Maps] upgrade turf #73816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea08597
[Maps] upgrade turf
nreese Jul 30, 2020
2b3a7ea
clean up ts-ignore comments
nreese Jul 30, 2020
da4096a
Merge branch 'master' into upgrade_turf
elasticmachine Jul 30, 2020
3d9565d
fix license check and review feedback
nreese Jul 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/dev/license_checker/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]': ['MIT'], // license in readme https://github.com/tmcw/jsonlint

// TODO can be removed if the https://github.com/jindw/xmldom/issues/239 is released
Expand Down
5 changes: 4 additions & 1 deletion x-pack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,12 @@
"@mapbox/mapbox-gl-rtl-text": "^0.2.3",
"@scant/router": "^0.1.0",
"@slack/webhook": "^5.0.0",
"@turf/bbox": "6.0.1",
"@turf/bbox-polygon": "6.0.1",
"@turf/boolean-contains": "6.0.1",
"@turf/circle": "6.0.1",
"@turf/distance": "6.0.1",
"@turf/helpers": "6.0.1",
"angular": "^1.7.9",
"angular-resource": "1.7.9",
"angular-sanitize": "1.7.9",
Expand Down Expand Up @@ -362,7 +366,6 @@
"tinymath": "1.2.1",
"topojson-client": "3.0.0",
"tslib": "^2.0.0",
"turf": "3.0.14",
"typescript-fsa": "^3.0.0",
"typescript-fsa-reducers": "^1.2.1",
"ui-select": "0.19.8",
Expand Down
6 changes: 3 additions & 3 deletions x-pack/plugins/maps/public/actions/data_request_actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
/* eslint-disable @typescript-eslint/consistent-type-definitions */

import { Dispatch } from 'redux';
// @ts-ignore
import turf from 'turf';
import bbox from '@turf/bbox';
import { multiPoint } from '@turf/helpers';
import { FeatureCollection } from 'geojson';
import { MapStoreState } from '../reducers/store';
import { LAYER_TYPE, SOURCE_DATA_REQUEST_ID } from '../../common/constants';
Expand Down Expand Up @@ -368,7 +368,7 @@ export function fitToDataBounds() {
return;
}

const dataBounds = turfBboxToBounds(turf.bbox(turf.multiPoint(corners)));
const dataBounds = turfBboxToBounds(bbox(multiPoint(corners)));

dispatch(setGotoWithBounds(scaleBounds(dataBounds, FIT_TO_BOUNDS_SCALE_FACTOR)));
};
Expand Down
10 changes: 5 additions & 5 deletions x-pack/plugins/maps/public/actions/map_actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
/* eslint-disable @typescript-eslint/consistent-type-definitions */

import { Dispatch } from 'redux';
// @ts-ignore
import turf from 'turf';
import uuid from 'uuid/v4';
import turfBboxPolygon from '@turf/bbox-polygon';
import turfBooleanContains from '@turf/boolean-contains';
import uuid from 'uuid/v4';

import { Filter, Query, TimeRange } from 'src/plugins/data/public';
import { MapStoreState } from '../reducers/store';
import {
Expand Down Expand Up @@ -126,13 +126,13 @@ export function mapExtentChanged(newMapConstants: { zoom: number; extent: MapExt
if (extent) {
let doesBufferContainExtent = false;
if (buffer) {
const bufferGeometry = turf.bboxPolygon([
const bufferGeometry = turfBboxPolygon([
buffer.minLon,
buffer.minLat,
buffer.maxLon,
buffer.maxLat,
]);
const extentGeometry = turf.bboxPolygon([
const extentGeometry = turfBboxPolygon([
extent.minLon,
extent.minLat,
extent.maxLon,
Expand Down
5 changes: 3 additions & 2 deletions x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/es_pew_pew_source.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

import React from 'react';
import uuid from 'uuid/v4';
import turf from 'turf';
import turfBbox from '@turf/bbox';
import { multiPoint } from '@turf/helpers';

import { UpdateSourceEditor } from './update_source_editor';
import { i18n } from '@kbn/i18n';
Expand Down Expand Up @@ -216,7 +217,7 @@ export class ESPewPewSource extends AbstractESAggSource {
return null;
}

return turfBboxToBounds(turf.bbox(turf.multiPoint(corners)));
return turfBboxToBounds(turfBbox(multiPoint(corners)));
}

canFormatFeatureProperties() {
Expand Down
7 changes: 3 additions & 4 deletions x-pack/plugins/maps/public/classes/util/can_skip_fetch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
import _ from 'lodash';
// @ts-ignore
import turf from 'turf';
import turfBboxPolygon from '@turf/bbox-polygon';
import turfBooleanContains from '@turf/boolean-contains';
import { isRefreshOnlyQuery } from './is_refresh_only_query';
import { ISource } from '../sources/source';
Expand All @@ -27,13 +26,13 @@ export function updateDueToExtent(prevMeta: DataMeta = {}, nextMeta: DataMeta =
return NO_SOURCE_UPDATE_REQUIRED;
}

const previousBufferGeometry = turf.bboxPolygon([
const previousBufferGeometry = turfBboxPolygon([
previousBuffer.minLon,
previousBuffer.minLat,
previousBuffer.maxLon,
previousBuffer.maxLat,
]);
const newBufferGeometry = turf.bboxPolygon([
const newBufferGeometry = turfBboxPolygon([
newBuffer.minLon,
newBuffer.minLat,
newBuffer.maxLon,
Expand Down
5 changes: 2 additions & 3 deletions x-pack/plugins/maps/public/classes/util/get_feature_collection_bounds.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

// @ts-ignore
import turf from 'turf';
import turfBbox from '@turf/bbox';
import { FeatureCollection } from 'geojson';
import { MapExtent } from '../../../common/descriptor_types';
import { FEATURE_VISIBLE_PROPERTY_NAME } from '../../../common/constants';
Expand All @@ -28,7 +27,7 @@ export function getFeatureCollectionBounds(
return null;
}

const bbox = turf.bbox({
const bbox = turfBbox({
type: 'FeatureCollection',
features: visibleFeatures,
});
Expand Down
10 changes: 5 additions & 5 deletions x-pack/plugins/maps/public/connected_components/map/mb/draw_control/draw_circle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

/* eslint-disable @typescript-eslint/consistent-type-definitions */

// @ts-ignore
import turf from 'turf';
// @ts-ignore
// @ts-expect-error
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why, but these are the only modules without types so they needed ts-expect-error

import turfDistance from '@turf/distance';
// @ts-expect-error
import turfCircle from '@turf/circle';

type DrawCircleState = {
Expand Down Expand Up @@ -75,7 +75,7 @@ export const DrawCircle = {
// second click, finish draw
// @ts-ignore
this.updateUIClasses({ mouse: 'pointer' });
state.circle.properties.radiusKm = turf.distance(state.circle.properties.center, [
state.circle.properties.radiusKm = turfDistance(state.circle.properties.center, [
e.lngLat.lng,
e.lngLat.lat,
]);
Expand All @@ -90,7 +90,7 @@ export const DrawCircle = {
}

const mouseLocation = [e.lngLat.lng, e.lngLat.lat];
state.circle.properties.radiusKm = turf.distance(state.circle.properties.center, mouseLocation);
state.circle.properties.radiusKm = turfDistance(state.circle.properties.center, mouseLocation);
const newCircleFeature = turfCircle(
state.circle.properties.center,
state.circle.properties.radiusKm
Expand Down
Loading