Fix city generation retries and remove city-wide economy mechanics

This commit is contained in:
mrleo1nid committed 2026-10-30 22:54:06 +03:00
1 parent 85df37c26e
commit 63f0c72ff3
21 files changed
+252 -585

No files matched your search

+8 -1
View File
@@ -1,4 +1,5 @@
import { readFile, mkdir, rename, rm, writeFile } from 'node:fs/promises';
import { writeFileSync } from 'node:fs';
import { fetchOverpass, type BBox } from '../src/osm/overpass';
import { generateWorldSync } from '../src/gen/generate';
import { exportCity } from './export/index';
@@ -6,8 +7,9 @@ const job = JSON.parse(await readFile(process.argv[2], 'utf8')) as {
bbox: BBox; name: string; seed: number; cityId: string; output: string; maxBuildings: number; progress: string; input?:string;
};
const progress = async (stage: string) => writeFile(job.progress,JSON.stringify({stage}));
async function run() {
await progress('Загрузка OSM');
const elements = job.input ? JSON.parse(await readFile(job.input,'utf8')).elements : await fetchOverpass(job.bbox);
const elements = job.input ? JSON.parse(await readFile(job.input,'utf8')).elements : await fetchOverpass(job.bbox, stage => writeFileSync(job.progress, JSON.stringify({stage})));
if (elements.filter(e => e.tags?.building && e.tags.building !== 'no').length > job.maxBuildings) throw new Error('Превышен лимит зданий');
await progress('Генерация');
const world = generateWorldSync(elements,job.bbox,job.name,job.seed);
@@ -25,3 +27,8 @@ try {
await rm(temporary,{recursive:true,force:true}); throw error;
}
await progress('Готово');
}
await run().catch(error => {
console.error(`CITYGEN_ERROR:${JSON.stringify({message: error instanceof Error ? error.message : String(error)})}`);
process.exitCode = 1;
});