Bryan Housel
parent
d142d78a50
commit
d6d8b5acef
10 changed files with 179 additions and 179 deletions
2
dist/wikidata.json
vendored
2
dist/wikidata.json
vendored
|
|
@ -75015,7 +75015,7 @@
|
|||
"logos": {
|
||||
"facebook": "https://graph.facebook.com/abnamro/picture?type=large",
|
||||
"twitter": "https://pbs.twimg.com/profile_images/1424996042102149122/Xut8PxNW_bigger.jpg",
|
||||
"wikidata": "https://commons.wikimedia.org/wiki/Special:FilePath/ABN-AMRO Logo new colors.svg"
|
||||
"wikidata": "https://commons.wikimedia.org/wiki/Special:FilePath/ABN-AMRO Logo new chalk.svg"
|
||||
}
|
||||
},
|
||||
"Q27926559": {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
// External
|
||||
import colors from 'colors/safe.js';
|
||||
import chalk from 'chalk';
|
||||
import fs from 'fs-extra';
|
||||
import glob from 'glob';
|
||||
import JSON5 from 'json5';
|
||||
|
|
@ -50,8 +50,8 @@ read: (cache, loco) => {
|
|||
|
||||
glob.sync(`./data/${t}/**/*`, { nodir: true }).forEach(file => {
|
||||
if (!/\.json$/.test(file)) {
|
||||
console.error(colors.red(`Error - file should have a .json extension:`));
|
||||
console.error(' ' + colors.yellow(file));
|
||||
console.error(chalk.red(`Error - file should have a .json extension:`));
|
||||
console.error(' ' + chalk.yellow(file));
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
|
|
@ -61,8 +61,8 @@ read: (cache, loco) => {
|
|||
try {
|
||||
input = JSON5.parse(contents);
|
||||
} catch (jsonParseError) {
|
||||
console.error(colors.red(`Error - ${jsonParseError.message} reading:`));
|
||||
console.error(' ' + colors.yellow(file));
|
||||
console.error(chalk.red(`Error - ${jsonParseError.message} reading:`));
|
||||
console.error(' ' + chalk.yellow(file));
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
|
|
@ -80,8 +80,8 @@ read: (cache, loco) => {
|
|||
|
||||
// make sure t/k/v is unique
|
||||
if (cache.path[tkv]) {
|
||||
console.error(colors.red(`Error - '${tkv}' found in multiple files.`));
|
||||
console.error(' ' + colors.yellow(file));
|
||||
console.error(chalk.red(`Error - '${tkv}' found in multiple files.`));
|
||||
console.error(' ' + chalk.yellow(file));
|
||||
process.exit(1);
|
||||
} else {
|
||||
cache.path[tkv] = { properties: properties, items: [], templates: [] };
|
||||
|
|
@ -90,8 +90,8 @@ read: (cache, loco) => {
|
|||
// make sure each k/v pair appears in only one tree
|
||||
const other = seenkv[kv];
|
||||
if (other && other !== t) {
|
||||
console.error(colors.red(`Error - '${kv}' found in multiple trees: ${other} and ${t}.`));
|
||||
console.error(' ' + colors.yellow(file));
|
||||
console.error(chalk.red(`Error - '${kv}' found in multiple trees: ${other} and ${t}.`));
|
||||
console.error(' ' + chalk.yellow(file));
|
||||
process.exit(1);
|
||||
} else {
|
||||
seenkv[kv] = t;
|
||||
|
|
@ -111,8 +111,8 @@ read: (cache, loco) => {
|
|||
|
||||
// check displayName for uniqueness within this category
|
||||
if (seenName[item.displayName]) {
|
||||
console.error(colors.red(`Error - duplicate displayName '${item.displayName}' in:`));
|
||||
console.error(' ' + colors.yellow(file));
|
||||
console.error(chalk.red(`Error - duplicate displayName '${item.displayName}' in:`));
|
||||
console.error(' ' + chalk.yellow(file));
|
||||
process.exit(1);
|
||||
} else {
|
||||
seenName[item.displayName] = true;
|
||||
|
|
@ -127,9 +127,9 @@ read: (cache, loco) => {
|
|||
throw new Error(`locationSet ${locationID} resolves to an empty feature.`);
|
||||
}
|
||||
} catch (err) {
|
||||
console.error(colors.red(`Error - ${err.message} in:`));
|
||||
console.error(' ' + colors.yellow(item.displayName));
|
||||
console.error(' ' + colors.yellow(file));
|
||||
console.error(chalk.red(`Error - ${err.message} in:`));
|
||||
console.error(' ' + chalk.yellow(item.displayName));
|
||||
console.error(' ' + chalk.yellow(file));
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
|
|
@ -139,17 +139,17 @@ read: (cache, loco) => {
|
|||
// generate id
|
||||
item.id = idgen(item, tkv, locationID);
|
||||
if (!item.id) {
|
||||
console.error(colors.red(`Error - Couldn't generate an id for:`));
|
||||
console.error(' ' + colors.yellow(item.displayName));
|
||||
console.error(' ' + colors.yellow(file));
|
||||
console.error(chalk.red(`Error - Couldn't generate an id for:`));
|
||||
console.error(' ' + chalk.yellow(item.displayName));
|
||||
console.error(' ' + chalk.yellow(file));
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
// merge into caches
|
||||
if (cache.id.has(item.id)) {
|
||||
console.error(colors.red(`Error - Duplicate id '${item.id}' in:`));
|
||||
console.error(' ' + colors.yellow(item.displayName));
|
||||
console.error(' ' + colors.yellow(file));
|
||||
console.error(chalk.red(`Error - Duplicate id '${item.id}' in:`));
|
||||
console.error(' ' + chalk.yellow(item.displayName));
|
||||
console.error(' ' + chalk.yellow(file));
|
||||
process.exit(1);
|
||||
} else {
|
||||
cache.path[tkv].items.push(item);
|
||||
|
|
@ -292,8 +292,8 @@ write: (cache) => {
|
|||
fs.ensureFileSync(file);
|
||||
fs.writeFileSync(file, stringify(output, { maxLength: 50 }) + '\n');
|
||||
} catch (err) {
|
||||
console.error(colors.red(`Error - ${err.message} writing:`));
|
||||
console.error(' ' + colors.yellow(file));
|
||||
console.error(chalk.red(`Error - ${err.message} writing:`));
|
||||
console.error(' ' + chalk.yellow(file));
|
||||
process.exit(1);
|
||||
}
|
||||
});
|
||||
|
|
@ -332,8 +332,8 @@ expandTemplates: (cache, loco) => {
|
|||
|
||||
const sourceItems = cache.path[templateSource].items;
|
||||
if (!Array.isArray(sourceItems)) {
|
||||
console.error(colors.red(`Error - template item references invalid source path '${templateSource}' in:`));
|
||||
console.error(' ' + colors.yellow(file));
|
||||
console.error(chalk.red(`Error - template item references invalid source path '${templateSource}' in:`));
|
||||
console.error(' ' + chalk.yellow(file));
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
|
|
@ -390,17 +390,17 @@ expandTemplates: (cache, loco) => {
|
|||
let locationID = loco.validateLocationSet(item.locationSet).id;
|
||||
item.id = idgen(item, tkv, locationID);
|
||||
if (!item.id) {
|
||||
console.error(colors.red(`Error - Couldn't generate an id for:`));
|
||||
console.error(' ' + colors.yellow(item.displayName));
|
||||
console.error(' ' + colors.yellow(file));
|
||||
console.error(chalk.red(`Error - Couldn't generate an id for:`));
|
||||
console.error(' ' + chalk.yellow(item.displayName));
|
||||
console.error(' ' + chalk.yellow(file));
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
// merge into caches
|
||||
if (cache.id.has(item.id)) {
|
||||
console.error(colors.red(`Error - Duplicate id '${item.id}' in:`));
|
||||
console.error(' ' + colors.yellow(item.displayName));
|
||||
console.error(' ' + colors.yellow(file));
|
||||
console.error(chalk.red(`Error - Duplicate id '${item.id}' in:`));
|
||||
console.error(' ' + chalk.yellow(item.displayName));
|
||||
console.error(' ' + chalk.yellow(file));
|
||||
process.exit(1);
|
||||
} else {
|
||||
cache.path[tkv].items.push(item);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
// External
|
||||
import colors from 'colors/safe.js';
|
||||
import chalk from 'chalk';
|
||||
import jsonschema from 'jsonschema';
|
||||
|
||||
// Perform JSON Schema validation
|
||||
|
|
@ -8,20 +8,20 @@ export function validate(fileName, object, schema) {
|
|||
const v = new Validator();
|
||||
const validationErrors = v.validate(object, schema, { nestedErrors: true }).errors;
|
||||
if (validationErrors.length) {
|
||||
console.error(colors.red('\nError - Schema validation:'));
|
||||
console.error(' ' + colors.yellow(fileName + ': '));
|
||||
console.error(chalk.red('\nError - Schema validation:'));
|
||||
console.error(' ' + chalk.yellow(fileName + ': '));
|
||||
validationErrors.forEach(e => {
|
||||
if (e.property) {
|
||||
console.error(' ' + colors.yellow(e.property + ' ' + e.message));
|
||||
console.error(' ' + chalk.yellow(e.property + ' ' + e.message));
|
||||
if (e.name === 'uniqueItems') {
|
||||
let arr = e.instance;
|
||||
let duplicates = arr
|
||||
.map(n => n.displayName || n)
|
||||
.filter((e, i, a) => a.indexOf(e) !== i);
|
||||
console.error(' ' + colors.yellow(JSON.stringify(duplicates)));
|
||||
console.error(' ' + chalk.yellow(JSON.stringify(duplicates)));
|
||||
}
|
||||
} else {
|
||||
console.error(' ' + colors.yellow(e));
|
||||
console.error(' ' + chalk.yellow(e));
|
||||
}
|
||||
});
|
||||
console.error();
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@
|
|||
"@openstreetmap/id-tagging-schema": "~3.1.0",
|
||||
"c8": "^7.7.3",
|
||||
"clear": "^0.1.0",
|
||||
"colors": "1.4.0",
|
||||
"chalk": "5.0.0",
|
||||
"esbuild": "^0.14.11",
|
||||
"eslint": "^8.0.0",
|
||||
"fs-extra": "^10.0.0",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
// External
|
||||
import colors from 'colors/safe.js';
|
||||
import chalk from 'chalk';
|
||||
import fs from 'node:fs';
|
||||
import geojsonArea from '@mapbox/geojson-area';
|
||||
import geojsonBounds from 'geojson-bounds';
|
||||
|
|
@ -23,15 +23,15 @@ let v = new Validator();
|
|||
v.addSchema(geojsonSchemaJSON, 'http://json.schemastore.org/geojson.json');
|
||||
|
||||
|
||||
console.log(colors.blue('-'.repeat(70)));
|
||||
console.log(colors.blue('🧩 Build features'));
|
||||
console.log(colors.blue('-'.repeat(70)));
|
||||
console.log(chalk.blue('-'.repeat(70)));
|
||||
console.log(chalk.blue('🧩 Build features'));
|
||||
console.log(chalk.blue('-'.repeat(70)));
|
||||
buildAll();
|
||||
|
||||
|
||||
function buildAll() {
|
||||
const START = '🏗 ' + colors.yellow('Building features...');
|
||||
const END = '👍 ' + colors.green('features built');
|
||||
const START = '🏗 ' + chalk.yellow('Building features...');
|
||||
const END = '👍 ' + chalk.green('features built');
|
||||
console.log('');
|
||||
console.log(START);
|
||||
console.time(END);
|
||||
|
|
@ -55,8 +55,8 @@ function collectFeatures() {
|
|||
|
||||
glob.sync('features/**/*', { nodir: true }).forEach(file => {
|
||||
if (!/\.geojson$/.test(file)) {
|
||||
console.error(colors.red(`Error - file should have a .geojson extension:`));
|
||||
console.error(' ' + colors.yellow(file));
|
||||
console.error(chalk.red(`Error - file should have a .geojson extension:`));
|
||||
console.error(' ' + chalk.yellow(file));
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
|
|
@ -65,8 +65,8 @@ function collectFeatures() {
|
|||
try {
|
||||
parsed = JSON5.parse(contents);
|
||||
} catch (jsonParseError) {
|
||||
console.error(colors.red(`Error - ${jsonParseError.message} in:`));
|
||||
console.error(' ' + colors.yellow(file));
|
||||
console.error(chalk.red(`Error - ${jsonParseError.message} in:`));
|
||||
console.error(' ' + chalk.yellow(file));
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
|
|
@ -93,8 +93,8 @@ function collectFeatures() {
|
|||
// const lon = ((extent[0] + extent[2]) / 2).toFixed(4);
|
||||
// const lat = ((extent[1] + extent[3]) / 2).toFixed(4);
|
||||
// console.warn('');
|
||||
// console.warn(colors.yellow(`Warning - GeoJSON feature for small area (${area} km²). Consider circular include location instead: [${lon}, ${lat}]`));
|
||||
// console.warn(' ' + colors.yellow(file));
|
||||
// console.warn(chalk.yellow(`Warning - GeoJSON feature for small area (${area} km²). Consider circular include location instead: [${lon}, ${lat}]`));
|
||||
// console.warn(' ' + chalk.yellow(file));
|
||||
// }
|
||||
// }
|
||||
|
||||
|
|
@ -111,13 +111,13 @@ function collectFeatures() {
|
|||
|
||||
if (feature.geometry) {
|
||||
if (feature.geometry.type !== 'Polygon' && feature.geometry.type !== 'MultiPolygon') {
|
||||
console.error(colors.red('Error - Feature type must be "Polygon" or "MultiPolygon" in:'));
|
||||
console.error(' ' + colors.yellow(file));
|
||||
console.error(chalk.red('Error - Feature type must be "Polygon" or "MultiPolygon" in:'));
|
||||
console.error(' ' + chalk.yellow(file));
|
||||
process.exit(1);
|
||||
}
|
||||
if (!feature.geometry.coordinates) {
|
||||
console.error(colors.red('Error - Feature missing coordinates in:'));
|
||||
console.error(' ' + colors.yellow(file));
|
||||
console.error(chalk.red('Error - Feature missing coordinates in:'));
|
||||
console.error(' ' + chalk.yellow(file));
|
||||
process.exit(1);
|
||||
}
|
||||
obj.geometry = {
|
||||
|
|
@ -132,9 +132,9 @@ function collectFeatures() {
|
|||
prettifyFile(file, feature, contents);
|
||||
|
||||
if (files[id]) {
|
||||
console.error(colors.red('Error - Duplicate filenames: ') + colors.yellow(id));
|
||||
console.error(' ' + colors.yellow(files[id]));
|
||||
console.error(' ' + colors.yellow(file));
|
||||
console.error(chalk.red('Error - Duplicate filenames: ') + chalk.yellow(id));
|
||||
console.error(' ' + chalk.yellow(files[id]));
|
||||
console.error(' ' + chalk.yellow(file));
|
||||
process.exit(1);
|
||||
}
|
||||
features.push(feature);
|
||||
|
|
@ -177,13 +177,13 @@ function countCoordinates(coords) {
|
|||
function validateFile(file, resource, schema) {
|
||||
const validationErrors = v.validate(resource, schema).errors;
|
||||
if (validationErrors.length) {
|
||||
console.error(colors.red('Error - Schema validation:'));
|
||||
console.error(' ' + colors.yellow(file + ': '));
|
||||
console.error(chalk.red('Error - Schema validation:'));
|
||||
console.error(' ' + chalk.yellow(file + ': '));
|
||||
validationErrors.forEach(error => {
|
||||
if (error.property) {
|
||||
console.error(' ' + colors.yellow(error.property + ' ' + error.message));
|
||||
console.error(' ' + chalk.yellow(error.property + ' ' + error.message));
|
||||
} else {
|
||||
console.error(' ' + colors.yellow(error));
|
||||
console.error(' ' + chalk.yellow(error));
|
||||
}
|
||||
});
|
||||
process.exit(1);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
// External
|
||||
import colors from 'colors/safe.js';
|
||||
import chalk from 'chalk';
|
||||
import fs from 'node:fs';
|
||||
import JSON5 from 'json5';
|
||||
import localeCompare from 'locale-compare';
|
||||
|
|
@ -27,9 +27,9 @@ const trees = treesJSON.trees;
|
|||
import featureCollectionJSON from '../dist/featureCollection.json';
|
||||
const loco = new LocationConflation(featureCollectionJSON);
|
||||
|
||||
console.log(colors.blue('-'.repeat(70)));
|
||||
console.log(colors.blue('🗂 Build index'));
|
||||
console.log(colors.blue('-'.repeat(70)));
|
||||
console.log(chalk.blue('-'.repeat(70)));
|
||||
console.log(chalk.blue('🗂 Build index'));
|
||||
console.log(chalk.blue('-'.repeat(70)));
|
||||
|
||||
let _config = {};
|
||||
loadConfig();
|
||||
|
|
@ -68,8 +68,8 @@ function loadConfig() {
|
|||
try {
|
||||
data = JSON5.parse(contents);
|
||||
} catch (jsonParseError) {
|
||||
console.error(colors.red(`Error - ${jsonParseError.message} reading:`));
|
||||
console.error(' ' + colors.yellow(file));
|
||||
console.error(chalk.red(`Error - ${jsonParseError.message} reading:`));
|
||||
console.error(' ' + chalk.yellow(file));
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
|
|
@ -133,8 +133,8 @@ function loadConfig() {
|
|||
// https://stackoverflow.com/a/43872595
|
||||
function checkRegex(fileName, pattern) {
|
||||
if (!safeRegex(pattern)) {
|
||||
console.error(colors.red('\nError - Potentially unsafe regular expression:'));
|
||||
console.error(' ' + colors.yellow(fileName + ': ' + pattern));
|
||||
console.error(chalk.red('\nError - Potentially unsafe regular expression:'));
|
||||
console.error(' ' + chalk.yellow(fileName + ': ' + pattern));
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
|
@ -154,7 +154,7 @@ function loadCollected() {
|
|||
_currCollectionDate = +matched[1];
|
||||
}
|
||||
} catch (err) {
|
||||
console.error(colors.yellow(`Warning - ${err.message} reading 'nsi-collector/package.json'`));
|
||||
console.error(chalk.yellow(`Warning - ${err.message} reading 'nsi-collector/package.json'`));
|
||||
}
|
||||
|
||||
['name', 'brand', 'operator', 'network'].forEach(tag => {
|
||||
|
|
@ -164,8 +164,8 @@ function loadCollected() {
|
|||
try {
|
||||
data = JSON5.parse(contents);
|
||||
} catch (jsonParseError) {
|
||||
console.error(colors.red(`Error - ${jsonParseError.message} reading:`));
|
||||
console.error(' ' + colors.yellow(file));
|
||||
console.error(chalk.red(`Error - ${jsonParseError.message} reading:`));
|
||||
console.error(' ' + chalk.yellow(file));
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
|
|
@ -178,8 +178,8 @@ function loadCollected() {
|
|||
// Filter the tags collected into _keep and _discard lists
|
||||
//
|
||||
function filterCollected() {
|
||||
const START = '🏗 ' + colors.yellow(`Filtering values collected from OSM...`);
|
||||
const END = '👍 ' + colors.green(`done filtering`);
|
||||
const START = '🏗 ' + chalk.yellow(`Filtering values collected from OSM...`);
|
||||
const END = '👍 ' + chalk.green(`done filtering`);
|
||||
console.log('');
|
||||
console.log(START);
|
||||
console.time(END);
|
||||
|
|
@ -216,7 +216,7 @@ function filterCollected() {
|
|||
|
||||
// Continue, do filtering, and replace keep/discard lists..
|
||||
if (!shownSparkle) {
|
||||
console.log(colors.yellow(`✨ New nsi-collector version ${_currCollectionDate} (was ${lastCollectionDate}). Updating filter lists:`));
|
||||
console.log(chalk.yellow(`✨ New nsi-collector version ${_currCollectionDate} (was ${lastCollectionDate}). Updating filter lists:`));
|
||||
shownSparkle = true;
|
||||
}
|
||||
|
||||
|
|
@ -279,8 +279,8 @@ function filterCollected() {
|
|||
// Load the index files under `data/*`
|
||||
//
|
||||
function loadIndex() {
|
||||
const START = '🏗 ' + colors.yellow(`Loading index files...`);
|
||||
const END = '👍 ' + colors.green(`done loading`);
|
||||
const START = '🏗 ' + chalk.yellow(`Loading index files...`);
|
||||
const END = '👍 ' + chalk.green(`done loading`);
|
||||
console.log('');
|
||||
console.log(START);
|
||||
console.time(END);
|
||||
|
|
@ -289,20 +289,20 @@ function loadIndex() {
|
|||
fileTree.expandTemplates(_cache, loco);
|
||||
console.timeEnd(END);
|
||||
|
||||
const MATCH_INDEX_END = '👍 ' + colors.green(`built match index`);
|
||||
const MATCH_INDEX_END = '👍 ' + chalk.green(`built match index`);
|
||||
console.time(MATCH_INDEX_END);
|
||||
matcher.buildMatchIndex(_cache.path);
|
||||
console.timeEnd(MATCH_INDEX_END);
|
||||
|
||||
let warnMatched = matcher.getWarnings();
|
||||
if (warnMatched.length) {
|
||||
console.warn(colors.yellow('\n⚠️ Warning - matchIndex errors:'));
|
||||
console.warn(colors.gray('-').repeat(70));
|
||||
console.warn(colors.gray(' `key/value/name` occurs multiple times in the match index.'));
|
||||
console.warn(colors.gray(' To resolve these, make sure the key/value/name does not appear in multiple trees'));
|
||||
console.warn(colors.gray(' (e.g. `amenity/post_office/ups` should not be both a "brand" and an "operator"'));
|
||||
console.warn(colors.gray('-').repeat(70));
|
||||
warnMatched.forEach(w => console.warn(colors.yellow(w)));
|
||||
console.warn(chalk.yellow('\n⚠️ Warning - matchIndex errors:'));
|
||||
console.warn(chalk.gray('-').repeat(70));
|
||||
console.warn(chalk.gray(' `key/value/name` occurs multiple times in the match index.'));
|
||||
console.warn(chalk.gray(' To resolve these, make sure the key/value/name does not appear in multiple trees'));
|
||||
console.warn(chalk.gray(' (e.g. `amenity/post_office/ups` should not be both a "brand" and an "operator"'));
|
||||
console.warn(chalk.gray('-').repeat(70));
|
||||
warnMatched.forEach(w => console.warn(chalk.yellow(w)));
|
||||
console.warn('total ' + warnMatched.length);
|
||||
}
|
||||
|
||||
|
|
@ -310,7 +310,7 @@ function loadIndex() {
|
|||
|
||||
// It takes a few seconds to resolve all of the locationSets into GeoJSON and insert into which-polygon
|
||||
// We don't need a location index for this script, but it's useful to know.
|
||||
const LOCATION_INDEX_END = '👍 ' + colors.green(`built location index`);
|
||||
const LOCATION_INDEX_END = '👍 ' + chalk.green(`built location index`);
|
||||
console.time(LOCATION_INDEX_END);
|
||||
matcher.buildLocationIndex(_cache.path, loco);
|
||||
console.timeEnd(LOCATION_INDEX_END);
|
||||
|
|
@ -321,8 +321,8 @@ function loadIndex() {
|
|||
// Save the updated index files under `data/*`
|
||||
//
|
||||
function saveIndex() {
|
||||
const START = '🏗 ' + colors.yellow(`Saving index files...`);
|
||||
const END = '👍 ' + colors.green(`done saving`);
|
||||
const START = '🏗 ' + chalk.yellow(`Saving index files...`);
|
||||
const END = '👍 ' + chalk.green(`done saving`);
|
||||
console.log('');
|
||||
console.log(START);
|
||||
console.time(END);
|
||||
|
|
@ -339,8 +339,8 @@ function saveIndex() {
|
|||
// - update all items to have whatever tags they should have.
|
||||
//
|
||||
function mergeItems() {
|
||||
const START = '🏗 ' + colors.yellow(`Merging items...`);
|
||||
const END = '👍 ' + colors.green(`done merging`);
|
||||
const START = '🏗 ' + chalk.yellow(`Merging items...`);
|
||||
const END = '👍 ' + chalk.green(`done merging`);
|
||||
console.log('');
|
||||
console.log(START);
|
||||
console.time(END);
|
||||
|
|
@ -573,7 +573,7 @@ function mergeItems() {
|
|||
//
|
||||
function checkItems(t) {
|
||||
console.log('');
|
||||
console.log('🏗 ' + colors.yellow(`Checking ${t}...`));
|
||||
console.log('🏗 ' + chalk.yellow(`Checking ${t}...`));
|
||||
|
||||
const tree = _config.trees[t];
|
||||
const oddChars = /[\s=!"#%'*{},.\/:?\(\)\[\]@\\$\^*+<>«»~`’\u00a1\u00a7\u00b6\u00b7\u00bf\u037e\u0387\u055a-\u055f\u0589\u05c0\u05c3\u05c6\u05f3\u05f4\u0609\u060a\u060c\u060d\u061b\u061e\u061f\u066a-\u066d\u06d4\u0700-\u070d\u07f7-\u07f9\u0830-\u083e\u085e\u0964\u0965\u0970\u0af0\u0df4\u0e4f\u0e5a\u0e5b\u0f04-\u0f12\u0f14\u0f85\u0fd0-\u0fd4\u0fd9\u0fda\u104a-\u104f\u10fb\u1360-\u1368\u166d\u166e\u16eb-\u16ed\u1735\u1736\u17d4-\u17d6\u17d8-\u17da\u1800-\u1805\u1807-\u180a\u1944\u1945\u1a1e\u1a1f\u1aa0-\u1aa6\u1aa8-\u1aad\u1b5a-\u1b60\u1bfc-\u1bff\u1c3b-\u1c3f\u1c7e\u1c7f\u1cc0-\u1cc7\u1cd3\u200b-\u200f\u2016\u2017\u2020-\u2027\u2030-\u2038\u203b-\u203e\u2041-\u2043\u2047-\u2051\u2053\u2055-\u205e\u2cf9-\u2cfc\u2cfe\u2cff\u2d70\u2e00\u2e01\u2e06-\u2e08\u2e0b\u2e0e-\u2e16\u2e18\u2e19\u2e1b\u2e1e\u2e1f\u2e2a-\u2e2e\u2e30-\u2e39\u3001-\u3003\u303d\u30fb\ua4fe\ua4ff\ua60d-\ua60f\ua673\ua67e\ua6f2-\ua6f7\ua874-\ua877\ua8ce\ua8cf\ua8f8-\ua8fa\ua92e\ua92f\ua95f\ua9c1-\ua9cd\ua9de\ua9df\uaa5c-\uaa5f\uaade\uaadf\uaaf0\uaaf1\uabeb\ufe10-\ufe16\ufe19\ufe30\ufe45\ufe46\ufe49-\ufe4c\ufe50-\ufe52\ufe54-\ufe57\ufe5f-\ufe61\ufe68\ufe6a\ufe6b\ufeff\uff01-\uff03\uff05-\uff07\uff0a\uff0c\uff0e\uff0f\uff1a\uff1b\uff1f\uff20\uff3c\uff61\uff64\uff65]+/g;
|
||||
|
|
@ -717,61 +717,61 @@ function checkItems(t) {
|
|||
});
|
||||
|
||||
if (warnMissingTag.length) {
|
||||
console.warn(colors.yellow('\n⚠️ Warning - Missing tag:'));
|
||||
console.warn(colors.gray('-').repeat(70));
|
||||
console.warn(colors.gray(' To resolve these, add the missing tag.'));
|
||||
console.warn(colors.gray('-').repeat(70));
|
||||
console.warn(chalk.yellow('\n⚠️ Warning - Missing tag:'));
|
||||
console.warn(chalk.gray('-').repeat(70));
|
||||
console.warn(chalk.gray(' To resolve these, add the missing tag.'));
|
||||
console.warn(chalk.gray('-').repeat(70));
|
||||
warnMissingTag.forEach(w => console.warn(
|
||||
colors.yellow(' "' + w[0] + '"') + ' -> missing tag? -> ' + colors.yellow('"' + w[1] + '"')
|
||||
chalk.yellow(' "' + w[0] + '"') + ' -> missing tag? -> ' + chalk.yellow('"' + w[1] + '"')
|
||||
));
|
||||
console.warn('total ' + warnMissingTag.length);
|
||||
}
|
||||
|
||||
if (warnFormatTag.length) {
|
||||
console.warn(colors.yellow('\n⚠️ Warning - Unusual OpenStreetMap tag:'));
|
||||
console.warn(colors.gray('-').repeat(70));
|
||||
console.warn(colors.gray(' To resolve these, make sure the OpenStreetMap tag is correct.'));
|
||||
console.warn(colors.gray('-').repeat(70));
|
||||
console.warn(chalk.yellow('\n⚠️ Warning - Unusual OpenStreetMap tag:'));
|
||||
console.warn(chalk.gray('-').repeat(70));
|
||||
console.warn(chalk.gray(' To resolve these, make sure the OpenStreetMap tag is correct.'));
|
||||
console.warn(chalk.gray('-').repeat(70));
|
||||
warnFormatTag.forEach(w => console.warn(
|
||||
colors.yellow(' "' + w[0] + '"') + ' -> unusual tag? -> ' + colors.yellow('"' + w[1] + '"')
|
||||
chalk.yellow(' "' + w[0] + '"') + ' -> unusual tag? -> ' + chalk.yellow('"' + w[1] + '"')
|
||||
));
|
||||
console.warn('total ' + warnFormatTag.length);
|
||||
}
|
||||
|
||||
if (warnDuplicate.length) {
|
||||
console.warn(colors.yellow('\n⚠️ Warning - Potential duplicate:'));
|
||||
console.warn(colors.gray('-').repeat(70));
|
||||
console.warn(colors.gray(' If the items are two different businesses,'));
|
||||
console.warn(colors.gray(' make sure they both have accurate locationSets (e.g. "us"/"ca") and wikidata identifiers.'));
|
||||
console.warn(colors.gray(' If the items are duplicates of the same business,'));
|
||||
console.warn(colors.gray(' add `matchTags`/`matchNames` properties to the item that you want to keep, and delete the unwanted item.'));
|
||||
console.warn(colors.gray(' If the duplicate item is a generic word,'));
|
||||
console.warn(colors.gray(' add a filter to config/filter_brands.json and delete the unwanted item.'));
|
||||
console.warn(colors.gray('-').repeat(70));
|
||||
console.warn(chalk.yellow('\n⚠️ Warning - Potential duplicate:'));
|
||||
console.warn(chalk.gray('-').repeat(70));
|
||||
console.warn(chalk.gray(' If the items are two different businesses,'));
|
||||
console.warn(chalk.gray(' make sure they both have accurate locationSets (e.g. "us"/"ca") and wikidata identifiers.'));
|
||||
console.warn(chalk.gray(' If the items are duplicates of the same business,'));
|
||||
console.warn(chalk.gray(' add `matchTags`/`matchNames` properties to the item that you want to keep, and delete the unwanted item.'));
|
||||
console.warn(chalk.gray(' If the duplicate item is a generic word,'));
|
||||
console.warn(chalk.gray(' add a filter to config/filter_brands.json and delete the unwanted item.'));
|
||||
console.warn(chalk.gray('-').repeat(70));
|
||||
warnDuplicate.forEach(w => console.warn(
|
||||
colors.yellow(' "' + w[0] + '"') + ' -> duplicates? -> ' + colors.yellow('"' + w[1] + '"')
|
||||
chalk.yellow(' "' + w[0] + '"') + ' -> duplicates? -> ' + chalk.yellow('"' + w[1] + '"')
|
||||
));
|
||||
console.warn('total ' + warnDuplicate.length);
|
||||
}
|
||||
|
||||
if (warnFormatWikidata.length) {
|
||||
console.warn(colors.yellow('\n⚠️ Warning - Incorrect `wikidata` format:'));
|
||||
console.warn(colors.gray('-').repeat(70));
|
||||
console.warn(colors.gray(' To resolve these, make sure "*:wikidata" tag looks like "Q191615".'));
|
||||
console.warn(colors.gray('-').repeat(70));
|
||||
console.warn(chalk.yellow('\n⚠️ Warning - Incorrect `wikidata` format:'));
|
||||
console.warn(chalk.gray('-').repeat(70));
|
||||
console.warn(chalk.gray(' To resolve these, make sure "*:wikidata" tag looks like "Q191615".'));
|
||||
console.warn(chalk.gray('-').repeat(70));
|
||||
warnFormatWikidata.forEach(w => console.warn(
|
||||
colors.yellow(' "' + w[0] + '"') + ' -> "*:wikidata": ' + '"' + w[1] + '"'
|
||||
chalk.yellow(' "' + w[0] + '"') + ' -> "*:wikidata": ' + '"' + w[1] + '"'
|
||||
));
|
||||
console.warn('total ' + warnFormatWikidata.length);
|
||||
}
|
||||
|
||||
if (warnFormatWikipedia.length) {
|
||||
console.warn(colors.yellow('\n⚠️ Warning - Incorrect `wikipedia` format:'));
|
||||
console.warn(colors.gray('-').repeat(70));
|
||||
console.warn(colors.gray(' To resolve these, make sure "*:wikipedia" tag looks like "en:Pizza Hut".'));
|
||||
console.warn(colors.gray('-').repeat(70));
|
||||
console.warn(chalk.yellow('\n⚠️ Warning - Incorrect `wikipedia` format:'));
|
||||
console.warn(chalk.gray('-').repeat(70));
|
||||
console.warn(chalk.gray(' To resolve these, make sure "*:wikipedia" tag looks like "en:Pizza Hut".'));
|
||||
console.warn(chalk.gray('-').repeat(70));
|
||||
warnFormatWikipedia.forEach(w => console.warn(
|
||||
colors.yellow(' "' + w[0] + '"') + ' -> "*:wikipedia": ' + '"' + w[1] + '"'
|
||||
chalk.yellow(' "' + w[0] + '"') + ' -> "*:wikipedia": ' + '"' + w[1] + '"'
|
||||
));
|
||||
console.warn('total ' + warnFormatWikipedia.length);
|
||||
}
|
||||
|
|
@ -779,7 +779,7 @@ function checkItems(t) {
|
|||
const pctWd = total > 0 ? (totalWd * 100 / total).toFixed(1) : 0;
|
||||
|
||||
console.log('');
|
||||
console.info(colors.blue.bold(`${tree.emoji} ${t}/* completeness:`));
|
||||
console.info(colors.blue.bold(` ${total} total`));
|
||||
console.info(colors.blue.bold(` ${totalWd} (${pctWd}%) with a '${tree.mainTag}' tag`));
|
||||
console.info(chalk.blue.bold(`${tree.emoji} ${t}/* completeness:`));
|
||||
console.info(chalk.blue.bold(` ${total} total`));
|
||||
console.info(chalk.blue.bold(` ${totalWd} (${pctWd}%) with a '${tree.mainTag}' tag`));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
// External
|
||||
import colors from 'colors/safe.js';
|
||||
import chalk from 'chalk';
|
||||
import fs from 'node:fs';
|
||||
import fetch from 'node-fetch';
|
||||
import http from 'node:http';
|
||||
|
|
@ -89,10 +89,10 @@ try {
|
|||
} catch (err) { /* ignore */ }
|
||||
|
||||
if (_secrets && !_secrets.twitter && !_secrets.wikibase) {
|
||||
console.error(colors.red('WHOA!'));
|
||||
console.error(colors.yellow('The `config/secrets.json` file format has changed a bit.'));
|
||||
console.error(colors.yellow('We were expecting to find `twitter` or `wikibase` properties.'));
|
||||
console.error(colors.yellow('Check `scripts/build_wikidata.js` for details...'));
|
||||
console.error(chalk.red('WHOA!'));
|
||||
console.error(chalk.yellow('The `config/secrets.json` file format has changed a bit.'));
|
||||
console.error(chalk.yellow('We were expecting to find `twitter` or `wikibase` properties.'));
|
||||
console.error(chalk.yellow('Check `scripts/build_wikidata.js` for details...'));
|
||||
console.error('');
|
||||
process.exit(1);
|
||||
}
|
||||
|
|
@ -226,7 +226,7 @@ function doFetch(index) {
|
|||
|
||||
let currURL = _urls[index];
|
||||
let backoff = false;
|
||||
console.log(colors.yellow.bold(`\nBatch ${index+1}/${_urls.length}`));
|
||||
console.log(chalk.yellow.bold(`\nBatch ${index+1}/${_urls.length}`));
|
||||
|
||||
return fetch(currURL, fetchOptions)
|
||||
.then(response => {
|
||||
|
|
@ -235,9 +235,9 @@ function doFetch(index) {
|
|||
})
|
||||
.then(result => processEntities(result))
|
||||
.catch(e => {
|
||||
console.warn(colors.green.bold('fetch error:'));
|
||||
console.warn(colors.white(JSON.stringify(e)));
|
||||
console.warn(colors.green.bold('retrying...'));
|
||||
console.warn(chalk.green.bold('fetch error:'));
|
||||
console.warn(chalk.white(JSON.stringify(e)));
|
||||
console.warn(chalk.green.bold('retrying...'));
|
||||
backoff = true;
|
||||
--index;
|
||||
})
|
||||
|
|
@ -266,7 +266,7 @@ function processEntities(result) {
|
|||
if (Object.prototype.hasOwnProperty.call(entity, 'missing')) {
|
||||
label = enLabelForQID(qid) || qid;
|
||||
const warning = { qid: qid, msg: `⚠️ Entity for "${label}" was deleted.` };
|
||||
console.warn(colors.yellow(warning.qid.padEnd(12)) + colors.red(warning.msg));
|
||||
console.warn(chalk.yellow(warning.qid.padEnd(12)) + chalk.red(warning.msg));
|
||||
_warnings.push(warning);
|
||||
return;
|
||||
}
|
||||
|
|
@ -285,7 +285,7 @@ function processEntities(result) {
|
|||
} else { // otherwise raise a warning for the user to deal with.
|
||||
label = label || qid;
|
||||
const warning = { qid: qid, msg: `Entity for "${label}" missing English label.` };
|
||||
console.warn(colors.yellow(warning.qid.padEnd(12)) + colors.red(warning.msg));
|
||||
console.warn(chalk.yellow(warning.qid.padEnd(12)) + chalk.red(warning.msg));
|
||||
_warnings.push(warning);
|
||||
}
|
||||
}
|
||||
|
|
@ -417,7 +417,7 @@ function processEntities(result) {
|
|||
if (dissolution.countries) {
|
||||
warning.msg += `\nThis applies only to the following countries: ${JSON.stringify(dissolution.countries)}.`;
|
||||
}
|
||||
console.warn(colors.yellow(warning.qid.padEnd(12)) + colors.red(warning.msg));
|
||||
console.warn(chalk.yellow(warning.qid.padEnd(12)) + chalk.red(warning.msg));
|
||||
_warnings.push(warning);
|
||||
}
|
||||
target.dissolutions.push(dissolution);
|
||||
|
|
@ -537,8 +537,8 @@ function getClaimValue(entity, prop) {
|
|||
// - dissolved.json
|
||||
//
|
||||
function finish() {
|
||||
const START = '🏗 ' + colors.yellow('Writing output files');
|
||||
const END = '👍 ' + colors.green('output files updated');
|
||||
const START = '🏗 ' + chalk.yellow('Writing output files');
|
||||
const END = '👍 ' + chalk.green('output files updated');
|
||||
console.log('');
|
||||
console.log(START);
|
||||
console.time(END);
|
||||
|
|
@ -601,8 +601,8 @@ function finish() {
|
|||
|
||||
// output whatever warnings we've gathered
|
||||
if (_warnings.length) {
|
||||
console.log(colors.yellow.bold(`\nWarnings:`));
|
||||
_warnings.forEach(warning => console.warn(colors.yellow(warning.qid.padEnd(12)) + colors.red(warning.msg)));
|
||||
console.log(chalk.yellow.bold(`\nWarnings:`));
|
||||
_warnings.forEach(warning => console.warn(chalk.yellow(warning.qid.padEnd(12)) + chalk.red(warning.msg)));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -621,10 +621,10 @@ function checkTwitterRateLimit(need) {
|
|||
const now = Date.now() / 1000;
|
||||
const stats = result.resources.users['/users/:id'];
|
||||
const resetSec = Math.ceil(stats.reset - now) + 30; // +30sec in case server time is different
|
||||
console.log(colors.green.bold(`Twitter rate status '${which}': need ${need}, remaining ${stats.remaining}, resets in ${resetSec} seconds...`));
|
||||
console.log(chalk.green.bold(`Twitter rate status '${which}': need ${need}, remaining ${stats.remaining}, resets in ${resetSec} seconds...`));
|
||||
if (need > stats.remaining) {
|
||||
const delaySec = clamp(resetSec, 10, 60);
|
||||
console.log(colors.green.bold(`Twitter rate limit exceeded, pausing for ${delaySec} seconds...`));
|
||||
console.log(chalk.green.bold(`Twitter rate limit exceeded, pausing for ${delaySec} seconds...`));
|
||||
return delaySec;
|
||||
} else {
|
||||
return 0;
|
||||
|
|
@ -639,7 +639,7 @@ function checkTwitterRateLimit(need) {
|
|||
}
|
||||
})
|
||||
.catch(e => {
|
||||
console.warn(colors.green.bold(`Error: Twitter rate limit: ` + JSON.stringify(e)));
|
||||
console.warn(chalk.green.bold(`Error: Twitter rate limit: ` + JSON.stringify(e)));
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -657,7 +657,7 @@ function fetchTwitterUserDetails(qid, username) {
|
|||
})
|
||||
.catch(e => {
|
||||
const warning = { qid: qid, msg: `Twitter username @${username}: ${JSON.stringify(e)}` };
|
||||
console.warn(colors.yellow(warning.qid.padEnd(12)) + colors.red(warning.msg));
|
||||
console.warn(chalk.yellow(warning.qid.padEnd(12)) + chalk.red(warning.msg));
|
||||
_warnings.push(warning);
|
||||
});
|
||||
}
|
||||
|
|
@ -695,7 +695,7 @@ function fetchFacebookLogo(qid, username) {
|
|||
return fetchFacebookLogo(qid, userid); // retry with just the numeric id
|
||||
} else {
|
||||
const warning = { qid: qid, msg: `Facebook username @${username}: ${e}` };
|
||||
console.warn(colors.yellow(warning.qid.padEnd(12)) + colors.red(warning.msg));
|
||||
console.warn(chalk.yellow(warning.qid.padEnd(12)) + chalk.red(warning.msg));
|
||||
_warnings.push(warning);
|
||||
}
|
||||
});
|
||||
|
|
@ -733,7 +733,7 @@ function removeOldNsiClaims() {
|
|||
})
|
||||
.then(processWbEditQueue)
|
||||
.catch(e => {
|
||||
console.warn(colors.red(e));
|
||||
console.warn(chalk.red(e));
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -750,7 +750,7 @@ function processWbEditQueue(queue) {
|
|||
const request = queue.pop();
|
||||
const qid = request.qid;
|
||||
const msg = request.msg;
|
||||
console.log(colors.blue(`Updating Wikidata ${queue.length}: ${msg}`));
|
||||
console.log(chalk.blue(`Updating Wikidata ${queue.length}: ${msg}`));
|
||||
delete request.qid;
|
||||
delete request.msg;
|
||||
|
||||
|
|
@ -775,7 +775,7 @@ function processWbEditQueue(queue) {
|
|||
return task
|
||||
.catch(e => {
|
||||
const warning = { qid: qid, msg: e };
|
||||
console.warn(colors.yellow(warning.qid.padEnd(12)) + colors.red(warning.msg));
|
||||
console.warn(chalk.yellow(warning.qid.padEnd(12)) + chalk.red(warning.msg));
|
||||
_warnings.push(warning);
|
||||
})
|
||||
.then(() => delay(300))
|
||||
|
|
@ -821,7 +821,7 @@ function checkWikipediaTags(qid, sitelinks) {
|
|||
if (wd && (wd === qid)) { // `*:wikidata` tag matches
|
||||
if (wpOld && !wikiCount) { // there was a wikipedia sitelink... but there shouldn't be one for this wikidata qid
|
||||
delete item.tags[`${osmkey}:wikipedia`];
|
||||
const msg = colors.cyan(`${qid} "${item.displayName}" removing old tag "${osmkey}:wikipedia = ${wpOld}" (doesn't match this qid)`);
|
||||
const msg = chalk.cyan(`${qid} "${item.displayName}" removing old tag "${osmkey}:wikipedia = ${wpOld}" (doesn't match this qid)`);
|
||||
console.warn(msg);
|
||||
} else if (wpOld && wikiCount) { // there was a wikipedia sitelink...
|
||||
const m = wpOld.match(/^(\w+):/); // check the language of it ('en', 'de', 'zh-yue')
|
||||
|
|
@ -830,7 +830,7 @@ function checkWikipediaTags(qid, sitelinks) {
|
|||
let wpNew = wikis[lang];
|
||||
if (wpNew && wpNew !== wpOld) { // the sitelink we found for this language and qid is different, so replace it
|
||||
item.tags[`${osmkey}:wikipedia`] = wpNew;
|
||||
const msg = colors.cyan(`${qid} "${item.displayName}" updating tag "${osmkey}:wikipedia = ${wpNew}" (was "${wpOld})"`);
|
||||
const msg = chalk.cyan(`${qid} "${item.displayName}" updating tag "${osmkey}:wikipedia = ${wpNew}" (was "${wpOld})"`);
|
||||
console.warn(msg);
|
||||
}
|
||||
}
|
||||
|
|
@ -838,7 +838,7 @@ function checkWikipediaTags(qid, sitelinks) {
|
|||
let wpNew = chooseWiki(item); // so we will try to pick one
|
||||
if (wpNew) {
|
||||
item.tags[`${osmkey}:wikipedia`] = wpNew;
|
||||
const msg = colors.cyan(`${qid} "${item.displayName}" adding missing tag "${osmkey}:wikipedia = ${wpNew}"`);
|
||||
const msg = chalk.cyan(`${qid} "${item.displayName}" adding missing tag "${osmkey}:wikipedia = ${wpNew}"`);
|
||||
console.warn(msg);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
// External
|
||||
import clearConsole from 'clear';
|
||||
import colors from 'colors/safe.js';
|
||||
import chalk from 'chalk';
|
||||
import fetch from 'node-fetch';
|
||||
import LocationConflation from '@ideditor/location-conflation';
|
||||
import wikibase from 'wikibase-sdk';
|
||||
|
|
@ -136,7 +136,7 @@ function doFetch(index, urls, check) {
|
|||
.then(check)
|
||||
.catch(e => {
|
||||
_errors.push(e);
|
||||
console.error(colors.red(e));
|
||||
console.error(chalk.red(e));
|
||||
})
|
||||
.then(() => delay(500))
|
||||
.then(() => doFetch(++index, urls, check));
|
||||
|
|
@ -276,86 +276,86 @@ function finish() {
|
|||
clearConsole();
|
||||
|
||||
if (_errors.length) {
|
||||
console.log(colors.yellow.bold(`\nError Summary:`));
|
||||
_errors.forEach(msg => console.error(colors.red.bold(msg)));
|
||||
console.log(chalk.yellow.bold(`\nError Summary:`));
|
||||
_errors.forEach(msg => console.error(chalk.red.bold(msg)));
|
||||
}
|
||||
|
||||
if (_wrongFormat.length) {
|
||||
console.error(colors.yellow.bold(`\nError - Wrong format:`));
|
||||
console.error(chalk.yellow.bold(`\nError - Wrong format:`));
|
||||
console.error('To resolve these, make sure that the values are in the correct format');
|
||||
_wrongFormat.sort();
|
||||
_wrongFormat.forEach(msg => console.error(
|
||||
`${colors.cyan.bold(msg[0])} (${colors.yellow.bold(msg[1])}): ${colors.red.bold(msg[2])} (${colors.blue.bold(msg[3])}) is in a wrong format`
|
||||
`${chalk.cyan.bold(msg[0])} (${chalk.yellow.bold(msg[1])}): ${chalk.red.bold(msg[2])} (${chalk.blue.bold(msg[3])}) is in a wrong format`
|
||||
));
|
||||
console.error('total ' + _wrongFormat.length);
|
||||
}
|
||||
|
||||
if (_deletedWikidata.length) {
|
||||
console.error(colors.yellow.bold(`\nError - Deleted Wikidata entities:`));
|
||||
console.error(chalk.yellow.bold(`\nError - Deleted Wikidata entities:`));
|
||||
console.error('To resolve these, either remove the Wikidata entity from the item or create a new one and add the correct id of the entity');
|
||||
_deletedWikidata.sort();
|
||||
_deletedWikidata.forEach(msg => console.error(
|
||||
`${colors.cyan.bold(msg[0])} (${colors.yellow.bold(msg[1])}): ${colors.red.bold(msg[2])} (${colors.blue.bold(msg[3])}) does not exist or is a redirect`
|
||||
`${chalk.cyan.bold(msg[0])} (${chalk.yellow.bold(msg[1])}): ${chalk.red.bold(msg[2])} (${chalk.blue.bold(msg[3])}) does not exist or is a redirect`
|
||||
));
|
||||
console.error('total ' + _deletedWikidata.length);
|
||||
}
|
||||
|
||||
if (_deletedWikipedia.length) {
|
||||
console.error(colors.yellow.bold(`\nError - Deleted Wikipedia articles:`));
|
||||
console.error(chalk.yellow.bold(`\nError - Deleted Wikipedia articles:`));
|
||||
console.error('To resolve these, either remove the Wikipedia article from the item or create a new one and add the correct link to the article');
|
||||
_deletedWikipedia.sort();
|
||||
_deletedWikipedia.forEach(msg => console.error(
|
||||
`${colors.cyan.bold(msg[0])} (${colors.yellow.bold(msg[1])}): ${colors.red.bold(msg[2])} (${msg[3]}) (${colors.blue.bold(msg[4])}) does not exist or is a redirect`
|
||||
`${chalk.cyan.bold(msg[0])} (${chalk.yellow.bold(msg[1])}): ${chalk.red.bold(msg[2])} (${msg[3]}) (${chalk.blue.bold(msg[4])}) does not exist or is a redirect`
|
||||
));
|
||||
console.error('total ' + _deletedWikipedia.length);
|
||||
}
|
||||
|
||||
if (_foundSitelink.length) {
|
||||
console.warn(colors.yellow.bold(`\nWarning - Matched Wikipedia articles:`));
|
||||
console.warn(chalk.yellow.bold(`\nWarning - Matched Wikipedia articles:`));
|
||||
console.warn('To resolve these, add a sitelink to the correct item');
|
||||
_foundSitelink.sort();
|
||||
_foundSitelink.forEach(msg => console.warn(
|
||||
`${colors.cyan.bold(msg[0])} (${colors.yellow.bold(msg[1])}): ${colors.yellow.bold(msg[2])} (${colors.blue.bold(msg[3])}) has sitelinks to ${colors.green.bold(msg[4])}`
|
||||
`${chalk.cyan.bold(msg[0])} (${chalk.yellow.bold(msg[1])}): ${chalk.yellow.bold(msg[2])} (${chalk.blue.bold(msg[3])}) has sitelinks to ${chalk.green.bold(msg[4])}`
|
||||
));
|
||||
console.warn('total ' + _foundSitelink.length);
|
||||
}
|
||||
|
||||
if (_wrongLink.length) {
|
||||
console.warn(colors.yellow.bold(`\nWarning - Wrong Wikipedia article which is not linked to the Wikidata entity:`));
|
||||
console.warn(chalk.yellow.bold(`\nWarning - Wrong Wikipedia article which is not linked to the Wikidata entity:`));
|
||||
console.warn('To resolve these, check whether the Wikidata or the Wikipedia value is wrong and correct one of them');
|
||||
_wrongLink.sort();
|
||||
_wrongLink.forEach(msg => console.warn(
|
||||
`${colors.cyan.bold(msg[0])} (${colors.yellow.bold(msg[1])}): ${colors.yellow.bold(msg[2])} (${colors.blue.bold(msg[3])}) is not linked to ${colors.red.bold(msg[4])} but to ${colors.green.bold(msg[5])}`
|
||||
`${chalk.cyan.bold(msg[0])} (${chalk.yellow.bold(msg[1])}): ${chalk.yellow.bold(msg[2])} (${chalk.blue.bold(msg[3])}) is not linked to ${chalk.red.bold(msg[4])} but to ${chalk.green.bold(msg[5])}`
|
||||
));
|
||||
console.warn('total ' + _wrongLink.length);
|
||||
}
|
||||
|
||||
if (_wrongEntity.length) {
|
||||
console.warn(colors.yellow.bold(`\nWarning - Possibly wrong linked Wikidata entity:`));
|
||||
console.warn(chalk.yellow.bold(`\nWarning - Possibly wrong linked Wikidata entity:`));
|
||||
console.warn('To resolve these, check whether the Wikidata entity really describes the brand and not something else or follow the hint on how to fix the item');
|
||||
_wrongEntity.sort();
|
||||
_wrongEntity.forEach(msg => console.warn(
|
||||
`${colors.cyan.bold(msg[0])} (${colors.yellow.bold(msg[1])}): ${colors.yellow.bold(msg[2])} (${colors.blue.bold(msg[3])}) ${colors.red.bold(msg[4])}: ${msg[5]}`
|
||||
`${chalk.cyan.bold(msg[0])} (${chalk.yellow.bold(msg[1])}): ${chalk.yellow.bold(msg[2])} (${chalk.blue.bold(msg[3])}) ${chalk.red.bold(msg[4])}: ${msg[5]}`
|
||||
));
|
||||
console.warn('total ' + _wrongEntity.length);
|
||||
}
|
||||
|
||||
if (_missingInstance.length) {
|
||||
console.warn(colors.yellow.bold(`\nWarning - Missing sitelink and instance claim (P31) which might lead to a deletion in the future:`));
|
||||
console.warn(chalk.yellow.bold(`\nWarning - Missing sitelink and instance claim (P31) which might lead to a deletion in the future:`));
|
||||
console.warn('To resolve these, add an instance claim (P31) or a sitelink to the Wikidata item');
|
||||
_missingInstance.sort();
|
||||
_missingInstance.forEach(msg => console.warn(
|
||||
`${colors.cyan.bold(msg[0])} (${colors.yellow.bold(msg[1])}): ${colors.yellow.bold(msg[2])} (${colors.blue.bold(msg[3])}) is missing a sitelink and an instance claim (P31)`
|
||||
`${chalk.cyan.bold(msg[0])} (${chalk.yellow.bold(msg[1])}): ${chalk.yellow.bold(msg[2])} (${chalk.blue.bold(msg[3])}) is missing a sitelink and an instance claim (P31)`
|
||||
));
|
||||
console.warn('total ' + _missingInstance.length);
|
||||
}
|
||||
|
||||
if (_missingReferences.length) {
|
||||
console.warn(colors.yellow.bold(`\nWarning - Missing sitelink and external references which might lead to a deletion in the future:`));
|
||||
console.warn(chalk.yellow.bold(`\nWarning - Missing sitelink and external references which might lead to a deletion in the future:`));
|
||||
console.warn('To resolve these, add a reference to an external source or a sitelink to the Wikidata item');
|
||||
_missingReferences.sort();
|
||||
_missingReferences.forEach(msg => console.warn(
|
||||
`${colors.cyan.bold(msg[0])} (${colors.yellow.bold(msg[1])}): ${colors.yellow.bold(msg[2])} (${colors.blue.bold(msg[3])}) is missing a sitelink and a reference`
|
||||
`${chalk.cyan.bold(msg[0])} (${chalk.yellow.bold(msg[1])}): ${chalk.yellow.bold(msg[2])} (${chalk.blue.bold(msg[3])}) is missing a sitelink and a reference`
|
||||
));
|
||||
console.warn('total ' + _missingReferences.length);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
// External
|
||||
import colors from 'colors/safe.js';
|
||||
import chalk from 'chalk';
|
||||
import fs from 'node:fs';
|
||||
import glob from 'glob';
|
||||
import JSON5 from 'json5';
|
||||
|
|
@ -42,8 +42,8 @@ buildAll();
|
|||
|
||||
|
||||
function buildAll() {
|
||||
const START = '🏗 ' + colors.yellow('Building data...');
|
||||
const END = '👍 ' + colors.green('data built');
|
||||
const START = '🏗 ' + chalk.yellow('Building data...');
|
||||
const END = '👍 ' + chalk.green('data built');
|
||||
|
||||
console.log('');
|
||||
console.log(START);
|
||||
|
|
@ -339,7 +339,7 @@ function buildIDPresets() {
|
|||
});
|
||||
|
||||
missing.forEach(tkv => {
|
||||
console.warn(colors.yellow(`Warning - no iD source preset found for ${tkv}`));
|
||||
console.warn(chalk.yellow(`Warning - no iD source preset found for ${tkv}`));
|
||||
});
|
||||
|
||||
let output = { presets: targetPresets };
|
||||
|
|
@ -519,8 +519,8 @@ function minifySync(inPath, outPath) {
|
|||
const minified = JSON.stringify(JSON5.parse(contents));
|
||||
fs.writeFileSync(outPath, minified);
|
||||
} catch (err) {
|
||||
console.error(colors.red(`Error - ${err.message} minifying:`));
|
||||
console.error(' ' + colors.yellow(inPath));
|
||||
console.error(chalk.red(`Error - ${err.message} minifying:`));
|
||||
console.error(' ' + chalk.yellow(inPath));
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
// External
|
||||
import colors from 'colors/safe.js';
|
||||
import chalk from 'chalk';
|
||||
import fs from 'node:fs';
|
||||
|
||||
// JSON
|
||||
|
|
@ -15,7 +15,7 @@ const oldVersion = packageJSON.version;
|
|||
const newVersion = oldVersion.replace(/(\d){8}/, `${yyyy}${mm}${dd}`);
|
||||
|
||||
if (newVersion !== oldVersion) {
|
||||
console.log('🎉 ' + colors.green('Bumping package version to ') + colors.green.bold(`v${newVersion}`));
|
||||
console.log('🎉 ' + chalk.green('Bumping package version to ') + chalk.green.bold(`v${newVersion}`));
|
||||
const output = Object.assign(packageJSON, { version: newVersion });
|
||||
fs.writeFileSync('package.json', JSON.stringify(output, null, 2) + '\n');
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue