feat: make native road pipeline the default

2026-08-18 14:15:08 +08:00
parent e9ab1f03eb
commit 9e0e25aadf
16 changed files with 134 additions and 82 deletions
--- a/scripts/lib/area-config.js
+++ b/scripts/lib/area-config.js
@@ -85,7 +85,9 @@ function normalizeAreaConfig(raw, options = {}) {
    qgisApp: raw.qgisApp || (process.platform === "darwin" ? "/Applications/QGIS.app" : "/usr"),
    blenderApp: raw.blenderApp || (process.platform === "darwin" ? "/Applications/Blender.app" : "/usr/bin/blender"),
    stages: {
-      intermediates: raw.stages?.intermediates ?? raw.stages?.qgis ?? true,
+      // Native road compilation is the default. Legacy QGIS/osm2streets
+      // intermediates remain explicitly selectable for reference/debug work.
+      intermediates: raw.stages?.intermediates ?? raw.stages?.qgis ?? false,
      blender: raw.stages?.blender ?? true,
      cesium: raw.stages?.cesium ?? true,
      reimport: false,
@@ -121,7 +123,7 @@ function normalizeAreaConfig(raw, options = {}) {
    blender: {
      treeStyle: raw.blender?.treeStyle || "natural",
      officeOverrides: raw.blender?.officeOverrides || raw.blender?.office_overrides || "",
-      roadProvider: roadProviderOption(raw.blender?.roadProvider),
+      roadProvider: roadProviderOption(raw.blender?.roadProvider ?? "native"),
    },
    compress,
    budget,
--- a/scripts/lib/area-diagnostics.js
+++ b/scripts/lib/area-diagnostics.js
@@ -323,13 +323,17 @@ function addEndpoint(map, ref) {
 }

 function artifactStatus(area) {
+  const native = area.blender.roadProvider === "native";
  const entries = [
-    ["GeoJSON dir", area.outputs.geojsonDir, true, "dir"],
-    ["GeoPackage", area.outputs.gpkg, true, "file"],
-    ["QGIS project", area.outputs.qgisProject, true, "file"],
-    ["QGIS preview", area.outputs.qgisPreview, true, "file"],
-    ["Traffic signal assemblies", area.outputs.trafficSignalAssemblies, true, "file"],
-    ["Traffic signal runtime", area.outputs.packageTrafficSignals, true, "file"],
+    ...(native ? [] : [
+      ["GeoJSON dir", area.outputs.geojsonDir, true, "dir"],
+      ["GeoPackage", area.outputs.gpkg, true, "file"],
+      ["QGIS project", area.outputs.qgisProject, true, "file"],
+      ["QGIS preview", area.outputs.qgisPreview, true, "file"],
+      ["Traffic signal assemblies", area.outputs.trafficSignalAssemblies, true, "file"],
+    ]),
+    ["Native road directory", area.outputs.nativeRoadDir, native, "dir"],
+    ["Traffic signal runtime", native ? path.join(area.outputs.nativeRoadDir, "traffic-signals.json") : area.outputs.packageTrafficSignals, true, "file"],
    ["Blend scene", area.outputs.blend, true, "file"],
    ["Render PNG", area.outputs.render, true, "file"],
    ["Package manifest", area.outputs.packageManifest, true, "file"],
@@ -373,6 +377,7 @@ function metadataSummary(file, warnings) {
 }

 function stageManifestStatus(area, configPath = null) {
+  const native = area.blender.roadProvider === "native";
  const compressionComplete = fs.existsSync(stageManifestPath(area, "compress"));
  const reimportManifest = stageManifestPath(area, "reimport");
  const hasReimportManifest = fs.existsSync(reimportManifest);
@@ -430,10 +435,12 @@ function stageManifestStatus(area, configPath = null) {
      inputs: {
        ...(configPath ? { config: configPath } : {}),
        osm: area.input,
-        geojsonDir: area.outputs.geojsonDir,
-        ...sceneGeojsonFiles(area),
-        trafficSignalAssemblies: area.outputs.trafficSignalAssemblies,
-        trafficSignals: area.outputs.packageTrafficSignals,
+        ...(native ? nativeRoadRecords(area) : {
+          geojsonDir: area.outputs.geojsonDir,
+          ...sceneGeojsonFiles(area),
+          trafficSignalAssemblies: area.outputs.trafficSignalAssemblies,
+          trafficSignals: area.outputs.packageTrafficSignals,
+        }),
      },
      outputs: {
        blend: area.outputs.blend,
@@ -461,18 +468,20 @@ function stageManifestStatus(area, configPath = null) {
          glb: area.outputs.glb,
          metadata: area.outputs.metadata,
        }),
-        lanePolygons: path.join(area.outputs.geojsonDir, "lane_polygons.geojson"),
-        network: path.join(area.outputs.geojsonDir, "network.json"),
-        intersectionSurface: path.join(area.outputs.geojsonDir, "intersection_surface.geojson"),
+        ...(native ? nativeRoadRecords(area) : {
+          lanePolygons: path.join(area.outputs.geojsonDir, "lane_polygons.geojson"),
+          network: path.join(area.outputs.geojsonDir, "network.json"),
+          intersectionSurface: path.join(area.outputs.geojsonDir, "intersection_surface.geojson"),
+        }),
        previewCss: path.join(path.resolve(__dirname, ".."), "lib", "cesium-preview.css"),
        previewJs: path.join(path.resolve(__dirname, ".."), "lib", "cesium-preview.js"),
      },
      outputs: compressionComplete ? {
-        vehicleRoute: area.outputs.vehicleRoute,
+        vehicleRoute: native ? optionalExpectedFile(area.outputs.vehicleRoute) : area.outputs.vehicleRoute,
        vehicleModel: area.outputs.vehicleModel,
      } : {
        cesiumPreview: area.outputs.cesiumPreview,
-        vehicleRoute: area.outputs.vehicleRoute,
+        vehicleRoute: native ? optionalExpectedFile(area.outputs.vehicleRoute) : area.outputs.vehicleRoute,
        vehicleModel: area.outputs.vehicleModel,
      },
    },
@@ -597,6 +606,24 @@ function sceneGeojsonFiles(area) {
  return files;
 }

+function nativeRoadRecords(area) {
+  const root = path.join(area.outputs.nativeRoadDir, "layers");
+  return {
+    nativeRoadCompiled: path.join(area.outputs.nativeRoadDir, "compiled.json"),
+    nativeRoadSignals: path.join(area.outputs.nativeRoadDir, "traffic-signals.json"),
+    nativeRoadSurface: path.join(root, "road_surface.geojson"),
+    nativeEdgeLines: path.join(root, "edge_lines.geojson"),
+    nativeIntersectionSurface: path.join(root, "intersection_surface.geojson"),
+    nativeSidewalkSurface: path.join(root, "sidewalk_surface.geojson"),
+    nativeLaneSeparators: path.join(root, "lane_separators.geojson"),
+    nativeCenterLines: path.join(root, "center_lines.geojson"),
+    nativeDirectionArrows: path.join(root, "direction_arrows.geojson"),
+    nativeTurnArrows: path.join(root, "turn_arrows.geojson"),
+    nativeCrosswalks: path.join(root, "crosswalks.geojson"),
+    nativeVehicleStopLines: path.join(root, "vehicle_stop_lines.geojson"),
+  };
+}
+
 function collectWarnings(area, osm, artifacts, manifests, glb, metadata) {
  const warnings = [];
  if (!osm.bounds) warnings.push("OSM has no valid <bounds>; scene extent may be wrong.");
--- a/scripts/lib/area-preview.js
+++ b/scripts/lib/area-preview.js
@@ -124,14 +124,14 @@ function escapeScriptJson(value) {
 }

 function previewSummary(area) {
-  const route = JSON.parse(fs.readFileSync(area.outputs.vehicleRoute, "utf8"));
+  const route = fs.existsSync(area.outputs.vehicleRoute) ? JSON.parse(fs.readFileSync(area.outputs.vehicleRoute, "utf8")) : null;
  return {
    glbName: "package/manifest.json",
    metadataName: "package/manifest.json",
-    routeName: path.relative(area.outputs.areaDir, area.outputs.vehicleRoute).split(path.sep).join("/"),
+    routeName: route ? path.relative(area.outputs.areaDir, area.outputs.vehicleRoute).split(path.sep).join("/") : null,
    vehicleModelName: path.relative(area.outputs.areaDir, area.outputs.vehicleModel).split(path.sep).join("/"),
    trafficSignalsName: "package/runtime/traffic-signals.json",
-    routeSegments: Array.isArray(route.segments) ? route.segments.length : null,
+    routeSegments: Array.isArray(route?.segments) ? route.segments.length : null,
  };
 }

--- a/scripts/lib/build-stages.js
+++ b/scripts/lib/build-stages.js
@@ -1,7 +1,7 @@
 "use strict";

 const STAGES = [
-  { id: "intermediates", label: "OSM / QGIS intermediates", description: "Rebuild GeoJSON and GeoPackage from OSM" },
+  { id: "intermediates", label: "Legacy QGIS intermediates", description: "Explicit legacy osm2streets/QGIS reference build" },
  { id: "reimport", label: "Reimport QGIS edits", description: "Copy GeoPackage layers back to GeoJSON" },
  { id: "blender", label: "Blender scene", description: "Generate the editable scene and render" },
  { id: "cesium", label: "Cesium export", description: "Export static package staging assets" },
@@ -11,7 +11,7 @@ const STAGES = [
 ];

 const ALIASES = {
-  all: ["intermediates", "blender", "cesium", "compress", "package", "preview"],
+  all: ["blender", "cesium", "compress", "package", "preview"],
  qgis: ["intermediates"], osm2streets: ["intermediates"], geojson: ["intermediates"], intermediate: ["intermediates"],
  intermediates: ["intermediates"], reimport: ["reimport"], gpkg: ["reimport"], blender: ["blender"], scene: ["blender"],
  cesium: ["cesium"], glb: ["cesium"], preview: ["preview"], html: ["preview"], cesiumPreview: ["preview"],
--- a/scripts/lib/cesium-preview.js
+++ b/scripts/lib/cesium-preview.js
@@ -88,6 +88,7 @@
  // The route file is an extra on top of the scene, not a precondition for it.
  // A missing or unreadable route costs the cruise controls, not the preview.
  async function fetchOptionalJson(url) {
+    if (!url) return null;
    try {
      return await fetchJson(url);
    } catch (error) {