Fabio/tileserver-gl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: refactor to use validateStyleMin

Browse source 
Signed-off-by: Andrew Calcutt <acalcutt@techidiots.net>
This commit is contained in:
Andrew Calcutt 2024-01-21 17:17:40 -05:00
parent dc746c4a56
commit 89bd54e8e2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/serve_style.js
View file

@ -5,7 +5,7 @@ import fs from 'node:fs';
import clone from 'clone'; import clone from 'clone';
import express from 'express'; import express from 'express';
import { validate } from '@maplibre/maplibre-gl-style-spec'; import { validateStyleMin } from '@maplibre/maplibre-gl-style-spec';
import { getPublicUrl } from './utils.js'; import { getPublicUrl } from './utils.js';
@ -86,7 +86,8 @@ export const serve_style = {
return false; return false;
} }
const validationErrors = validate(styleFileData); const styleJSON = JSON.parse(styleFileData);
const validationErrors = validateStyleMin(styleJSON);
if (validationErrors.length > 0) { if (validationErrors.length > 0) {
console.log(`The file "${params.style}" is not a valid style file:`); console.log(`The file "${params.style}" is not a valid style file:`);
for (const err of validationErrors) { for (const err of validationErrors) {
@ -94,7 +95,6 @@ export const serve_style = {
} }
return false; return false;
} }
const 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];