Use @mapbox-scoped packages; upgrade pbf to match vt-pbf

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');
 

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;

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;
     }

package.json

@@ -14,25 +14,26 @@
   },
   "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",
     "lodash.isequal": "^3.0.4",
     "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": {

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:

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');
 

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;

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'),

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');

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

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');

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');

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');

src/symbol/anchor.js

@@ -1,5 +1,5 @@
 
-const Point = require('point-geometry');
+const Point = require('@mapbox/point-geometry');
 
 class Anchor extends Point {
 

src/symbol/clip_line.js

@@ -1,5 +1,5 @@
 
-const Point = require('point-geometry');
+const Point = require('@mapbox/point-geometry');
 
 module.exports = clipLine;
 

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

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');
 

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');

src/symbol/quads.js

@@ -1,5 +1,5 @@
 
-const Point = require('point-geometry');
+const Point = require('@mapbox/point-geometry');
 
 module.exports = {
     getIconQuads: getIconQuads,

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'),

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');
 
 /**

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');

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');
 
 /**

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');
 

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) {

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;
 
 /**

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

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');

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');

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.

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');

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');

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');
 

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) => {

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;

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 = [];

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;

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.

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) => {