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

Merge branch 'external_presets' into 2.x

Browse Source 
(re: #4994)
This commit is contained in:
Bryan Housel
2020-02-05 21:32:51 -05:00
parent 1720f7cb93 d68b6090cf
commit 13ead25654
29 changed files with 7762 additions and 8009 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/build_data.js
+9 -8
View File
@@ -105,18 +105,19 @@ function buildData() {
// Save individual data files
let tasks = [
writeFileProm('data/presets/categories.json', prettyStringify({ categories: categories }) ),
writeFileProm('data/presets/fields.json', prettyStringify({ fields: fields }, { maxLength: 9999 }) ),
writeFileProm('data/presets/presets.json', prettyStringify({ presets: presets }, { maxLength: 9999 }) ),
writeFileProm('data/presets/categories.json', prettyStringify(categories, { maxLength: 9999 }) ),
writeFileProm('data/presets/fields.json', prettyStringify(fields, { maxLength: 9999 }) ),
writeFileProm('data/presets/presets.json', prettyStringify(presets, { maxLength: 9999 }) ),
writeFileProm('data/presets.yaml', translationsToYAML(translations) ),
writeFileProm('data/taginfo.json', prettyStringify(taginfo, { maxLength: 9999 }) ),
writeFileProm('data/territory_languages.json', prettyStringify(territoryLanguages, { maxLength: 9999 }) ),
writeEnJson(tstrings),
writeFaIcons(faIcons),
writeTnpIcons(tnpIcons),
minifyJSON('data/presets/categories.json', 'dist/data/categories.min.json'),
minifyJSON('data/presets/fields.json', 'dist/data/fields.min.json'),
minifyJSON('data/presets/presets.json', 'dist/data/presets.min.json'),
minifyJSON('data/presets/categories.json', 'dist/data/preset_categories.min.json'),
minifyJSON('data/presets/defaults.json', 'dist/data/preset_defaults.min.json'),
minifyJSON('data/presets/fields.json', 'dist/data/preset_fields.min.json'),
minifyJSON('data/presets/presets.json', 'dist/data/preset_presets.min.json'),
minifyJSON('data/address_formats.json', 'dist/data/address_formats.min.json'),
minifyJSON('data/deprecated.json', 'dist/data/deprecated.min.json'),
minifyJSON('data/discarded.json', 'dist/data/discarded.min.json'),
@@ -747,8 +748,8 @@ function validatePresetFields(presets, fields) {
}
function validateDefaults(defaults, categories, presets) {
Object.keys(defaults.defaults).forEach(name => {
let members = defaults.defaults[name];
Object.keys(defaults).forEach(name => {
const members = defaults[name];
members.forEach(id => {
if (!presets[id] && !categories[id]) {
console.error(`Unknown category or preset: ${id} in default ${name}`);