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

Show Telephone and Website fields by default on more POI presets (close #7877)

Browse Source
This commit is contained in:
Quincy Morgan
2020-09-21 15:25:14 -04:00
parent 0226b6f4b3
commit f141d1a77d
10 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/build_data.js
+6 -10
View File
@@ -683,8 +683,7 @@ function validateCategoryPresets(categories, presets) {
function validatePresetFields(presets, fields) {
const betweenBracketsRegex = /([^{]*?)(?=\})/;
const maxFieldsBeforeError = 12;
const maxFieldsBeforeWarning = 8;
const maxFieldsBeforeError = 10;
for (let presetID in presets) {
let preset = presets[presetID];
@@ -734,23 +733,20 @@ function validatePresetFields(presets, fields) {
// since `moreFields` is available, check that `fields` doesn't get too cluttered
let fieldCount = preset.fields.length;
if (fieldCount > maxFieldsBeforeWarning) {
// Fields with `prerequisiteTag` probably won't show up initially,
if (fieldCount > maxFieldsBeforeError) {
// Fields with `prerequisiteTag` or `geometry` may not always be shown,
// so don't count them against the limits.
const fieldsWithoutPrerequisites = preset.fields.filter(fieldID => {
if (fields[fieldID] && fields[fieldID].prerequisiteTag) return false;
const alwaysShownFields = preset.fields.filter(fieldID => {
if (fields[fieldID] && fields[fieldID].prerequisiteTag || fields[fieldID].geometry) return false;
return true;
});
fieldCount = fieldsWithoutPrerequisites.length;
fieldCount = alwaysShownFields.length;
}
if (fieldCount > maxFieldsBeforeError) {
console.error(fieldCount + ' values in "fields" of "' + preset.name + '" (' + presetID + '). Limit: ' + maxFieldsBeforeError + '. Please move lower-priority fields to "moreFields".');
console.log('');
process.exit(1);
}
else if (fieldCount > maxFieldsBeforeWarning) {
console.log('Warning: ' + fieldCount + ' values in "fields" of "' + preset.name + '" (' + presetID + '). Recommended: ' + maxFieldsBeforeWarning + ' or fewer. Consider moving lower-priority fields to "moreFields".');
}
}
}
}