tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[build] Update gl-js

Browse Source
This commit is contained in:
John Firebaugh
2018-06-27 10:58:17 -07:00
parent 4291688b86
commit 7fb2aade96
7 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/node.cmake
View File

@@ -101,6 +101,7 @@ xcode_create_scheme(
TYPE node
NAME "node render tests (Active ABI)"
ARGS
"-r esm"
"platform/node/test/render.test.js"
OPTIONAL_ARGS
"group"
@@ -112,6 +113,7 @@ xcode_create_scheme(
TYPE node
NAME "node query tests (Active ABI)"
ARGS
"-r esm"
"platform/node/test/query.test.js"
OPTIONAL_ARGS
"group"
@@ -123,6 +125,7 @@ xcode_create_scheme(
TYPE node
NAME "node expression tests (Active ABI)"
ARGS
"-r esm"
"platform/node/test/expression.test.js"
OPTIONAL_ARGS
"group"
@@ -134,6 +137,7 @@ xcode_create_scheme(
TYPE node
NAME "node-benchmark (Active ABI)"
ARGS
"-r esm"
"platform/node/test/benchmark.js"
OPTIONAL_ARGS
"group"

2
mapbox-gl-js

Submodule mapbox-gl-js updated: 47e637c398...6c22a1720d

7
package.json
View File

@@ -22,6 +22,7 @@
"aws-sdk": "^2.285.1",
"csscolorparser": "^1.0.2",
"ejs": "^2.4.1",
"esm": "^3.0.55",
"express": "^4.11.1",
"flow-remove-types": "^1.2.1",
"json-stringify-pretty-compact": "^1.0.4",
@@ -43,9 +44,9 @@
"test": "tape platform/node/test/js/**/*.test.js",
"test-memory": "node --expose-gc platform/node/test/memory.test.js",
"test-suite": "run-s test-render test-query test-expressions",
"test-expressions": "node platform/node/test/expression.test.js",
"test-render": "node platform/node/test/render.test.js",
"test-query": "node platform/node/test/query.test.js"
"test-expressions": "node -r esm platform/node/test/expression.test.js",
"test-render": "node -r esm platform/node/test/render.test.js",
"test-query": "node -r esm platform/node/test/query.test.js"
},
"gypfile": true,
"binary": {

16
platform/node/test/expression.test.js
View File

@@ -1,10 +1,8 @@
'use strict';
import {run} from '../../../mapbox-gl-js/test/integration/lib/expression';
import mbgl from '../index';
import ignores from './ignores.json';
var suite = require('../../../mapbox-gl-js/test/integration').expression;
var mbgl = require('../index');
var ignores = require('./ignores.json');
var tests;
let tests;
if (process.argv[1] === __filename && process.argv.length > 2) {
tests = process.argv.slice(2);
@@ -30,7 +28,7 @@ function getExpectedType(spec) {
return typeof spec.type === 'string' ? {kind: spec.type} : null;
}
suite.run('native', {ignores: ignores, tests: tests}, (fixture) => {
run('native', {ignores, tests}, (fixture) => {
const compiled = {};
const recompiled = {};
const result = {
@@ -55,7 +53,7 @@ suite.run('native', {ignores: ignores, tests: tests}, (fixture) => {
type: 'Feature',
properties: {},
geometry: { type: 'Point', coordinates: [0, 0] }
}, input[1])
}, input[1]);
const output = expression.evaluate(input[0], feature);
evaluateResults.push(output);
@@ -68,7 +66,7 @@ suite.run('native', {ignores: ignores, tests: tests}, (fixture) => {
compilationResult.result = 'error';
compilationResult.errors = expression;
}
}
};
result.outputs = evaluateExpression(expression, compiled);
if (expression instanceof mbgl.Expression) {

10
platform/node/test/query.test.js
View File

@@ -1,8 +1,6 @@
'use strict';
const suite = require('../../../mapbox-gl-js/test/integration').query;
const suiteImplementation = require('./suite_implementation');
const ignores = require('./ignores.json');
import {run} from '../../../mapbox-gl-js/test/integration/lib/query';
import implementation from './suite_implementation';
import ignores from './ignores.json';
let tests;
@@ -10,4 +8,4 @@ if (process.argv[1] === __filename && process.argv.length > 2) {
tests = process.argv.slice(2);
}
suite.run('native', {tests: tests, ignores: ignores}, suiteImplementation);
run('native', {tests, ignores}, implementation);

10
platform/node/test/render.test.js
View File

@@ -1,7 +1,5 @@
'use strict';
import {run} from '../../../mapbox-gl-js/test/integration/lib/render';
import implementation from './suite_implementation';
import ignores from './ignores.json';
const suite = require('../../../mapbox-gl-js/test/integration').render;
const suiteImplementation = require('./suite_implementation');
const ignores = require('./ignores.json');
suite.run('native', ignores, suiteImplementation);
run('native', ignores, implementation);

46
platform/node/test/suite_implementation.js
View File

@@ -1,24 +1,24 @@
'use strict';
var mbgl = require('../index');
var request = require('request');
var PNG = require('pngjs').PNG;
var fs = require('fs');
var path = require('path');
import mbgl from '../index';
import request from 'request';
import {PNG} from 'pngjs';
import * as fs from 'fs';
import * as path from 'path';
mbgl.on('message', function(msg) {
console.log('%s (%s): %s', msg.severity, msg.class, msg.text);
});
// Map of map objects by pixel ratio
var maps = new Map();
const maps = new Map();
export default function (style, options, callback) {
const tileMode = options.mapMode === 'tile';
let map;
module.exports = function (style, options, callback) {
var tileMode = options.mapMode === 'tile';
if (options.recycleMap) {
var key = options.pixelRatio + '/' + tileMode;
const key = options.pixelRatio + '/' + tileMode;
if (maps.has(key)) {
var map = maps.get(key);
map = maps.get(key);
map.request = mapRequest;
} else {
maps.set(key, new mbgl.Map({
@@ -26,18 +26,18 @@ module.exports = function (style, options, callback) {
request: mapRequest,
mode: options.mapMode
}));
var map = maps.get(key);
map = maps.get(key);
}
} else {
var map = new mbgl.Map({
map = new mbgl.Map({
ratio: options.pixelRatio,
request: mapRequest,
mode: options.mapMode
});
}
var timedOut = false;
var watchdog = setTimeout(function () {
let timedOut = false;
const watchdog = setTimeout(function () {
timedOut = true;
map.dumpDebugLogs();
callback(new Error('timed out after 20 seconds'));
@@ -61,19 +61,19 @@ module.exports = function (style, options, callback) {
request(req.url, {encoding: null}, function (err, response, body) {
if (err) {
callback(err);
} else if (response.statusCode == 404) {
} else if (response.statusCode === 404) {
callback();
} else if (response.statusCode != 200) {
} else if (response.statusCode !== 200) {
callback(new Error(response.statusMessage));
} else {
callback(null, {data: body});
}
});
};
}
applyOperations(options.operations, function() {
map.render(options, function (err, pixels) {
var results = options.queryGeometry ?
const results = options.queryGeometry ?
map.queryRenderedFeatures(options.queryGeometry, options.queryOptions || {}) :
[];
if (!options.recycleMap) {
@@ -86,7 +86,7 @@ module.exports = function (style, options, callback) {
});
function applyOperations(operations, callback) {
var operation = operations && operations[0];
const operation = operations && operations[0];
if (!operations || operations.length === 0) {
callback();
@@ -102,7 +102,7 @@ module.exports = function (style, options, callback) {
applyOperations(operations.slice(1), callback);
}, operation[1]);
} else if (operation[0] === 'addImage' || operation[0] === 'updateImage') {
var img = PNG.sync.read(fs.readFileSync(path.join(__dirname, '../../../mapbox-gl-js/test/integration', operation[2])));
const img = PNG.sync.read(fs.readFileSync(path.join(__dirname, '../../../mapbox-gl-js/test/integration', operation[2])));
const testOpts = (operation.length > 3) ? operation[3] : {};
const options = {
@@ -110,7 +110,7 @@ module.exports = function (style, options, callback) {
width: img.width,
pixelRatio: testOpts.pixelRatio || 1,
sdf: testOpts.sdf || false
}
};
map.addImage(operation[1], img.data, options);