perf: reduce junction preview handle and collision work
This commit is contained in:
1 parent
6a8f026d12
commit
d0a4cfa7ff
11 files changed
+291
-5
No files matched your search
@@ -178,3 +178,9 @@ complex-junction.js / native-road.js:构建与全部消费者;direct-edit-so
|
||||
实测与测试:中心8个入口全连通;集群28条发布完整路径,8条区域冲突暂缓。28条全部匹配可见车道端点,0条因端点缺失而跳过;最大端点切向误差0.9898度。合成T/四臂最大误差0.9807度。新 test/connector-trajectories.js 纳入 npm test。references/core-and-trajectories.png/svg 为实际配置编译几何叠加图(蓝线轨迹,黄色停止线),非浏览器截图。
|
||||
|
||||
npm test 中代码、投影、边界反例、设施、编辑与工作台导入检查通过;最后 test/fixtures.js 快照仍失败(当前 OSM 与旧基线不同,且本次轨迹几何也会改变输出),未刷新基线,因此不得写为全量测试通过。格式与diff检查通过。8条暂缓路径、车辆尺度转弯半径/扫掠、全图层接缝及已有岛/斑马线约4.2e-5m²微小面积交集尚未关闭。未提交、未归档。
|
||||
|
||||
## 2026-09-14 小范围预览性能优化(未提交)
|
||||
|
||||
用户同意取消300ms硬门槛,要求先试验、改动简洁、控制风险。本轮先做独立新旧差分,再仅接入两处等价优化:cluster selection 跳过会被过滤的其他手柄;标线裁切按排序包围盒减少精确碰撞候选。仍计算全量路网,接口和保存路径不变,不引入跨请求缓存或增量协议。
|
||||
|
||||
21组完整新旧结果深比较一致。真实接口热运行计算+序列化从约2.53秒降至约1.59秒,下降约37%;尚未测浏览器绘制。求解器、几何、编辑API、导入回归、类型/格式检查通过;npm test最终既有fixture快照差异仍失败。详见 research/preview-small-optimization.md 及对应脚本/原始结果。可作为独立提交候选,未归档父任务。
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
// Run from repository root with BASELINE_ROOT pointing to a checkout of 6a8f026 with dependencies.
|
||||
const fs=require('fs'),assert=require('assert/strict'),{performance}=require('perf_hooks');
|
||||
const root=process.cwd(), old=require(process.env.BASELINE_ROOT+'/src/compile/native-road'),fast=require(root+'/src/compile/native-road');
|
||||
const solveOld=require(process.env.BASELINE_ROOT+'/src/compile/direct-edit-solver').resolveDirectEditConstraints,solveFast=require(root+'/src/compile/direct-edit-solver').resolveDirectEditConstraints;
|
||||
const dir=root+'/workbench-data/import-fE8XI7',options=JSON.parse(fs.readFileSync(dir+'/active/area-config.snapshot.json')).options,overrides=old.loadOverrides(dir+'/native-road-overrides.json'),model=old.compileRoadModel(fs.readFileSync(dir+'/source.osm','utf8'),overrides),doc=JSON.parse(fs.readFileSync(dir+'/active/native-road-edits.json'));
|
||||
const context={junctionTemplates:options.junctionTemplates,selection:{type:'cluster',id:options.junctionTemplates.clusters[0].id}};
|
||||
const handles=solveOld(model,doc,context).handles.handles;
|
||||
const fields={'cluster-carriageway-width':'widthMeters','cluster-carriageway-transition-length':'transitionLengthMeters','cluster-carriageway-direction':'offsetDegrees','cluster-carriageway-position':'offsetMeters','cluster-corner-radius':'radiusMeters','cluster-crossing-inset':'insetMeters','cluster-stop-line-offset':'offsetMeters'};
|
||||
const cases=[{name:'baseline',doc}];
|
||||
for(const [kind,field] of Object.entries(fields)) {const h=handles.find(h=>h.kind===kind);if(!h){console.log(JSON.stringify({missing:kind}));continue;} cases.push({name:kind,doc:{...doc,constraints:[{id:'experiment',kind,anchor:h.anchor,value:{[field]:Math.min(h.value.max,h.value.current+0.4)},enabled:true,status:'exact'}]}});}
|
||||
function run(native,solve,document){const t=performance.now(),resolution=solve(model,document,context),compiled=native.compileGeometry(model,overrides,{...options,directEdit:resolution});return {ms:performance.now()-t,resolution,compiled};}
|
||||
for(let i=0;i<3;i++)for(const c of cases){const a=run(old,solveOld,c.doc),b=run(fast,solveFast,c.doc);assert.deepEqual(b.resolution,a.resolution);assert.deepEqual(b.compiled,a.compiled);if(c.name!=='baseline')assert.equal(a.resolution.constraintStates[0].applied,true,c.name);console.log(JSON.stringify({round:i,kind:c.name,oldMs:a.ms,newMs:b.ms,equal:true}));}
|
||||
@@ -0,0 +1,31 @@
|
||||
# JunctionTools preview latency audit — 2026-09-14
|
||||
|
||||
Investigation only; implementation unchanged. Baseline commit 6a8f026. Real source/config: workbench-data/import-fE8XI7, four-node cluster, radius 21m. Called exported editPreview with selection={cluster:actualClusterId}, no added constraints; this measures repeated preview processing, not actual browser input-to-paint latency. No writes to user workspace data. Performance wrappers in /private/tmp/profile-junction-preview.js instrument exported model/solver/compiler/projection stages before server import.
|
||||
|
||||
## Measurements
|
||||
|
||||
CPU-profiled run: 1 cold + 5 repeated calls. Then independent unprofiled process: 1 cold + 2 repeated calls. Unprofiled repeated values:
|
||||
|
||||
| Phase | Run 1 ms | Run 2 ms |
|
||||
| --- | ---: | ---: |
|
||||
| OSM/model build | 66.8 | 73.7 |
|
||||
| Constraint resolution + handle construction | 306.3 | 313.1 |
|
||||
| Whole-area geometry | 1996.8 | 1951.3 |
|
||||
| Selected junction projection | 0.83 | 0.56 |
|
||||
| Total editPreview | 2375.9 | 2344.7 |
|
||||
| JSON.stringify response | 175.8 | 167.1 |
|
||||
|
||||
Response: 24,185,780 UTF-8 bytes. Counts include 20,942 lane-separator features (13.59MB), 4,978 direction-arrow features (4.24MB), 860 connectors (3.28MB), 2,212 center-line features (1.88MB). These are whole-region collections, not just the selected cluster. This already costs about 2.5 seconds before network/browser parsing/rendering. Small sample; do not label this P95.
|
||||
|
||||
CPU sampling across six selected-cluster previews: compileLaneMarkings inclusive ~7.1s, trimLineBeforeFirstControl inclusive ~6.8s (nested, do not sum); compileConnectors ~2.4s; resolver ~1.5s. The biggest hotspot is control avoidance, not core filling or four-island geometry. trimLineBeforeFirstControl probes every 0.25m and ringsOverlapControl scans control features; controlBounds alone consumes ~2.35s self time across six calls. Road/junction affects construction repeatedly scans global connections. Arrow assets are synchronously reread via loadManifest during generation.
|
||||
|
||||
## Confirmed causes
|
||||
|
||||
1. compileEditCandidate rereads/parses OSM and rebuilds the model, resolves constraints and compiles all area geometry for every request. selection reaches handle filtering; it does not restrict geometry compilation.
|
||||
2. resolveDirectEditConstraints constructs all road/junction/cluster/lane handles before selectHandles filters them. Cluster selection does not avoid global handle/affects construction.
|
||||
3. editPreview returns full-area layers. localJunctionPreview filters them only after browser receipt. Server JSON response is not compressed by sendJson; stringify is synchronous.
|
||||
4. UI schedules live changes with 80ms trailing debounce; settle flushes immediately. AbortController abandons requests on the client, but synchronous server computation has no cancellation signal or cooperative yields, so obsolete work can still occupy the single event loop.
|
||||
5. EditPreviewLayer.show clears touched sources, reparses GeoJSON, recreates features and reprojects to EPSG:3857. JunctionTools does scope its displayed collections, so do not claim it necessarily draws all ~30,000 features. Browser parsing/filtering/paint duration has not been measured.
|
||||
6. degraded only labels compute >300ms. It neither stops computation nor includes response serialization/network/paint. Historical comments about ~142ms reflect different data/code and are not current performance evidence.
|
||||
|
||||
Priority implied by evidence: avoid whole-area marking/control recomputation; generate selected handles before filtering; return scoped layers; cache stable parsing/assets. Do not promise 300ms from debounce tweaks, worker offloading alone, or merely adding Maps. Backend computation alone must be reduced by roughly an order of magnitude.
|
||||
@@ -0,0 +1,3 @@
|
||||
{"run":0,"computeMs":1564.985023,"stages":{"compileRoadModel":79.877753,"resolveDirectEditConstraints":28.894586000000004,"compileGeometry":1445.833637,"projectJunctionStructure":1.6543349999999464,"standardsDiagnostics":0.2963159999999334},"serializationMs":233.65626299999985,"bytes":24185780,"degraded":true,"layerBytes":{"roadSurface":259256,"edgeLines":42,"sidewalkSurface":22768,"intersectionSurface":151764,"laneCenterlines":285839,"laneSeparators":13587441,"centerLines":1875036,"directionArrows":4243365,"turnArrows":42,"crosswalks":256167,"vehicleStopLines":5999,"connectors":3278237},"counts":{"roadSurface":239,"edgeLines":0,"sidewalkSurface":8,"intersectionSurface":92,"laneCenterlines":499,"laneSeparators":20942,"centerLines":2212,"directionArrows":4978,"turnArrows":0,"crosswalks":141,"vehicleStopLines":4,"connectors":860}}
|
||||
{"run":1,"computeMs":1451.9432230000002,"stages":{"compileRoadModel":68.01373799999965,"resolveDirectEditConstraints":10.46456900000021,"compileGeometry":1367.673898,"projectJunctionStructure":0.9491409999995994,"standardsDiagnostics":0.021730999999817868},"serializationMs":171.42120999999997,"bytes":24185780,"degraded":true,"layerBytes":{"roadSurface":259256,"edgeLines":42,"sidewalkSurface":22768,"intersectionSurface":151764,"laneCenterlines":285839,"laneSeparators":13587441,"centerLines":1875036,"directionArrows":4243365,"turnArrows":42,"crosswalks":256167,"vehicleStopLines":5999,"connectors":3278237},"counts":{"roadSurface":239,"edgeLines":0,"sidewalkSurface":8,"intersectionSurface":92,"laneCenterlines":499,"laneSeparators":20942,"centerLines":2212,"directionArrows":4978,"turnArrows":0,"crosswalks":141,"vehicleStopLines":4,"connectors":860}}
|
||||
{"run":2,"computeMs":1387.485408,"stages":{"compileRoadModel":71.12653100000034,"resolveDirectEditConstraints":7.21379799999977,"compileGeometry":1302.8253790000003,"projectJunctionStructure":0.6795459999993909,"standardsDiagnostics":0.2227179999999862},"serializationMs":168.53626499999973,"bytes":24185780,"degraded":true,"layerBytes":{"roadSurface":259256,"edgeLines":42,"sidewalkSurface":22768,"intersectionSurface":151764,"laneCenterlines":285839,"laneSeparators":13587441,"centerLines":1875036,"directionArrows":4243365,"turnArrows":42,"crosswalks":256167,"vehicleStopLines":5999,"connectors":3278237},"counts":{"roadSurface":239,"edgeLines":0,"sidewalkSurface":8,"intersectionSurface":92,"laneCenterlines":499,"laneSeparators":20942,"centerLines":2212,"directionArrows":4978,"turnArrows":0,"crosswalks":141,"vehicleStopLines":4,"connectors":860}}
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
{"missing":"cluster-crossing-inset"}
|
||||
{"round":0,"kind":"baseline","oldMs":2285.4365359999997,"newMs":1292.1180959999997,"equal":true}
|
||||
{"round":0,"kind":"cluster-carriageway-width","oldMs":2376.678916,"newMs":1238.5497850000002,"equal":true}
|
||||
{"round":0,"kind":"cluster-carriageway-transition-length","oldMs":2178.8894229999987,"newMs":1192.483655,"equal":true}
|
||||
{"round":0,"kind":"cluster-carriageway-direction","oldMs":2180.4383500000004,"newMs":1218.5936649999985,"equal":true}
|
||||
{"round":0,"kind":"cluster-carriageway-position","oldMs":2216.8962889999984,"newMs":1221.5325800000028,"equal":true}
|
||||
{"round":0,"kind":"cluster-corner-radius","oldMs":2166.0852030000024,"newMs":1209.366739000001,"equal":true}
|
||||
{"round":0,"kind":"cluster-stop-line-offset","oldMs":2255.1596759999993,"newMs":1192.0639980000014,"equal":true}
|
||||
{"round":1,"kind":"baseline","oldMs":2172.251967,"newMs":1182.4069149999996,"equal":true}
|
||||
{"round":1,"kind":"cluster-carriageway-width","oldMs":2199.3163970000023,"newMs":1198.1523030000026,"equal":true}
|
||||
{"round":1,"kind":"cluster-carriageway-transition-length","oldMs":2240.4705299999987,"newMs":1194.0498739999966,"equal":true}
|
||||
{"round":1,"kind":"cluster-carriageway-direction","oldMs":2180.7153689999977,"newMs":1188.6622540000026,"equal":true}
|
||||
{"round":1,"kind":"cluster-carriageway-position","oldMs":2172.935529000002,"newMs":1196.8491980000035,"equal":true}
|
||||
{"round":1,"kind":"cluster-corner-radius","oldMs":2219.6554370000013,"newMs":1189.8391730000003,"equal":true}
|
||||
{"round":1,"kind":"cluster-stop-line-offset","oldMs":2100.577357999995,"newMs":1227.7292689999958,"equal":true}
|
||||
{"round":2,"kind":"baseline","oldMs":2165.955930999997,"newMs":1179.9063920000044,"equal":true}
|
||||
{"round":2,"kind":"cluster-carriageway-width","oldMs":2210.4734150000004,"newMs":1202.4629229999991,"equal":true}
|
||||
{"round":2,"kind":"cluster-carriageway-transition-length","oldMs":2111.6621700000032,"newMs":1153.514052999999,"equal":true}
|
||||
{"round":2,"kind":"cluster-carriageway-direction","oldMs":2172.6889870000014,"newMs":1251.9535700000051,"equal":true}
|
||||
{"round":2,"kind":"cluster-carriageway-position","oldMs":2256.1194470000046,"newMs":1234.4344730000012,"equal":true}
|
||||
{"round":2,"kind":"cluster-corner-radius","oldMs":2239.5719339999923,"newMs":1189.8456850000075,"equal":true}
|
||||
{"round":2,"kind":"cluster-stop-line-offset","oldMs":2228.122657,"newMs":1212.329448999997,"equal":true}
|
||||
+81
@@ -0,0 +1,81 @@
|
||||
// Isolated experiment: invokes production pure functions; never writes active data.
|
||||
// Run from repository root: node .trellis/tasks/09-08-junction-reference-fidelity/research/preview-scope-experiment.cjs
|
||||
const fs = require('fs');
|
||||
const { performance } = require('perf_hooks');
|
||||
const { createHash } = require('crypto');
|
||||
const { compileRoadModel, compileGeometry, loadOverrides } = require(process.cwd() + '/src/compile/native-road');
|
||||
const { resolveDirectEditConstraints } = require(process.cwd() + '/src/compile/direct-edit-solver');
|
||||
const dir = 'workbench-data/import-fE8XI7';
|
||||
const start = performance.now();
|
||||
const options = JSON.parse(fs.readFileSync(dir + '/active/area-config.snapshot.json')).options;
|
||||
const overrides = loadOverrides(dir + '/native-road-overrides.json');
|
||||
const model = compileRoadModel(fs.readFileSync(dir + '/source.osm', 'utf8'), overrides);
|
||||
const document = JSON.parse(fs.readFileSync(dir + '/active/native-road-edits.json'));
|
||||
const cluster = options.junctionTemplates.clusters[0];
|
||||
const context = { junctionTemplates: options.junctionTemplates, selection: { type: 'cluster', id: cluster.id } };
|
||||
const byNode = new Map();
|
||||
for (const e of model.endpoints) { if (!byNode.has(e.nodeId)) byNode.set(e.nodeId, new Set()); byNode.get(e.nodeId).add(e.roadId); }
|
||||
function scope(depth) {
|
||||
const nodes = new Set(cluster.nodeIds), roads = new Set();
|
||||
for (let i = 0; i <= depth; i++) {
|
||||
for (const node of nodes) for (const id of byNode.get(node) || []) roads.add(id);
|
||||
for (const e of model.endpoints) if (roads.has(e.roadId)) nodes.add(e.nodeId);
|
||||
}
|
||||
const endpoints = model.endpoints.filter(e => roads.has(e.roadId));
|
||||
const ids = new Set(endpoints.map(e => e.id));
|
||||
return { ...model, roads: model.roads.filter(r => roads.has(r.id)), endpoints,
|
||||
connections: model.connections.filter(c => ids.has(c.fromEndpointId) && ids.has(c.toEndpointId)) };
|
||||
}
|
||||
function run(m, doc) {
|
||||
const t = performance.now();
|
||||
const resolution = resolveDirectEditConstraints(m, doc, context);
|
||||
const solved = performance.now();
|
||||
const compiled = compileGeometry(m, overrides, { ...options, directEdit: resolution });
|
||||
const end = performance.now();
|
||||
return { compiled, resolution, solveMs: solved-t, compileMs: end-solved, computeMs: end-t };
|
||||
}
|
||||
function features(compiled) {
|
||||
const map = new Map();
|
||||
for (const [layer, collection] of Object.entries(compiled)) for (const f of collection?.features || []) {
|
||||
const json = JSON.stringify(f), hash = createHash('sha256').update(json).digest('hex');
|
||||
const key = layer + ':' + hash;
|
||||
const old = map.get(key); map.set(key, { count: (old?.count || 0)+1, layer, feature: f });
|
||||
}
|
||||
return map;
|
||||
}
|
||||
function delta(before, after) {
|
||||
const result = new Map();
|
||||
for (const key of new Set([...before.keys(), ...after.keys()])) {
|
||||
const count = (after.get(key)?.count || 0)-(before.get(key)?.count || 0);
|
||||
if (count) result.set(key, { ...(after.get(key) || before.get(key)), count });
|
||||
}
|
||||
return result;
|
||||
}
|
||||
function compare(a,b) {
|
||||
const mismatches=[];
|
||||
for(const key of new Set([...a.keys(),...b.keys()])) if(a.get(key)?.count !== b.get(key)?.count) {
|
||||
const f=a.get(key)||b.get(key); mismatches.push({layer:f.layer,id:f.feature.properties?.native_id,full:a.get(key)?.count||0,local:b.get(key)?.count||0});
|
||||
}
|
||||
return {equal:!mismatches.length,mismatchCount:mismatches.length,examples:mismatches.slice(0,8)};
|
||||
}
|
||||
const setupMs=performance.now()-start;
|
||||
const fullBase=run(model,document), fullFeatures=features(fullBase.compiled);
|
||||
const handle=fullBase.resolution.handles.handles.find(h=>h.kind==='cluster-carriageway-width');
|
||||
if(!handle) throw Error('Missing width handle');
|
||||
const scopes=[0,1,2].map(depth=>{const m=scope(depth), base=run(m,document);return {depth,m,base:features(base.compiled),rows:[]};});
|
||||
console.log(JSON.stringify({setupMs,fullRoads:model.roads.length,scopes:scopes.map(s=>({depth:s.depth,roads:s.m.roads.length})),handle:handle.handleId}));
|
||||
for(let i=0;i<20;i++) {
|
||||
const value=handle.value.current + 0.1 + (i%10)*0.1;
|
||||
const doc={...document,constraints:[...document.constraints,{id:'experiment-width',kind:handle.kind,anchor:handle.anchor,value:{widthMeters:value},enabled:true,status:'exact'}]};
|
||||
const full=run(model,doc);
|
||||
if(!full.resolution.constraintStates.find(s=>s.constraintId==='experiment-width')?.applied) throw Error('Edit not applied: '+JSON.stringify(full.resolution.constraintStates));
|
||||
const reference=delta(fullFeatures,features(full.compiled));
|
||||
for(const s of scopes) {
|
||||
const local=run(s.m,doc), diff=delta(s.base,features(local.compiled));
|
||||
const t=performance.now();const payload=JSON.stringify({changes:[...diff.values()],handles:local.resolution.handles,constraintStates:local.resolution.constraintStates});const serializationMs=performance.now()-t;
|
||||
const row={run:i,value,depth:s.depth,solveMs:local.solveMs,compileMs:local.compileMs,computeMs:local.computeMs,serializationMs,bytes:Buffer.byteLength(payload),fullComputeMs:full.computeMs,changed:reference.size,comparison:compare(reference,diff)};
|
||||
s.rows.push(row);console.log(JSON.stringify(row));
|
||||
}
|
||||
}
|
||||
function stats(values){const s=[...values].sort((a,b)=>a-b);return {min:s[0],median:s[Math.floor(s.length/2)],p95:s[Math.ceil(s.length*.95)-1],max:s.at(-1)};}
|
||||
console.log(JSON.stringify({summary:scopes.map(s=>({depth:s.depth,roads:s.m.roads.length,allDeltasEqual:s.rows.every(r=>r.comparison.equal),computeAndSerializationMs:stats(s.rows.map(r=>r.computeMs+r.serializationMs)),fullComputeMs:stats(s.rows.map(r=>r.fullComputeMs)),bytes:stats(s.rows.map(r=>r.bytes))}))}));
|
||||
@@ -0,0 +1,62 @@
|
||||
{"setupMs":82.091327,"fullRoads":318,"scopes":[{"depth":0,"roads":12},{"depth":1,"roads":32},{"depth":2,"roads":56}],"handle":"handle:cluster-carriageway-width:cluster:cluster-8005332807:carriageway:8005332807/segment%3Away%2F253970456%2F1/road%3Away%2F253970456%3Asegment%2F1%3Aforward"}
|
||||
{"run":0,"value":9.85,"depth":0,"solveMs":9.557064999999966,"compileMs":316.0986899999998,"computeMs":325.6557549999998,"serializationMs":2.232861000000412,"bytes":416605,"fullComputeMs":2170.9019529999996,"changed":124,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":0,"value":9.85,"depth":1,"solveMs":15.14473100000032,"compileMs":420.10305100000005,"computeMs":435.24778200000037,"serializationMs":2.4457000000002154,"bytes":418680,"fullComputeMs":2170.9019529999996,"changed":124,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":0,"value":9.85,"depth":2,"solveMs":21.637515999999778,"compileMs":547.5551640000003,"computeMs":569.1926800000001,"serializationMs":2.4221150000003036,"bytes":420460,"fullComputeMs":2170.9019529999996,"changed":124,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":1,"value":9.95,"depth":0,"solveMs":10.689680999999837,"compileMs":360.28462200000104,"computeMs":370.9743030000009,"serializationMs":1.907219000000623,"bytes":436363,"fullComputeMs":2162.349112,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":1,"value":9.95,"depth":1,"solveMs":13.274993000000904,"compileMs":432.1202119999998,"computeMs":445.3952050000007,"serializationMs":1.9363740000007965,"bytes":438438,"fullComputeMs":2162.349112,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":1,"value":9.95,"depth":2,"solveMs":20.685750000000553,"compileMs":569.7800330000009,"computeMs":590.4657830000015,"serializationMs":2.0177759999987757,"bytes":440218,"fullComputeMs":2162.349112,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":2,"value":10.049999999999999,"depth":0,"solveMs":5.940107000000353,"compileMs":319.55948499999977,"computeMs":325.4995920000001,"serializationMs":1.9293809999999212,"bytes":436351,"fullComputeMs":2111.5045450000016,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":2,"value":10.049999999999999,"depth":1,"solveMs":11.450167999999394,"compileMs":419.90083100000084,"computeMs":431.35099900000023,"serializationMs":2.2531980000003387,"bytes":438426,"fullComputeMs":2111.5045450000016,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":2,"value":10.049999999999999,"depth":2,"solveMs":20.372020999999222,"compileMs":547.839258,"computeMs":568.2112789999992,"serializationMs":2.001905999999508,"bytes":440206,"fullComputeMs":2111.5045450000016,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":3,"value":10.15,"depth":0,"solveMs":10.110854999998992,"compileMs":320.47782700000243,"computeMs":330.5886820000014,"serializationMs":1.9960460000002058,"bytes":436259,"fullComputeMs":2118.175674,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":3,"value":10.15,"depth":1,"solveMs":13.607135999998718,"compileMs":426.9146929999988,"computeMs":440.5218289999975,"serializationMs":2.1548540000003413,"bytes":438334,"fullComputeMs":2118.175674,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":3,"value":10.15,"depth":2,"solveMs":20.650824000000284,"compileMs":556.8770189999996,"computeMs":577.5278429999998,"serializationMs":1.9438280000031227,"bytes":440114,"fullComputeMs":2118.175674,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":4,"value":10.25,"depth":0,"solveMs":10.683538999997836,"compileMs":333.69013300000006,"computeMs":344.3736719999979,"serializationMs":2.4758959999999206,"bytes":436166,"fullComputeMs":2192.3786870000004,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":4,"value":10.25,"depth":1,"solveMs":13.00734999999986,"compileMs":447.440462999999,"computeMs":460.44781299999886,"serializationMs":2.4687530000010156,"bytes":438241,"fullComputeMs":2192.3786870000004,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":4,"value":10.25,"depth":2,"solveMs":22.45761499999935,"compileMs":601.8785310000021,"computeMs":624.3361460000015,"serializationMs":1.9048550000006799,"bytes":440021,"fullComputeMs":2192.3786870000004,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":5,"value":10.35,"depth":0,"solveMs":9.755558000000747,"compileMs":319.6855399999986,"computeMs":329.44109799999933,"serializationMs":1.9265759999980219,"bytes":434742,"fullComputeMs":2132.4120299999995,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":5,"value":10.35,"depth":1,"solveMs":13.406458999997994,"compileMs":424.9514990000025,"computeMs":438.3579580000005,"serializationMs":2.099941000000399,"bytes":436817,"fullComputeMs":2132.4120299999995,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":5,"value":10.35,"depth":2,"solveMs":23.12702100000024,"compileMs":567.2923549999978,"computeMs":590.419375999998,"serializationMs":1.9414530000030936,"bytes":438597,"fullComputeMs":2132.4120299999995,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":6,"value":10.45,"depth":0,"solveMs":5.993077000002813,"compileMs":330.5428659999998,"computeMs":336.5359430000026,"serializationMs":1.8765419999981532,"bytes":434706,"fullComputeMs":2136.052312,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":6,"value":10.45,"depth":1,"solveMs":13.188781000000745,"compileMs":430.75614199999836,"computeMs":443.9449229999991,"serializationMs":2.0286569999989297,"bytes":436781,"fullComputeMs":2136.052312,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":6,"value":10.45,"depth":2,"solveMs":20.827565999999933,"compileMs":568.7115779999986,"computeMs":589.5391439999985,"serializationMs":1.88463700000284,"bytes":438561,"fullComputeMs":2136.052312,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":7,"value":10.549999999999999,"depth":0,"solveMs":5.932803999996395,"compileMs":324.9480270000058,"computeMs":330.8808310000022,"serializationMs":1.9272359999959008,"bytes":434902,"fullComputeMs":2138.8442920000016,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":7,"value":10.549999999999999,"depth":1,"solveMs":10.703045999995084,"compileMs":441.81436500000564,"computeMs":452.5174110000007,"serializationMs":1.9678730000014184,"bytes":436977,"fullComputeMs":2138.8442920000016,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":7,"value":10.549999999999999,"depth":2,"solveMs":19.830455000002985,"compileMs":554.1457620000001,"computeMs":573.9762170000031,"serializationMs":1.9632649999985006,"bytes":438757,"fullComputeMs":2138.8442920000016,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":8,"value":10.65,"depth":0,"solveMs":5.800204999999551,"compileMs":319.26163500000257,"computeMs":325.0618400000021,"serializationMs":1.8717019999967306,"bytes":434769,"fullComputeMs":2196.7264460000006,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":8,"value":10.65,"depth":1,"solveMs":11.240945999998075,"compileMs":433.28231299999607,"computeMs":444.52325899999414,"serializationMs":1.9364040000000386,"bytes":436844,"fullComputeMs":2196.7264460000006,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":8,"value":10.65,"depth":2,"solveMs":20.785486999993736,"compileMs":547.6380000000063,"computeMs":568.423487,"serializationMs":1.9342800000013085,"bytes":438624,"fullComputeMs":2196.7264460000006,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":9,"value":10.75,"depth":0,"solveMs":10.293267000000924,"compileMs":316.29617999999755,"computeMs":326.5894469999985,"serializationMs":2.127483000003849,"bytes":443410,"fullComputeMs":2147.80616,"changed":132,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":9,"value":10.75,"depth":1,"solveMs":13.12561299999652,"compileMs":431.6866379999992,"computeMs":444.81225099999574,"serializationMs":1.9623530000026221,"bytes":445485,"fullComputeMs":2147.80616,"changed":132,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":9,"value":10.75,"depth":2,"solveMs":21.711364999995567,"compileMs":562.7895540000027,"computeMs":584.5009189999982,"serializationMs":2.3710900000005495,"bytes":447265,"fullComputeMs":2147.80616,"changed":132,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":10,"value":9.85,"depth":0,"solveMs":5.973549999995157,"compileMs":370.3468350000039,"computeMs":376.3203849999991,"serializationMs":1.7907410000043456,"bytes":416605,"fullComputeMs":2151.4998820000037,"changed":124,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":10,"value":9.85,"depth":1,"solveMs":15.134751999998116,"compileMs":439.9024070000014,"computeMs":455.0371589999995,"serializationMs":2.082798000003095,"bytes":418680,"fullComputeMs":2151.4998820000037,"changed":124,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":10,"value":9.85,"depth":2,"solveMs":20.18708400000469,"compileMs":631.2939239999978,"computeMs":651.4810080000025,"serializationMs":1.8393819999982952,"bytes":420460,"fullComputeMs":2151.4998820000037,"changed":124,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":11,"value":9.95,"depth":0,"solveMs":6.066925999999512,"compileMs":381.1988300000012,"computeMs":387.2657560000007,"serializationMs":2.6824540000015986,"bytes":436363,"fullComputeMs":2601.729800000001,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":11,"value":9.95,"depth":1,"solveMs":13.36330799999996,"compileMs":463.12375500000053,"computeMs":476.4870630000005,"serializationMs":2.1306079999994836,"bytes":438438,"fullComputeMs":2601.729800000001,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":11,"value":9.95,"depth":2,"solveMs":20.543462999994517,"compileMs":629.755717,"computeMs":650.2991799999945,"serializationMs":1.9414929999984452,"bytes":440218,"fullComputeMs":2601.729800000001,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":12,"value":10.049999999999999,"depth":0,"solveMs":6.153537999998662,"compileMs":331.8629030000011,"computeMs":338.01644099999976,"serializationMs":1.9528450000070734,"bytes":436351,"fullComputeMs":2191.8486420000045,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":12,"value":10.049999999999999,"depth":1,"solveMs":13.674271999996563,"compileMs":443.1867110000021,"computeMs":456.86098299999867,"serializationMs":3.3135089999996126,"bytes":438426,"fullComputeMs":2191.8486420000045,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":12,"value":10.049999999999999,"depth":2,"solveMs":23.825622000003932,"compileMs":574.9863939999996,"computeMs":598.8120160000035,"serializationMs":1.9795050000029732,"bytes":440206,"fullComputeMs":2191.8486420000045,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":13,"value":10.15,"depth":0,"solveMs":7.467855000002601,"compileMs":437.9851589999962,"computeMs":445.4530139999988,"serializationMs":3.034705000005488,"bytes":436259,"fullComputeMs":2208.0030289999995,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":13,"value":10.15,"depth":1,"solveMs":12.341310999996495,"compileMs":426.7040380000035,"computeMs":439.045349,"serializationMs":2.0565389999974286,"bytes":438334,"fullComputeMs":2208.0030289999995,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":13,"value":10.15,"depth":2,"solveMs":19.955190000000584,"compileMs":561.6838289999941,"computeMs":581.6390189999947,"serializationMs":2.0973060000033,"bytes":440114,"fullComputeMs":2208.0030289999995,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":14,"value":10.25,"depth":0,"solveMs":6.05423200000223,"compileMs":368.2168679999959,"computeMs":374.2710999999981,"serializationMs":2.1724969999995665,"bytes":436166,"fullComputeMs":2215.618040000001,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":14,"value":10.25,"depth":1,"solveMs":14.679307999998855,"compileMs":448.27351700000145,"computeMs":462.9528250000003,"serializationMs":1.9932710000066436,"bytes":438241,"fullComputeMs":2215.618040000001,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":14,"value":10.25,"depth":2,"solveMs":21.605415999998513,"compileMs":611.7472209999978,"computeMs":633.3526369999963,"serializationMs":1.9718310000025667,"bytes":440021,"fullComputeMs":2215.618040000001,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":15,"value":10.35,"depth":0,"solveMs":5.86444499999925,"compileMs":473.06164600000193,"computeMs":478.9260910000012,"serializationMs":3.323868000006769,"bytes":434742,"fullComputeMs":2201.9000949999972,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":15,"value":10.35,"depth":1,"solveMs":18.427781999998842,"compileMs":555.6714759999886,"computeMs":574.0992579999875,"serializationMs":2.3020499999984168,"bytes":436817,"fullComputeMs":2201.9000949999972,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":15,"value":10.35,"depth":2,"solveMs":20.98601300000155,"compileMs":609.2047100000054,"computeMs":630.190723000007,"serializationMs":3.538220000002184,"bytes":438597,"fullComputeMs":2201.9000949999972,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":16,"value":10.45,"depth":0,"solveMs":13.330818000002182,"compileMs":322.76873599999817,"computeMs":336.09955400000035,"serializationMs":2.1809229999926174,"bytes":434706,"fullComputeMs":2265.4950020000106,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":16,"value":10.45,"depth":1,"solveMs":12.398257000008016,"compileMs":437.89218399999663,"computeMs":450.29044100000465,"serializationMs":2.5593230000085896,"bytes":436781,"fullComputeMs":2265.4950020000106,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":16,"value":10.45,"depth":2,"solveMs":21.088917000000947,"compileMs":569.1401420000038,"computeMs":590.2290590000048,"serializationMs":1.9589859999978216,"bytes":438561,"fullComputeMs":2265.4950020000106,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":17,"value":10.549999999999999,"depth":0,"solveMs":14.146958999990602,"compileMs":340.1923450000031,"computeMs":354.3393039999937,"serializationMs":3.6743449999921722,"bytes":434902,"fullComputeMs":2297.191955999995,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":17,"value":10.549999999999999,"depth":1,"solveMs":18.01058900001226,"compileMs":500.56653299999016,"computeMs":518.5771220000024,"serializationMs":2.0068260000116425,"bytes":436977,"fullComputeMs":2297.191955999995,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":17,"value":10.549999999999999,"depth":2,"solveMs":20.03393700000015,"compileMs":564.0579949999956,"computeMs":584.0919319999957,"serializationMs":2.207872999992105,"bytes":438757,"fullComputeMs":2297.191955999995,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":18,"value":10.65,"depth":0,"solveMs":9.937007999993511,"compileMs":322.0552380000008,"computeMs":331.99224599999434,"serializationMs":1.876021000003675,"bytes":434769,"fullComputeMs":2154.9666179999913,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":18,"value":10.65,"depth":1,"solveMs":12.702348000006168,"compileMs":437.82925599999726,"computeMs":450.5316040000034,"serializationMs":1.9326770000043325,"bytes":436844,"fullComputeMs":2154.9666179999913,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":18,"value":10.65,"depth":2,"solveMs":23.21744100000069,"compileMs":827.8039559999888,"computeMs":851.0213969999895,"serializationMs":2.113415999992867,"bytes":438624,"fullComputeMs":2154.9666179999913,"changed":130,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":19,"value":10.75,"depth":0,"solveMs":6.400811999992584,"compileMs":328.2599120000086,"computeMs":334.6607240000012,"serializationMs":1.978984000001219,"bytes":443410,"fullComputeMs":2651.589730000007,"changed":132,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":19,"value":10.75,"depth":1,"solveMs":14.428186999997706,"compileMs":437.5252150000015,"computeMs":451.9534019999992,"serializationMs":2.0162639999907697,"bytes":445485,"fullComputeMs":2651.589730000007,"changed":132,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"run":19,"value":10.75,"depth":2,"solveMs":22.66500399999495,"compileMs":552.8812500000058,"computeMs":575.5462540000008,"serializationMs":2.03872599999886,"bytes":447265,"fullComputeMs":2651.589730000007,"changed":132,"comparison":{"equal":true,"mismatchCount":0,"examples":[]}}
|
||||
{"summary":[{"depth":0,"roads":12,"allDeltasEqual":true,"computeAndSerializationMs":{"min":326.93354199999885,"median":338.41248500000074,"p95":448.4877190000043,"max":482.24995900000795},"fullComputeMs":{"min":2111.5045450000016,"median":2191.8486420000045,"p95":2601.729800000001,"max":2651.589730000007},"bytes":{"min":416605,"median":436166,"p95":443410,"max":443410}},{"depth":1,"roads":32,"allDeltasEqual":true,"computeAndSerializationMs":{"min":433.60419700000057,"median":452.84976400001324,"p95":520.5839480000141,"max":576.4013079999859},"fullComputeMs":{"min":2111.5045450000016,"median":2191.8486420000045,"p95":2601.729800000001,"max":2651.589730000007},"bytes":{"min":418680,"median":438241,"p95":445485,"max":445485}},{"depth":2,"roads":56,"allDeltasEqual":true,"computeAndSerializationMs":{"min":570.2131849999987,"median":592.1880450000026,"p95":653.3203900000008,"max":853.1348129999824},"fullComputeMs":{"min":2111.5045450000016,"median":2191.8486420000045,"p95":2601.729800000001,"max":2651.589730000007},"bytes":{"min":420460,"median":440021,"p95":447265,"max":447265}}]}
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
# 小范围预览优化(2026-09-14)
|
||||
|
||||
用户取消 300ms 硬门槛,要求明显提速、任务简洁、避免大改;正式修改前必须完成内部试验。
|
||||
|
||||
## 本次边界
|
||||
|
||||
先试验两处等价优化:
|
||||
- direct-edit-solver.js:cluster selection 不构造最终必然被过滤掉的 road/junction/lane 手柄,所有约束仍完整求解。
|
||||
- native-road.js:trimLineBeforeFirstControl 每条线建立按 minX 排序的碰撞候选包围盒,仍使用原精确 ringsOverlap、原采样步长和原裁切回退。
|
||||
|
||||
不接入子路网裁剪,不增加接口/客户端协议、跨请求缓存、版本失效机制或新依赖。模型缓存节省远小于标线裁切,本轮先减少扫描和无用派生计算,避免扩大状态管理风险。源数据、保存与正式编译契约保持原样。
|
||||
|
||||
验收:真实四节点/21m工作区,新旧完整 resolution 与 compiled 深比较;多类非空编辑确实 applied;现有几何与编辑回归;记录整接口计算和序列化耗时。若通过,可作为独立提交候选,用户复核后提交。
|
||||
|
||||
## 前序子路网试验
|
||||
|
||||
318条道路缩到12/32/56条,20次宽度调整的图层多重集合增删变化均一致。12条方案计算+序列化中位数338ms,样本P95 448ms;32条453ms;56条592ms。比较不包含非图层元数据,耗时不含增量提取与浏览器显示,尚不足以发布通用局部编译。因此仅保留研究,不纳入这次产品修改。
|
||||
|
||||
## 结果与正式实现
|
||||
|
||||
隔离原型完成 3 轮 × 7 场景,共 21 次新旧深比较:空文档、宽度、过渡长度、方向、位置、圆角、停止线。全部完整 resolution(含 Map、手柄、状态、诊断)与 compiled(全部图层及非图层产物)一致;所有非空编辑确实 applied。旧计算中位数 2199.3ms,新原型 1198.2ms。当前真实样本未发布 cluster-crossing-inset 手柄,未冒称该编辑参与此差分试验;已有设施回归另行通过。
|
||||
|
||||
试验通过后仅修改两个生产文件,增加一个完整求解结果不受手柄筛选影响的回归。生产实现与原型算法相同,只作格式和局部变量整理。
|
||||
|
||||
真实 editPreview 接口复测(独立运行,没有与测试并发):原先两次热运行计算+JSON序列化 2552/2512ms;优化后 1623/1556ms,平均下降约37%。模型解析仍68–71ms;resolver从306–313ms降至7–10ms;全量几何从1951–1997ms降至1303–1368ms。响应仍24,185,780字节。本报告不是浏览器输入到绘制完成延迟,未测网络和地图更新;3次接口样本不报告P95。
|
||||
|
||||
检查:新增求解器回归通过;npm test 前序全部代码、几何、编辑API、导入编译检查通过,最后 test/fixtures.js 仍是已有快照差异,未更新基线。首次沙箱内监听8899失败,取得工具批准后在沙箱外重跑得到上述结果。npm run test:client、npm run format:check、git diff --check 通过。无客户端改动,未重复E2E。
|
||||
|
||||
原始数据:preview-prototype-results.jsonl、preview-optimized-api.jsonl、preview-scope-results.jsonl。重跑差分:BASELINE_ROOT 指向6a8f026检出及其依赖,从当前仓库运行 node .trellis/tasks/09-08-junction-reference-fidelity/research/preview-equivalence-experiment.cjs。
|
||||
|
||||
本轮未提交。优化单元完成;父任务保持进行中。后续是否进一步缩短传输和渲染等待,应先测浏览器,不直接扩展本轮范围。
|
||||
@@ -1926,15 +1926,19 @@ function resolveDirectEditConstraints(model, editDocument = null, context = {})
|
||||
clusters,
|
||||
solved.clusterPlans,
|
||||
);
|
||||
// Cluster manifests discard other handle families; keep solving all constraints.
|
||||
const clusterSelection = context.selection?.type === 'cluster';
|
||||
handles.reserves = junctionData.reserves;
|
||||
handles.handles = selectHandles(
|
||||
[
|
||||
...makeRoadHandles(model || {}, groups, handles.reserves, reconciled, solved.roadProfiles),
|
||||
...makeJunctionHandles(model || {}, junctionData, reconciled),
|
||||
...(clusterSelection
|
||||
? []
|
||||
: makeRoadHandles(model || {}, groups, handles.reserves, reconciled, solved.roadProfiles)),
|
||||
...(clusterSelection ? [] : makeJunctionHandles(model || {}, junctionData, reconciled)),
|
||||
...makeClusterCarriagewayHandles(model || {}, junctionData, reconciled, clusters),
|
||||
...makeClusterCornerHandles(model || {}, junctionData, reconciled, clusters),
|
||||
...makeClusterCrossingHandles(model || {}, junctionData, reconciled, clusters),
|
||||
...makeLaneManeuverHandles(model || {}, reconciled),
|
||||
...(clusterSelection ? [] : makeLaneManeuverHandles(model || {}, reconciled)),
|
||||
],
|
||||
model || {},
|
||||
context.selection,
|
||||
|
||||
@@ -1163,17 +1163,32 @@ function compileComplexLaneSeparators(features, controls = []) {
|
||||
}
|
||||
|
||||
function trimLineBeforeFirstControl(line, controls, width) {
|
||||
// Build once per line; preserve the exact polygon overlap predicate.
|
||||
const indexed = controls
|
||||
.map((feature) => {
|
||||
const ring = feature.geometry.coordinates[0];
|
||||
return { ring, box: controlBounds(ring) };
|
||||
})
|
||||
.sort((a, b) => a.box[0] - b.box[0]);
|
||||
const overlaps = (ring) => {
|
||||
const box = ringBounds(ring);
|
||||
for (const control of indexed) {
|
||||
if (control.box[0] > box[2]) break;
|
||||
if (!boundsDisjoint(box, control.box) && ringsOverlap(ring, control.ring)) return true;
|
||||
}
|
||||
return false;
|
||||
};
|
||||
const total = lineLengthMeters(line);
|
||||
const step = 0.25;
|
||||
for (let distance = step; distance <= total; distance += step) {
|
||||
const placement = pointAndAxisAlongLine(line, Math.min(total, distance - step / 2));
|
||||
if (!placement) continue;
|
||||
const ring = rectangleAt(placement.point, placement.axis, [-placement.axis[1], placement.axis[0]], step, width, 0);
|
||||
if (!ringsOverlapControl([ring], controls)) continue;
|
||||
if (!overlaps(ring)) continue;
|
||||
let cutoff = Math.max(0, distance - step - 0.12);
|
||||
while (cutoff > 0.5) {
|
||||
const candidate = roadRing([line[0], pointAlongLine(line, cutoff)], width);
|
||||
if (candidate && !ringsOverlapControl([candidate], controls)) return [line[0], pointAlongLine(line, cutoff)];
|
||||
if (candidate && !overlaps(candidate)) return [line[0], pointAlongLine(line, cutoff)];
|
||||
cutoff -= 0.25;
|
||||
}
|
||||
return null;
|
||||
|
||||
@@ -364,6 +364,25 @@ const clusterHandleResolution = resolveDirectEditConstraints(junctionModel, docu
|
||||
junctionClusters: [{ id: 'cluster-1', nodeIds: ['junction'] }],
|
||||
selection: { type: 'cluster', id: 'cluster-1' },
|
||||
});
|
||||
// Early handle scoping must equal filtering the full manifest, including when
|
||||
// non-cluster constraints still need to participate in geometry solving.
|
||||
for (const edits of [document([]), document(allKinds)]) {
|
||||
const context = { junctionClusters: [{ id: 'cluster-1', nodeIds: ['junction'] }] };
|
||||
const full = resolveDirectEditConstraints(junctionModel, edits, context);
|
||||
const scoped = resolveDirectEditConstraints(junctionModel, edits, {
|
||||
...context,
|
||||
selection: { type: 'cluster', id: 'cluster-1' },
|
||||
});
|
||||
assert.deepEqual(scoped, {
|
||||
...full,
|
||||
handles: {
|
||||
...full.handles,
|
||||
handles: full.handles.handles.filter(
|
||||
(handle) => handle.anchor?.clusterId === 'cluster-1' && handle.kind.startsWith('cluster-'),
|
||||
),
|
||||
},
|
||||
});
|
||||
}
|
||||
const clusterWidthHandle = clusterHandleResolution.handles.handles.find(
|
||||
(handle) => handle.kind === 'cluster-carriageway-width',
|
||||
);
|
||||
|
||||
Reference in new issue
Block a user