CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 01:02:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify field validation code

Browse Source
This commit is contained in:
Quincy Morgan
2019-09-25 15:48:11 +02:00
parent 955dc6e008
commit c982ef189f
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
build_data.js
View File

@@ -648,22 +648,22 @@ function validatePresetFields(presets, fields) {
var fieldKeys = ['fields', 'moreFields'];
for (var fieldsKeyIndex in fieldKeys) {
var fieldsKey = fieldKeys[fieldsKeyIndex];
if (preset[fieldsKey]) {
for (var fieldIndex in preset[fieldsKey]) {
var field = preset[fieldsKey][fieldIndex];
if (fields[field] === undefined) {
var regexResult = betweenBracketsRegex.exec(field);
if (regexResult) {
var foreignPresetID = regexResult[0];
if (presets[foreignPresetID] === undefined) {
console.error('Unknown preset "' + foreignPresetID + '" referenced in "' + fieldsKey + '" array of preset ' + preset.name);
process.exit(1);
}
} else {
console.error('Unknown preset field "' + field + '" in "' + fieldsKey + '" array of preset ' + preset.name);
process.exit(1);
}
if (!preset[fieldsKey]) continue; // no fields are referenced, okay
for (var fieldIndex in preset[fieldsKey]) {
var field = preset[fieldsKey][fieldIndex];
if (fields[field] !== undefined) continue; // field found, okay
var regexResult = betweenBracketsRegex.exec(field);
if (regexResult) {
var foreignPresetID = regexResult[0];
if (presets[foreignPresetID] === undefined) {
console.error('Unknown preset "' + foreignPresetID + '" referenced in "' + fieldsKey + '" array of preset ' + preset.name);
process.exit(1);
}
} else {
console.error('Unknown preset field "' + field + '" in "' + fieldsKey + '" array of preset ' + preset.name);
process.exit(1);
}
}
}