human tweaks

mapPipeline.js

@@ -1,15 +1,34 @@
 import { CELL_SIZE, MAP_H, MAP_W, indexOf } from "./mapUtils.js";
 import { generateTerrainAndRivers } from "./mapTerrain.js";
-import { generateMapFeatures } from "./mapFeatures.js";
+import { generateMapFeatures } from "./mapFeaturesV2.js";
 import { finishMapOutput } from "./mapOutput.js";
 import { generateAdminLayout } from "./mapAdminStage.js";
 
 export { CELL_SIZE, MAP_H, MAP_W, indexOf } from "./mapUtils.js";
 
+function nowMs() {
+  return typeof performance !== "undefined" && performance.now ? performance.now() : Date.now();
+}
+
+function timedStage(timings, options, key, label, fn) {
+  options?.onProgress?.({ status: "start", key, label, timings: timings.slice() });
+  const t0 = nowMs();
+  const value = fn();
+  const ms = Math.round((nowMs() - t0) * 10) / 10;
+  const entry = { key, label, ms };
+  timings.push(entry);
+  options?.onProgress?.({ status: "done", key, label, ms, timings: timings.slice() });
+  return value;
+}
+
 export function generateMap(seedInput = 114514, options = {}) {
   const seed = Number(seedInput) >>> 0;
+  if (typeof options.onProgress !== "function") options = { ...options, onProgress: () => {} };
 
-  const terrain = generateTerrainAndRivers(seed);
+  const generationTimings = [];
+  const stage = (key, label, fn) => timedStage(generationTimings, options, key, label, fn);
+
+  const terrain = stage("terrain", "Terrain, rivers, and prefecture regions", () => generateTerrainAndRivers(seed));
   const {
     terrainTemplate,
     seaLevel,
@@ -54,19 +73,29 @@ export function generateMap(seedInput = 114514, options = {}) {
     smallStreams,
   } = terrain;
 
-  const features = generateMapFeatures(seed, terrain);
+  const features = stage("human", "Human geography and transport", () => generateMapFeatures(seed, terrain));
   const {
     ports, crossings, passes, settlementCluster, settlementScore, villages, markets, castles, premodernRoads, minorRoads, castleTowns, modernCities, populationDensity,
     railways, branchRailways, ringRailways, externalRailways, stations, industrialZones, nationalRoads, ringRoads, expressways, ringExpressways, icAccessRoads, externalRoads, externalExpressways,
     interchanges, logisticsParks, satelliteCities, newTowns, landuse, stationInfluence, roadInfluence, railInfluence2, villageInfluence, externalGateways, cityPopulationCap, transportDebug,
   } = features;
 
-  const { adminCentersRaw, adminId, adminBorders, adminDebug } = generateAdminLayout({
+  const { adminCentersRaw, adminId, adminBorders, adminDebug } = stage("admin", "Municipal and prefectural administration", () => generateAdminLayout({
     seed, prefectureMask, prefectureRegionId: adminPrefectureRegionId || prefectureRegionId, sea, elevation, slope, river, ridgeField, naturalBarrierScore, valleyField, basinField, coastalLowland, flowAccum, plain, agriculture,
     settlementScore, populationDensity, stationInfluence, roadInfluence, railInfluence2, villageInfluence, landuse, modernCities, satelliteCities, newTowns, markets, villages, ports, stations, industrialZones, logisticsParks,
-  });
+    adminProgress: (event) => options?.onProgress?.({
+      ...event,
+      key: "admin",
+      label: event.status === "region-done"
+        ? `Admin region ${event.regionId} done`
+        : event.status === "admin-step"
+          ? `Admin region ${event.regionId}: ${event.step}`
+          : `Admin region ${event.regionId}`,
+      timings: generationTimings.slice(),
+    }),
+  }));
 
-  return finishMapOutput({
+  const output = stage("output", "Names, population totals, and final packaging", () => finishMapOutput({
     seed, options, terrainTemplate, seaLevel, cityPopulationCap, stationInfluence, roadInfluence, railInfluence2,
     elevation, moisture, slope, sea, ocean, lake, river, floodplain, plain, agriculture, settlementCluster, ridgeField, valleyField, visibleRavineField, surfaceTextureField, basinField, coastalLowland, flowAccum, erosionField, depositionField,
     arcSpineField, branchRidgeField, depositionalLowland, alluvialFanField, deltaField, naturalBarrierScore,
@@ -75,5 +104,8 @@ export function generateMap(seedInput = 114514, options = {}) {
     interchanges, logisticsParks, satelliteCities, newTowns, landuse, adminCentersRaw, adminId, adminBorders, adminDebug,
     riverPaths, mainRivers, tributaryRivers, smallStreams, externalGateways, prefectureMask, prefectureBorder, prefectureRegionId, regionalPrefectureBorders,
     regionalDebug, terrainDebug, transportDebug,
-  });
+  }));
+  output.generationTimings = generationTimings;
+  output.generationTotalMs = generationTimings.reduce((sum, row) => sum + row.ms, 0);
+  return output;
 }