From 70b779c75b879619601bee492a97355f5a960b6d Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 24 Jul 2017 09:24:04 -0700 Subject: [PATCH] Use @mapbox-scoped packages; upgrade pbf to match vt-pbf --- bench/benchmarks/buffer.js | 2 +- flow-typed/point-geometry.js | 2 +- flow-typed/vector-tile.js | 2 +- package.json | 10 ++--- src/data/bucket/line_bucket.js | 4 +- src/data/bucket/symbol_bucket.js | 4 +- src/data/feature_index.js | 4 +- src/geo/transform.js | 2 +- src/index.js | 2 +- src/source/geojson_wrapper.js | 4 +- src/source/image_source.js | 2 +- src/source/tile.js | 2 +- src/source/vector_tile_worker_source.js | 2 +- src/symbol/anchor.js | 2 +- src/symbol/clip_line.js | 2 +- src/symbol/collision_box.js | 2 +- src/symbol/collision_tile.js | 2 +- src/symbol/projection.js | 2 +- src/symbol/quads.js | 2 +- src/ui/bind_handlers.js | 2 +- src/ui/camera.js | 2 +- src/ui/map.js | 2 +- src/ui/marker.js | 2 +- src/ui/popup.js | 2 +- src/util/dom.js | 2 +- src/util/find_pole_of_inaccessibility.js | 2 +- src/util/util.js | 2 +- test/unit/data/fill_bucket.test.js | 4 +- test/unit/data/line_bucket.test.js | 4 +- test/unit/data/load_geometry.test.js | 2 +- test/unit/data/symbol_bucket.test.js | 2 +- test/unit/geo/transform.test.js | 2 +- test/unit/symbol/check_max_angle.test.js | 2 +- test/unit/symbol/collision_feature.js | 2 +- test/unit/symbol/get_anchors.test.js | 2 +- test/unit/symbol/mergelines.test.js | 2 +- test/unit/ui/popup.test.js | 2 +- test/unit/util/classify_rings.test.js | 2 +- .../util/find_pole_of_inaccessibility.test.js | 2 +- test/unit/util/util.test.js | 2 +- yarn.lock | 44 +++++++++---------- 41 files changed, 72 insertions(+), 72 deletions(-) diff --git a/bench/benchmarks/buffer.js b/bench/benchmarks/buffer.js index 5e2097a5b0b..58a4ce291c2 100644 --- a/bench/benchmarks/buffer.js +++ b/bench/benchmarks/buffer.js @@ -1,6 +1,6 @@ 'use strict'; -const VT = require('vector-tile'); +const VT = require('@mapbox/vector-tile'); const Protobuf = require('pbf'); const assert = require('assert'); diff --git a/flow-typed/point-geometry.js b/flow-typed/point-geometry.js index a64cdc9424f..cc6b344bb11 100644 --- a/flow-typed/point-geometry.js +++ b/flow-typed/point-geometry.js @@ -1,6 +1,6 @@ declare type PointLike = Point | [number, number]; -declare module "point-geometry" { +declare module "@mapbox/point-geometry" { declare class Point { x: number; y: number; diff --git a/flow-typed/vector-tile.js b/flow-typed/vector-tile.js index 260b78fa7e8..b1051c55996 100644 --- a/flow-typed/vector-tile.js +++ b/flow-typed/vector-tile.js @@ -20,7 +20,7 @@ declare interface VectorTileFeature { toGeoJSON(x: number, y: number, z: number): GeoJSONFeature; } -declare module "vector-tile" { +declare module "@mapbox/vector-tile" { declare class VectorTileImpl { constructor(pbf: Pbf): VectorTile; } diff --git a/package.json b/package.json index 1d3948b274f..ec880a0ebb1 100644 --- a/package.json +++ b/package.json @@ -14,16 +14,18 @@ }, "dependencies": { "@mapbox/gl-matrix": "^0.0.1", + "@mapbox/point-geometry": "^0.1.0", "@mapbox/shelf-pack": "^3.0.0", "@mapbox/tiny-sdf": "^1.1.0", "@mapbox/unitbezier": "^0.0.0", + "@mapbox/vector-tile": "^1.3.0", "@mapbox/whoots-js": "^3.0.0", "brfs": "^1.4.0", "bubleify": "^0.7.0", "csscolorparser": "~1.0.2", "earcut": "^2.0.3", "fast-stable-stringify": "^0.1.1", - "geojson-rewind": "^0.1.0", + "geojson-rewind": "^0.2.0", "geojson-vt": "^2.4.0", "grid-index": "^1.0.0", "jsonlint-lines-primitives": "~1.6.0", @@ -31,8 +33,7 @@ "mapbox-gl-supported": "^1.2.0", "minimist": "0.0.8", "package-json-versionify": "^1.0.2", - "pbf": "^1.3.2", - "point-geometry": "^0.0.0", + "pbf": "^3.0.5", "quickselect": "^1.0.0", "rw": "^1.3.3", "sort-object": "^0.3.2", @@ -41,8 +42,7 @@ "tinyqueue": "^1.1.0", "unassertify": "^2.0.0", "unflowify": "^1.0.0", - "vector-tile": "^1.3.0", - "vt-pbf": "^2.0.2", + "vt-pbf": "^2.1.3", "webworkify": "^1.4.0" }, "devDependencies": { diff --git a/src/data/bucket/line_bucket.js b/src/data/bucket/line_bucket.js index a7b2ddd2e87..22e9c512702 100644 --- a/src/data/bucket/line_bucket.js +++ b/src/data/bucket/line_bucket.js @@ -4,11 +4,11 @@ const Bucket = require('../bucket'); const createElementArrayType = require('../element_array_type'); const loadGeometry = require('../load_geometry'); const EXTENT = require('../extent'); -const vectorTileFeatureTypes = require('vector-tile').VectorTileFeature.types; +const vectorTileFeatureTypes = require('@mapbox/vector-tile').VectorTileFeature.types; import type {BucketParameters} from '../bucket'; import type {ProgramInterface} from '../program_configuration'; -import type Point from 'point-geometry'; +import type Point from '@mapbox/point-geometry'; import type {Segment} from '../array_group'; // NOTE ON EXTRUDE SCALE: diff --git a/src/data/bucket/symbol_bucket.js b/src/data/bucket/symbol_bucket.js index 8344a85ae5a..5490d70edf5 100644 --- a/src/data/bucket/symbol_bucket.js +++ b/src/data/bucket/symbol_bucket.js @@ -1,6 +1,6 @@ // @flow -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); const ArrayGroup = require('../array_group'); const BufferGroup = require('../buffer_group'); const createElementArrayType = require('../element_array_type'); @@ -20,7 +20,7 @@ const loadGeometry = require('../load_geometry'); const CollisionFeature = require('../../symbol/collision_feature'); const findPoleOfInaccessibility = require('../../util/find_pole_of_inaccessibility'); const classifyRings = require('../../util/classify_rings'); -const vectorTileFeatureTypes = require('vector-tile').VectorTileFeature.types; +const vectorTileFeatureTypes = require('@mapbox/vector-tile').VectorTileFeature.types; const createStructArrayType = require('../../util/struct_array'); const verticalizePunctuation = require('../../util/verticalize_punctuation'); diff --git a/src/data/feature_index.js b/src/data/feature_index.js index 17cfc5c0acb..d541b00a7f7 100644 --- a/src/data/feature_index.js +++ b/src/data/feature_index.js @@ -1,14 +1,14 @@ // @flow const assert = require('assert'); -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); const loadGeometry = require('./load_geometry'); const EXTENT = require('./extent'); const featureFilter = require('../style-spec/feature_filter'); const createStructArrayType = require('../util/struct_array'); const Grid = require('grid-index'); const DictionaryCoder = require('../util/dictionary_coder'); -const vt = require('vector-tile'); +const vt = require('@mapbox/vector-tile'); const Protobuf = require('pbf'); const GeoJSONFeature = require('../util/vectortile_to_geojson'); const arraysIntersect = require('../util/util').arraysIntersect; diff --git a/src/geo/transform.js b/src/geo/transform.js index 79760939f07..eb33d44f056 100644 --- a/src/geo/transform.js +++ b/src/geo/transform.js @@ -1,7 +1,7 @@ // @flow const LngLat = require('./lng_lat'), - Point = require('point-geometry'), + Point = require('@mapbox/point-geometry'), Coordinate = require('./coordinate'), util = require('../util/util'), interp = require('../style-spec/util/interpolate'), diff --git a/src/index.js b/src/index.js index 13d1b2dcbb2..331a045fb8e 100644 --- a/src/index.js +++ b/src/index.js @@ -14,7 +14,7 @@ const Marker = require('./ui/marker'); const Style = require('./style/style'); const LngLat = require('./geo/lng_lat'); const LngLatBounds = require('./geo/lng_lat_bounds'); -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); const Evented = require('./util/evented'); const config = require('./util/config'); const rtlTextPlugin = require('./source/rtl_text_plugin'); diff --git a/src/source/geojson_wrapper.js b/src/source/geojson_wrapper.js index 9e098013a19..1c347492dbe 100644 --- a/src/source/geojson_wrapper.js +++ b/src/source/geojson_wrapper.js @@ -1,7 +1,7 @@ // @flow -const Point = require('point-geometry'); -const toGeoJSON = require('vector-tile').VectorTileFeature.prototype.toGeoJSON; +const Point = require('@mapbox/point-geometry'); +const toGeoJSON = require('@mapbox/vector-tile').VectorTileFeature.prototype.toGeoJSON; const EXTENT = require('../data/extent'); // The feature type used by geojson-vt and supercluster. Should be extracted to diff --git a/src/source/image_source.js b/src/source/image_source.js index bf80aec147b..3ee7f6ca07f 100644 --- a/src/source/image_source.js +++ b/src/source/image_source.js @@ -4,7 +4,7 @@ const util = require('../util/util'); const window = require('../util/window'); const TileCoord = require('./tile_coord'); const LngLat = require('../geo/lng_lat'); -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); const Evented = require('../util/evented'); const ajax = require('../util/ajax'); const EXTENT = require('../data/extent'); diff --git a/src/source/tile.js b/src/source/tile.js index 2bfaac47765..f77ea643d22 100644 --- a/src/source/tile.js +++ b/src/source/tile.js @@ -3,7 +3,7 @@ const util = require('../util/util'); const Bucket = require('../data/bucket'); const FeatureIndex = require('../data/feature_index'); -const vt = require('vector-tile'); +const vt = require('@mapbox/vector-tile'); const Protobuf = require('pbf'); const GeoJSONFeature = require('../util/vectortile_to_geojson'); const featureFilter = require('../style-spec/feature_filter'); diff --git a/src/source/vector_tile_worker_source.js b/src/source/vector_tile_worker_source.js index 898214f8b8c..dbd3c028abf 100644 --- a/src/source/vector_tile_worker_source.js +++ b/src/source/vector_tile_worker_source.js @@ -1,7 +1,7 @@ // @flow const ajax = require('../util/ajax'); -const vt = require('vector-tile'); +const vt = require('@mapbox/vector-tile'); const Protobuf = require('pbf'); const WorkerTile = require('./worker_tile'); const util = require('../util/util'); diff --git a/src/symbol/anchor.js b/src/symbol/anchor.js index 4dd97b02ba6..47c61f33177 100644 --- a/src/symbol/anchor.js +++ b/src/symbol/anchor.js @@ -1,5 +1,5 @@ -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); class Anchor extends Point { diff --git a/src/symbol/clip_line.js b/src/symbol/clip_line.js index d52ce57b1ee..849095f649f 100644 --- a/src/symbol/clip_line.js +++ b/src/symbol/clip_line.js @@ -1,5 +1,5 @@ -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); module.exports = clipLine; diff --git a/src/symbol/collision_box.js b/src/symbol/collision_box.js index 96d109ce0aa..505c6ff21f7 100644 --- a/src/symbol/collision_box.js +++ b/src/symbol/collision_box.js @@ -1,7 +1,7 @@ // @flow const createStructArrayType = require('../util/struct_array'); -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); /** * A collision box represents an area of the map that that is covered by a diff --git a/src/symbol/collision_tile.js b/src/symbol/collision_tile.js index a9453bc16f1..9c874286074 100644 --- a/src/symbol/collision_tile.js +++ b/src/symbol/collision_tile.js @@ -1,6 +1,6 @@ // @flow -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); const EXTENT = require('../data/extent'); const Grid = require('grid-index'); diff --git a/src/symbol/projection.js b/src/symbol/projection.js index 6bb94a274f3..404336929d8 100644 --- a/src/symbol/projection.js +++ b/src/symbol/projection.js @@ -1,5 +1,5 @@ -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); const mat4 = require('@mapbox/gl-matrix').mat4; const vec4 = require('@mapbox/gl-matrix').vec4; const symbolSize = require('./symbol_size'); diff --git a/src/symbol/quads.js b/src/symbol/quads.js index c9446e3d57a..306c7576c43 100644 --- a/src/symbol/quads.js +++ b/src/symbol/quads.js @@ -1,5 +1,5 @@ -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); module.exports = { getIconQuads: getIconQuads, diff --git a/src/ui/bind_handlers.js b/src/ui/bind_handlers.js index 1525978e02d..3bbce748123 100644 --- a/src/ui/bind_handlers.js +++ b/src/ui/bind_handlers.js @@ -1,6 +1,6 @@ const DOM = require('../util/dom'); -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); const handlers = { scrollZoom: require('./handler/scroll_zoom'), diff --git a/src/ui/camera.js b/src/ui/camera.js index 45f782e7b42..bfa214f966b 100644 --- a/src/ui/camera.js +++ b/src/ui/camera.js @@ -4,7 +4,7 @@ const interpolate = require('../style-spec/util/interpolate'); const browser = require('../util/browser'); const LngLat = require('../geo/lng_lat'); const LngLatBounds = require('../geo/lng_lat_bounds'); -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); const Evented = require('../util/evented'); /** diff --git a/src/ui/map.js b/src/ui/map.js index 044aaf1c3bf..f5f9fbe0933 100755 --- a/src/ui/map.js +++ b/src/ui/map.js @@ -18,7 +18,7 @@ const bindHandlers = require('./bind_handlers'); const Camera = require('./camera'); const LngLat = require('../geo/lng_lat'); const LngLatBounds = require('../geo/lng_lat_bounds'); -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); const AttributionControl = require('./control/attribution_control'); const LogoControl = require('./control/logo_control'); const isSupported = require('mapbox-gl-supported'); diff --git a/src/ui/marker.js b/src/ui/marker.js index cfeeb1a22e9..a650d7daa5d 100644 --- a/src/ui/marker.js +++ b/src/ui/marker.js @@ -1,7 +1,7 @@ const DOM = require('../util/dom'); const LngLat = require('../geo/lng_lat'); -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); const smartWrap = require('../util/smart_wrap'); /** diff --git a/src/ui/popup.js b/src/ui/popup.js index e3769cb211d..7a19e94cbe6 100644 --- a/src/ui/popup.js +++ b/src/ui/popup.js @@ -3,7 +3,7 @@ const util = require('../util/util'); const Evented = require('../util/evented'); const DOM = require('../util/dom'); const LngLat = require('../geo/lng_lat'); -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); const window = require('../util/window'); const smartWrap = require('../util/smart_wrap'); diff --git a/src/util/dom.js b/src/util/dom.js index 7fe96af51b0..54ee9368bcb 100644 --- a/src/util/dom.js +++ b/src/util/dom.js @@ -1,5 +1,5 @@ -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); const window = require('./window'); exports.create = function (tagName, className, container) { diff --git a/src/util/find_pole_of_inaccessibility.js b/src/util/find_pole_of_inaccessibility.js index 59f754e182a..886af07446f 100644 --- a/src/util/find_pole_of_inaccessibility.js +++ b/src/util/find_pole_of_inaccessibility.js @@ -1,5 +1,5 @@ const Queue = require('tinyqueue'); -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); const distToSegmentSquared = require('./intersection_tests').distToSegmentSquared; /** diff --git a/src/util/util.js b/src/util/util.js index 0511afaf5f1..152d0b02f80 100644 --- a/src/util/util.js +++ b/src/util/util.js @@ -2,7 +2,7 @@ const UnitBezier = require('@mapbox/unitbezier'); const Coordinate = require('../geo/coordinate'); -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); /** * @module util diff --git a/test/unit/data/fill_bucket.test.js b/test/unit/data/fill_bucket.test.js index f164bc66498..8958ae6650c 100644 --- a/test/unit/data/fill_bucket.test.js +++ b/test/unit/data/fill_bucket.test.js @@ -4,8 +4,8 @@ const test = require('mapbox-gl-js-test').test; const fs = require('fs'); const path = require('path'); const Protobuf = require('pbf'); -const VectorTile = require('vector-tile').VectorTile; -const Point = require('point-geometry'); +const VectorTile = require('@mapbox/vector-tile').VectorTile; +const Point = require('@mapbox/point-geometry'); const ArrayGroup = require('../../../src/data/array_group'); const FillBucket = require('../../../src/data/bucket/fill_bucket'); const StyleLayer = require('../../../src/style/style_layer'); diff --git a/test/unit/data/line_bucket.test.js b/test/unit/data/line_bucket.test.js index eee2ab79145..3724035eee0 100644 --- a/test/unit/data/line_bucket.test.js +++ b/test/unit/data/line_bucket.test.js @@ -4,8 +4,8 @@ const test = require('mapbox-gl-js-test').test; const fs = require('fs'); const path = require('path'); const Protobuf = require('pbf'); -const VectorTile = require('vector-tile').VectorTile; -const Point = require('point-geometry'); +const VectorTile = require('@mapbox/vector-tile').VectorTile; +const Point = require('@mapbox/point-geometry'); const ArrayGroup = require('../../../src/data/array_group'); const LineBucket = require('../../../src/data/bucket/line_bucket'); const StyleLayer = require('../../../src/style/style_layer'); diff --git a/test/unit/data/load_geometry.test.js b/test/unit/data/load_geometry.test.js index 93f93809a16..63ca4160c7a 100644 --- a/test/unit/data/load_geometry.test.js +++ b/test/unit/data/load_geometry.test.js @@ -4,7 +4,7 @@ const test = require('mapbox-gl-js-test').test; const fs = require('fs'); const path = require('path'); const Protobuf = require('pbf'); -const VectorTile = require('vector-tile').VectorTile; +const VectorTile = require('@mapbox/vector-tile').VectorTile; const loadGeometry = require('../../../src/data/load_geometry.js'); // Load a line feature from fixture tile. diff --git a/test/unit/data/symbol_bucket.test.js b/test/unit/data/symbol_bucket.test.js index e9555614de3..d021f66c32a 100644 --- a/test/unit/data/symbol_bucket.test.js +++ b/test/unit/data/symbol_bucket.test.js @@ -4,7 +4,7 @@ const test = require('mapbox-gl-js-test').test; const fs = require('fs'); const path = require('path'); const Protobuf = require('pbf'); -const VectorTile = require('vector-tile').VectorTile; +const VectorTile = require('@mapbox/vector-tile').VectorTile; const SymbolBucket = require('../../../src/data/bucket/symbol_bucket'); const CollisionTile = require('../../../src/symbol/collision_tile'); const CollisionBoxArray = require('../../../src/symbol/collision_box'); diff --git a/test/unit/geo/transform.test.js b/test/unit/geo/transform.test.js index 9fb22a58639..e428d4d6579 100644 --- a/test/unit/geo/transform.test.js +++ b/test/unit/geo/transform.test.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); const Transform = require('../../../src/geo/transform'); const TileCoord = require('../../../src/source/tile_coord'); const LngLat = require('../../../src/geo/lng_lat'); diff --git a/test/unit/symbol/check_max_angle.test.js b/test/unit/symbol/check_max_angle.test.js index c770477ff62..04fab251722 100644 --- a/test/unit/symbol/check_max_angle.test.js +++ b/test/unit/symbol/check_max_angle.test.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); const checkMaxAngle = require('../../../src/symbol/check_max_angle'); const Anchor = require('../../../src/symbol/anchor'); diff --git a/test/unit/symbol/collision_feature.js b/test/unit/symbol/collision_feature.js index 754d740ad4b..73dd3455904 100644 --- a/test/unit/symbol/collision_feature.js +++ b/test/unit/symbol/collision_feature.js @@ -3,7 +3,7 @@ const test = require('mapbox-gl-js-test').test; const CollisionFeature = require('../../../src/symbol/collision_feature'); const Anchor = require('../../../src/symbol/anchor'); -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); const CollisionBoxArray = require('../../../src/symbol/collision_box'); test('CollisionFeature', (t) => { diff --git a/test/unit/symbol/get_anchors.test.js b/test/unit/symbol/get_anchors.test.js index 57d94cb3b69..ac7a4ec1670 100644 --- a/test/unit/symbol/get_anchors.test.js +++ b/test/unit/symbol/get_anchors.test.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); const getAnchors = require('../../../src/symbol/get_anchors'); const TILE_EXTENT = 4096; diff --git a/test/unit/symbol/mergelines.test.js b/test/unit/symbol/mergelines.test.js index 0cc1c3db39d..a7f37cb267a 100644 --- a/test/unit/symbol/mergelines.test.js +++ b/test/unit/symbol/mergelines.test.js @@ -2,7 +2,7 @@ const test = require('mapbox-gl-js-test').test; const mergeLines = require('../../../src/symbol/mergelines'); -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); function makeFeatures(lines) { const features = []; diff --git a/test/unit/ui/popup.test.js b/test/unit/ui/popup.test.js index fe9a7eccd4a..b0c24f02832 100644 --- a/test/unit/ui/popup.test.js +++ b/test/unit/ui/popup.test.js @@ -5,7 +5,7 @@ const window = require('../../../src/util/window'); const Map = require('../../../src/ui/map'); const Popup = require('../../../src/ui/popup'); const LngLat = require('../../../src/geo/lng_lat'); -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); const simulateClick = require('mapbox-gl-js-test/simulate_interaction').click; const containerWidth = 512; diff --git a/test/unit/util/classify_rings.test.js b/test/unit/util/classify_rings.test.js index 3d455ec6ac7..d2171f0647e 100644 --- a/test/unit/util/classify_rings.test.js +++ b/test/unit/util/classify_rings.test.js @@ -4,7 +4,7 @@ const test = require('mapbox-gl-js-test').test; const fs = require('fs'); const path = require('path'); const Protobuf = require('pbf'); -const VectorTile = require('vector-tile').VectorTile; +const VectorTile = require('@mapbox/vector-tile').VectorTile; const classifyRings = require('../../../src/util/classify_rings'); // Load a fill feature from fixture tile. diff --git a/test/unit/util/find_pole_of_inaccessibility.test.js b/test/unit/util/find_pole_of_inaccessibility.test.js index 1ee298c55a9..f52f90f9d09 100644 --- a/test/unit/util/find_pole_of_inaccessibility.test.js +++ b/test/unit/util/find_pole_of_inaccessibility.test.js @@ -1,7 +1,7 @@ 'use strict'; const test = require('mapbox-gl-js-test').test; -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); const findPoleOfInaccessibility = require('../../../src/util/find_pole_of_inaccessibility'); test('polygon_poi', (t) => { diff --git a/test/unit/util/util.test.js b/test/unit/util/util.test.js index a33580b726f..4c9e5e4f022 100644 --- a/test/unit/util/util.test.js +++ b/test/unit/util/util.test.js @@ -4,7 +4,7 @@ const test = require('mapbox-gl-js-test').test; const Coordinate = require('../../../src/geo/coordinate'); const util = require('../../../src/util/util'); -const Point = require('point-geometry'); +const Point = require('@mapbox/point-geometry'); test('util', (t) => { t.equal(util.easeCubicInOut(0), 0, 'easeCubicInOut=0'); diff --git a/yarn.lock b/yarn.lock index 5c508c7026d..f1329328e54 100644 --- a/yarn.lock +++ b/yarn.lock @@ -21,6 +21,10 @@ pngjs "^3.0.0" st "^1.1.0" +"@mapbox/point-geometry@0.1.0", "@mapbox/point-geometry@^0.1.0", "@mapbox/point-geometry@~0.1.0": + version "0.1.0" + resolved "https://registry.yarnpkg.com/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz#8a83f9335c7860effa2eeeca254332aa0aeed8f2" + "@mapbox/shelf-pack@^3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@mapbox/shelf-pack/-/shelf-pack-3.0.0.tgz#44e284c8336eeda1e9dbbb1d61954c70e26e5766" @@ -33,6 +37,12 @@ version "0.0.0" resolved "https://registry.yarnpkg.com/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz#15651bd553a67b8581fb398810c98ad86a34524e" +"@mapbox/vector-tile@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@mapbox/vector-tile/-/vector-tile-1.3.0.tgz#c495f972525befccefcd838f45ffa37ef3b70fe8" + dependencies: + "@mapbox/point-geometry" "~0.1.0" + "@mapbox/whoots-js@^3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.0.0.tgz#c1de4293081424da3ac30c23afa850af1019bb54" @@ -2757,9 +2767,9 @@ geojson-area@0.1.0: dependencies: wgs84 "0.0.0" -geojson-rewind@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/geojson-rewind/-/geojson-rewind-0.1.0.tgz#57022a054b196660d755354fe5d26684d90cd019" +geojson-rewind@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/geojson-rewind/-/geojson-rewind-0.2.0.tgz#ea558e9e44ff03b8655d0a08b75078dc33a15e79" dependencies: concat-stream "~1.2.1" geojson-area "0.1.0" @@ -4820,9 +4830,9 @@ pause-stream@0.0.11: dependencies: through "~2.3" -pbf@^1.3.2: - version "1.3.7" - resolved "https://registry.yarnpkg.com/pbf/-/pbf-1.3.7.tgz#1e3d047ba3cbe8086ae854a25503ab4537d4335d" +pbf@^3.0.5: + version "3.0.5" + resolved "https://registry.yarnpkg.com/pbf/-/pbf-3.0.5.tgz#24f0fa2cbeb16e5c56a5901bb7e9c2ac0c8059be" dependencies: ieee754 "^1.1.6" resolve-protobuf-schema "^2.0.0" @@ -4892,10 +4902,6 @@ pngjs@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.2.0.tgz#fc9fcea1a8a375da54a51148019d5abd41dbabde" -point-geometry@0.0.0, point-geometry@^0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/point-geometry/-/point-geometry-0.0.0.tgz#6fcbcad7a803b6418247dd6e49c2853c584daff7" - postcss-less@^0.14.0: version "0.14.0" resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-0.14.0.tgz#c631b089c6cce422b9a10f3a958d2bedd3819324" @@ -6584,12 +6590,6 @@ validate-npm-package-license@^3.0.1: spdx-correct "~1.0.0" spdx-expression-parse "~1.0.0" -vector-tile@^1.1.3, vector-tile@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/vector-tile/-/vector-tile-1.3.0.tgz#06d516a83b063f04c82ef539cf1bb1aebeb696b4" - dependencies: - point-geometry "0.0.0" - verror@1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c" @@ -6676,13 +6676,13 @@ vm-browserify@~0.0.1: dependencies: indexof "0.0.1" -vt-pbf@^2.0.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/vt-pbf/-/vt-pbf-2.1.2.tgz#75409fded5f6c3910073a64c3e575cdeba387f01" +vt-pbf@^2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/vt-pbf/-/vt-pbf-2.1.3.tgz#de403e1dd3af363924b469ca713a81d60673223c" dependencies: - pbf "^1.3.2" - point-geometry "0.0.0" - vector-tile "^1.1.3" + "@mapbox/point-geometry" "0.1.0" + "@mapbox/vector-tile" "^1.3.0" + pbf "^3.0.5" watchify@^3.7.0: version "3.9.0"