@acalcutt/maplibre-gl-native-test 5.0.1-pre.16 → 5.0.2-pre.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acalcutt/maplibre-gl-native-test",
-  "version": "5.0.1-pre.16",
+  "version": "5.0.2-pre.1",
   "description": "Renders map tiles with Maplibre GL",
   "keywords": [
     "maplibre",
@@ -27,7 +27,7 @@
     "@mapbox/flow-remove-types": "^2.0.0",
     "@mapbox/mvt-fixtures": "3.10.0",
     "@octokit/plugin-retry": "^3.0.9",
-    "@octokit/rest": "^19.0.4",
+    "@octokit/rest": "^19.0.5",
     "aws-sdk": "^2.1231.0",
     "csscolorparser": "~1.0.2",
     "d3-queue": "3.0.7",

package/platform/node/CMakeLists.txt

@@ -1,14 +1,14 @@
 if(EXISTS ${PROJECT_SOURCE_DIR}/node_modules/@mapbox/cmake-node-module/module.cmake)
-    set(NODE_MODULE_DIR ${PROJECT_SOURCE_DIR}/node_modules)
+    set(CMAKE_NODE_MODULE ${PROJECT_SOURCE_DIR}/node_modules/@mapbox/cmake-node-module/module.cmake)
 elseif(EXISTS ${PROJECT_SOURCE_DIR}/../../../node_modules/@mapbox/cmake-node-module/module.cmake)
-    set(NODE_MODULE_DIR ${PROJECT_SOURCE_DIR}/../../../node_modules)
+    set(CMAKE_NODE_MODULE ${PROJECT_SOURCE_DIR}/../../../node_modules/@mapbox/cmake-node-module/module.cmake)
 else()
-    message(WARNING "Not building node bindings in , dependencies not found in ${PROJECT_SOURCE_DIR}/node_modules/@mapbox/cmake-node-module/module.cmake. Run 'npm update'.")
+    message(WARNING "Not building node bindings in , dependencies not found. Run 'npm update'.")
     return()
 endif()
 
 set(NODE_MODULE_CACHE_DIR ${CMAKE_SOURCE_DIR}/build/headers)
-include(${NODE_MODULE_DIR}/@mapbox/cmake-node-module/module.cmake)
+include(${CMAKE_NODE_MODULE})
 
 add_node_module(
     mbgl-node

package/maplibre-gl-js/bench/lib/access_token.js

@@ -1,16 +0,0 @@
-const accessToken = (
-    process.env.MapboxAccessToken ||
-    process.env.MAPBOX_ACCESS_TOKEN ||
-    getURLParameter('access_token') ||
-    localStorage.getItem('accessToken')
-);
-
-localStorage.setItem('accessToken', accessToken);
-
-export default accessToken;
-
-function getURLParameter(name) {
-    const regexp = new RegExp(`[?&]${name}=([^&#]*)`, 'i');
-    const output = regexp.exec(window.location.href);
-    return output && output[1];
-}

package/maplibre-gl-js/bench/lib/benchmark.js

@@ -1,128 +0,0 @@
-// @flow
-// According to https://developer.mozilla.org/en-US/docs/Web/API/Performance/now,
-// performance.now() should be accurate to 0.005ms. Set the minimum running
-// time for a single measurement at 5ms, so that the error due to timer
-// precision is < 0.1%.
-const minTimeForMeasurement = 0.005 * 1000;
-
-export type Measurement = {
-    iterations: number,
-    time: number
-};
-
-class Benchmark {
-
-    constructor() {
-        this._measureAsync = this._measureAsync.bind(this);
-    }
-
-    /**
-     * The `setup` method is intended to be overridden by subclasses. It will be called once, prior to
-     * running any benchmark iterations, and may set state on `this` which the benchmark later accesses.
-     * If the setup involves an asynchronous step, `setup` may return a promise.
-     */
-    setup(): Promise<void> | void {}
-
-    /**
-     * The `bench` method is intended to be overridden by subclasses. It should contain the code to be
-     * benchmarked. It may access state on `this` set by the `setup` function (but should not modify this
-     * state). It will be called multiple times, the total number to be determined by the harness. If
-     * the benchmark involves an asynchronous step, `bench` may return a promise.
-     */
-    bench(): Promise<void> | void {}
-
-    /**
-     * The `teardown` method is intended to be overridden by subclasses. It will be called once, after
-     * running all benchmark iterations, and may perform any necessary cleanup. If cleaning up involves
-     * an asynchronous step, `teardown` may return a promise.
-     */
-    teardown(): Promise<void> | void {}
-
-    _measureAsync: () => Promise<Array<Measurement>>;
-    _elapsed: number;
-    _measurements: Array<Measurement>;
-    _iterationsPerMeasurement: number;
-    _start: number;
-
-    /**
-     * Run the benchmark by executing `setup` once, sampling the execution time of `bench` some number of
-     * times, and then executing `teardown`. Yields an array of execution times.
-     */
-    run(): Promise<?Array<Measurement>> {
-        return Promise.resolve(this.setup())
-            .then(() => this._begin())
-            .catch(e => {
-                // The bench run will break here but should at least provide helpful information:
-                console.error(e);
-            });
-    }
-
-    _done() {
-        // 210 samples => 20 observations for regression
-        return this._elapsed >= 500 && this._measurements.length > 210;
-    }
-
-    _begin(): Promise<Array<Measurement>> {
-        this._measurements = [];
-        this._elapsed = 0;
-        this._iterationsPerMeasurement = 1;
-        this._start = performance.now();
-
-        const bench = this.bench();
-        if (bench instanceof Promise) {
-            return bench.then(this._measureAsync);
-        } else {
-            return (this._measureSync(): any);
-        }
-    }
-
-    _measureSync() {
-        // Avoid Promise overhead for sync benchmarks.
-        while (true) {
-            const time = performance.now() - this._start;
-            this._elapsed += time;
-            if (time < minTimeForMeasurement) {
-                this._iterationsPerMeasurement++;
-            } else {
-                this._measurements.push({time, iterations: this._iterationsPerMeasurement});
-            }
-            if (this._done()) {
-                return this._end();
-            }
-            this._start = performance.now();
-            for (let i = this._iterationsPerMeasurement; i > 0; --i) {
-                this.bench();
-            }
-        }
-    }
-
-    _measureAsync(): Promise<Array<Measurement>> {
-        const time = performance.now() - this._start;
-        this._elapsed += time;
-        if (time < minTimeForMeasurement) {
-            this._iterationsPerMeasurement++;
-        } else {
-            this._measurements.push({time, iterations: this._iterationsPerMeasurement});
-        }
-        if (this._done()) {
-            return this._end();
-        }
-        this._start = performance.now();
-        return this._runAsync(this._iterationsPerMeasurement).then(this._measureAsync);
-    }
-
-    _runAsync(n: number): Promise<void> {
-        const bench = ((this.bench(): any): Promise<void>);
-        if (n === 1) {
-            return bench;
-        } else {
-            return bench.then(() => this._runAsync(n - 1));
-        }
-    }
-
-    _end(): Promise<Array<Measurement>> {
-        return Promise.resolve(this.teardown()).then(() => this._measurements);
-    }
-}
-
-export default Benchmark;

package/maplibre-gl-js/bench/lib/create_map.js

@@ -1,45 +0,0 @@
-// @flow
-
-import Map from '../../src/ui/map';
-
-export default function (options: any): Promise<Map> {
-    return new Promise((resolve, reject) => {
-        if (options) {
-            options.stubRender = options.stubRender == null ? true : options.stubRender;
-            options.showMap = options.showMap == null ? false : options.showMap;
-        }
-
-        const container = document.createElement('div');
-        container.style.width = `${options.width || 512}px`;
-        container.style.height = `${options.height || 512}px`;
-        container.style.margin = '0 auto';
-        container.style.display = 'block';
-
-        if (!options.showMap) {
-            container.style.visibility = 'hidden';
-        }
-        (document.body: any).appendChild(container);
-
-        const map = new Map(Object.assign({
-            container,
-            style: 'mapbox://styles/mapbox/streets-v10'
-        }, options));
-
-        map
-            .on(options.idle ? 'idle' : 'load', () => {
-                if (options.stubRender) {
-                    // Stub out `_rerender`; benchmarks need to be the only trigger of `_render` from here on out.
-                    map._rerender = () => {};
-
-                    // If there's a pending rerender, cancel it.
-                    if (map._frame) {
-                        map._frame.cancel();
-                        map._frame = null;
-                    }
-                }
-                resolve(map);
-            })
-            .on('error', (e) => reject(e.error))
-            .on('remove', () => container.remove());
-    });
-}

package/maplibre-gl-js/bench/lib/fetch_style.js

@@ -1,12 +0,0 @@
-// @flow
-
-import type {StyleSpecification} from '../../src/style-spec/types';
-import {RequestManager} from '../../src/util/mapbox';
-
-const requestManager = new RequestManager();
-
-export default function fetchStyle(value: string | StyleSpecification): Promise<StyleSpecification> {
-    return typeof value === 'string' ?
-        fetch(requestManager.normalizeStyleURL(value)).then(response => response.json()) :
-        Promise.resolve(value);
-}

package/maplibre-gl-js/bench/lib/locations_with_tile_id.js

@@ -1,24 +0,0 @@
-import MercatorCoordinate from '../../src/geo/mercator_coordinate';
-import {OverscaledTileID} from '../../src/source/tile_id';
-
-export default function locationsWithTileID(locations) {
-    return locations.map(feature => {
-        const {coordinates} = feature.geometry;
-        const {zoom} = feature.properties;
-        const {x, y} = MercatorCoordinate.fromLngLat({
-            lng: coordinates[0],
-            lat: coordinates[1]
-        });
-
-        const scale = Math.pow(2, zoom);
-        const tileX = Math.floor(x * scale);
-        const tileY = Math.floor(y * scale);
-
-        return {
-            description: feature.properties['place_name'],
-            tileID: [new OverscaledTileID(zoom, 0, zoom, tileX, tileY)],
-            zoom,
-            center: coordinates
-        };
-    });
-}

package/maplibre-gl-js/bench/lib/statistics.js

@@ -1,109 +0,0 @@
-import * as d3 from 'd3';
-
-export function probabilitiesOfSuperiority(before, after) {
-    const timerPrecision = 0.005;
-
-    let superiorCount = 0;
-    let inferiorCount = 0;
-    let equalCount = 0;
-    let N = 0;
-    for (const b of before) {
-        for (const a of after) {
-            N++;
-            if (b - a > timerPrecision) superiorCount++;
-            else if (a - b > timerPrecision) inferiorCount++;
-            else equalCount++;
-        }
-    }
-
-    return {
-        superior: (superiorCount + equalCount) / N,
-        inferior: (inferiorCount + equalCount) / N
-    };
-}
-
-export function summaryStatistics(data) {
-    const variance = d3.variance(data);
-    const sorted = data.slice().sort(d3.ascending);
-    const [q1, q2, q3] = [.25, .5, .75].map((d) => d3.quantile(sorted, d));
-    const mean = d3.mean(sorted);
-    let min = [NaN, Infinity];
-    let max = [NaN, -Infinity];
-    for (let i = 0; i < data.length; i++) {
-        const s = data[i];
-        if (s < min[1]) min = [i, s];
-        if (s > max[1]) max = [i, s];
-    }
-
-    // 20% trimmed mean
-    const [lowerQuintile, upperQuintile] = [.2, .8].map(d => d3.quantile(sorted, d));
-    const trimmedMean = d3.mean(data.filter(d => d >= lowerQuintile && d <= upperQuintile));
-    const windsorizedDeviation = d3.deviation(data.map(d =>
-        d < lowerQuintile ? lowerQuintile :
-        d > upperQuintile ? upperQuintile :
-        d
-    ));
-
-    return {
-        mean,
-        trimmedMean,
-        variance,
-        deviation: Math.sqrt(variance),
-        windsorizedDeviation,
-        q1,
-        q2,
-        q3,
-        iqr: q3 - q1,
-        argmin: min[0], // index of minimum value
-        min: min[1],
-        argmax: max[0], // index of maximum value
-        max: max[1]
-    };
-}
-
-export function regression(measurements) {
-    const result = [];
-    for (let i = 0, n = 1; i + n < measurements.length; i += n, n++) {
-        const subset = measurements.slice(i, i + n);
-        result.push([
-            subset.reduce((sum, measurement) => sum + measurement.iterations, 0),
-            subset.reduce((sum, measurement) => sum + measurement.time, 0)
-        ]);
-    }
-    return leastSquaresRegression(result);
-}
-
-function leastSquaresRegression(data) {
-    const meanX = d3.sum(data, d => d[0]) / data.length;
-    const meanY = d3.sum(data, d => d[1]) / data.length;
-    const varianceX = d3.variance(data, d => d[0]);
-    const sdX = Math.sqrt(varianceX);
-    const sdY = d3.deviation(data, d => d[1]);
-    const covariance = d3.sum(data, ([x, y]) =>
-        (x - meanX) * (y - meanY)
-    ) / (data.length - 1);
-
-    const correlation = covariance / sdX / sdY;
-    const slope = covariance / varianceX;
-    const intercept = meanY - slope * meanX;
-
-    return {correlation, slope, intercept, data};
-}
-
-export function kde(samples, summary, ticks) {
-    const kernel = kernelEpanechnikov;
-
-    if (samples.length === 0) {
-        return [];
-    }
-    // https://en.wikipedia.org/wiki/Kernel_density_estimation#A_rule-of-thumb_bandwidth_estimator
-    const bandwidth = 1.06 * summary.windsorizedDeviation * Math.pow(samples.length, -0.2);
-    return ticks.map((x) => {
-        return [x, d3.mean(samples, (v) => kernel((x - v) / bandwidth)) / bandwidth];
-    });
-}
-
-function kernelEpanechnikov(v) {
-    return Math.abs(v) <= 1 ? 0.75 * (1 - v * v) : 0;
-}
-

package/maplibre-gl-js/bench/lib/tile_parser.js

@@ -1,148 +0,0 @@
-// @flow
-
-import Protobuf from 'pbf';
-import VT from '@mapbox/vector-tile';
-import assert from 'assert';
-
-import deref from '../../src/style-spec/deref';
-import Style from '../../src/style/style';
-import {Evented} from '../../src/util/evented';
-import {RequestManager} from '../../src/util/mapbox';
-import WorkerTile from '../../src/source/worker_tile';
-import StyleLayerIndex from '../../src/style/style_layer_index';
-
-import type {StyleSpecification} from '../../src/style-spec/types';
-import type {WorkerTileResult} from '../../src/source/worker_source';
-import type {OverscaledTileID} from '../../src/source/tile_id';
-import type {TileJSON} from '../../src/types/tilejson';
-
-class StubMap extends Evented {
-    _requestManager: RequestManager;
-
-    constructor() {
-        super();
-        this._requestManager = new RequestManager();
-    }
-}
-
-const mapStub = new StubMap();
-
-function createStyle(styleJSON: StyleSpecification): Promise<Style> {
-    return new Promise((resolve, reject) => {
-        const style = new Style((mapStub: any));
-        style.loadJSON(styleJSON);
-        style
-            .on('style.load', () => resolve(style))
-            .on('error', reject);
-    });
-}
-
-function fetchTileJSON(requestManager: RequestManager, sourceURL: string): Promise<TileJSON> {
-    return fetch(requestManager.normalizeSourceURL(sourceURL))
-        .then(response => response.json());
-}
-
-export default class TileParser {
-    styleJSON: StyleSpecification;
-    tileJSON: TileJSON;
-    sourceID: string;
-    layerIndex: StyleLayerIndex;
-    icons: Object;
-    glyphs: Object;
-    style: Style;
-    actor: { send: Function };
-
-    constructor(styleJSON: StyleSpecification, sourceID: string) {
-        this.styleJSON = styleJSON;
-        this.sourceID = sourceID;
-        this.layerIndex = new StyleLayerIndex(deref(this.styleJSON.layers));
-        this.glyphs = {};
-        this.icons = {};
-    }
-
-    loadImages(params: Object, callback: Function) {
-        const key = JSON.stringify(params);
-        if (this.icons[key]) {
-            callback(null, this.icons[key]);
-        } else {
-            this.style.getImages('', params, (err, icons) => {
-                this.icons[key] = icons;
-                callback(err, icons);
-            });
-        }
-    }
-
-    loadGlyphs(params: Object, callback: Function) {
-        const key = JSON.stringify(params);
-        if (this.glyphs[key]) {
-            callback(null, this.glyphs[key]);
-        } else {
-            this.style.getGlyphs('', params, (err, glyphs) => {
-                this.glyphs[key] = glyphs;
-                callback(err, glyphs);
-            });
-        }
-    }
-
-    setup(): Promise<void> {
-        const parser = this;
-        this.actor = {
-            send(action, params, callback) {
-                setTimeout(() => {
-                    if (action === 'getImages') {
-                        parser.loadImages(params, callback);
-                    } else if (action === 'getGlyphs') {
-                        parser.loadGlyphs(params, callback);
-                    } else assert(false);
-                }, 0);
-            }
-        };
-
-        return Promise.all([
-            createStyle(this.styleJSON),
-            fetchTileJSON(mapStub._requestManager, (this.styleJSON.sources[this.sourceID]: any).url)
-        ]).then(([style: Style, tileJSON: TileJSON]) => {
-            this.style = style;
-            this.tileJSON = tileJSON;
-        });
-    }
-
-    fetchTile(tileID: OverscaledTileID) {
-        return fetch(this.style.map._requestManager.normalizeTileURL(tileID.canonical.url(this.tileJSON.tiles)))
-            .then(response => response.arrayBuffer())
-            .then(buffer => ({tileID, buffer}));
-    }
-
-    parseTile(tile: {tileID: OverscaledTileID, buffer: ArrayBuffer}, returnDependencies?: boolean): Promise<?WorkerTileResult> {
-        const workerTile = new WorkerTile({
-            tileID: tile.tileID,
-            zoom: tile.tileID.overscaledZ,
-            tileSize: 512,
-            overscaling: 1,
-            showCollisionBoxes: false,
-            source: this.sourceID,
-            uid: '0',
-            maxZoom: 22,
-            pixelRatio: 1,
-            request: {url: ''},
-            angle: 0,
-            pitch: 0,
-            cameraToCenterDistance: 0,
-            cameraToTileDistance: 0,
-            returnDependencies,
-            promoteId: undefined
-        });
-
-        const vectorTile = new VT.VectorTile(new Protobuf(tile.buffer));
-
-        return new Promise((resolve, reject) => {
-            workerTile.parse(vectorTile, this.layerIndex, [], (this.actor: any), (err, result) => {
-                if (err) {
-                    reject(err);
-                } else {
-                    resolve(result);
-                }
-            });
-        });
-    }
-}