Add style validation and skip invalid styles
This commit is contained in:
parent
d7a34f3a74
commit
298d09845d
3 changed files with 19 additions and 3 deletions
|
@ -18,6 +18,7 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@mapbox/mapbox-gl-native": "5.0.2",
|
"@mapbox/mapbox-gl-native": "5.0.2",
|
||||||
|
"@mapbox/mapbox-gl-style-spec": "13.9.1",
|
||||||
"@mapbox/mbtiles": "0.11.0",
|
"@mapbox/mbtiles": "0.11.0",
|
||||||
"@mapbox/sphericalmercator": "1.1.0",
|
"@mapbox/sphericalmercator": "1.1.0",
|
||||||
"@mapbox/vector-tile": "1.3.1",
|
"@mapbox/vector-tile": "1.3.1",
|
||||||
|
@ -27,6 +28,7 @@
|
||||||
"color": "3.1.2",
|
"color": "3.1.2",
|
||||||
"commander": "4.0.1",
|
"commander": "4.0.1",
|
||||||
"cors": "2.8.5",
|
"cors": "2.8.5",
|
||||||
|
"esm": "3.2.25",
|
||||||
"express": "4.17.1",
|
"express": "4.17.1",
|
||||||
"glyph-pbf-composite": "0.0.2",
|
"glyph-pbf-composite": "0.0.2",
|
||||||
"handlebars": "4.5.3",
|
"handlebars": "4.5.3",
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
require = require('esm')(module);
|
||||||
|
|
||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const request = require('request');
|
const request = require('request');
|
||||||
|
|
|
@ -5,6 +5,7 @@ const fs = require('fs');
|
||||||
|
|
||||||
const clone = require('clone');
|
const clone = require('clone');
|
||||||
const express = require('express');
|
const express = require('express');
|
||||||
|
import {validate} from '@mapbox/mapbox-gl-style-spec';
|
||||||
|
|
||||||
const utils = require('./utils');
|
const utils = require('./utils');
|
||||||
|
|
||||||
|
@ -77,14 +78,25 @@ module.exports = {
|
||||||
},
|
},
|
||||||
add: (options, repo, params, id, publicUrl, reportTiles, reportFont) => {
|
add: (options, repo, params, id, publicUrl, reportTiles, reportFont) => {
|
||||||
const styleFile = path.resolve(options.paths.styles, params.style);
|
const styleFile = path.resolve(options.paths.styles, params.style);
|
||||||
let styleJSON;
|
|
||||||
|
let styleFileData;
|
||||||
try {
|
try {
|
||||||
styleJSON = JSON.parse(fs.readFileSync(styleFile));
|
styleFileData = fs.readFileSync(styleFile);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.log('Error parsing style file');
|
console.log('Error reading style file');
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let validationErrors = validate(styleFileData);
|
||||||
|
if (validationErrors.length > 0) {
|
||||||
|
console.log(`The file "${params.style}" is not valid a valid style file:`);
|
||||||
|
for (const err of validationErrors) {
|
||||||
|
console.log(`${err.line}: ${err.message}`);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
let styleJSON = JSON.parse(styleFileData);
|
||||||
|
|
||||||
for (const name of Object.keys(styleJSON.sources)) {
|
for (const name of Object.keys(styleJSON.sources)) {
|
||||||
const source = styleJSON.sources[name];
|
const source = styleJSON.sources[name];
|
||||||
const url = source.url;
|
const url = source.url;
|
||||||
|
|
Loading…
Reference in a new issue