feat: drag lane turn arrows along their lanes

This commit is contained in:
que01 committed 2026-09-01 10:24:59 +08:00
1 parent 5457f960ff
commit 9cb715a592
12 files changed
+335 -24

No files matched your search

+48 -2
View File
@@ -15,7 +15,7 @@ import {
} from './edit/element';
import { directEditEnabled, intervalEditingSupported } from './edit/flag';
import type { ElementOutline } from './edit/handle-layer';
import type { Coordinate } from './edit/meters';
import { azimuthBetween, signedMetersAlongAxis, type Coordinate } from './edit/meters';
import { rendersSame } from './edit/parameter';
import { PreviewRequester, type PreviewDraft } from './edit/preview-request';
import { anchorSnapshotFor, constraintValueFor, draftConstraint, operationFor } from './edit/projection';
@@ -212,6 +212,23 @@ function App() {
}) ?? [],
);
}, [element, state]);
const laneSelectionFeatures = useMemo(() => {
if (!element || element.kind !== 'lane-maneuver' || !state) return [];
const ids = new Set(element.featureIds);
return (
state.layers.turnArrows?.features.filter((feature) => {
const nativeId = feature.properties?.native_id;
return typeof nativeId === 'string' && ids.has(nativeId);
}) ?? []
);
}, [element, state]);
const laneSelectionAxisAzimuth = useMemo(() => {
if (!element || element.kind !== 'lane-maneuver' || !state) return null;
const road = state.compiled.model.roads.find((item) => item.id === element.roadId);
const previous = road?.centerline.at(-2);
const end = road?.centerline.at(-1);
return previous && end ? azimuthBetween(previous, end) : null;
}, [element, state]);
const sessionRef = useRef<EditSession | null>(null);
if (directEditEnabled && !sessionRef.current) sessionRef.current = new EditSession();
// Per-frame drag feedback reaches the panel through this rather than through
@@ -635,6 +652,27 @@ function App() {
ranges={editRanges}
element={elementOutline}
laneSelectionBounds={laneSelectionBounds}
laneSelectionFeatures={laneSelectionFeatures}
laneSelectionAxisAzimuth={laneSelectionAxisAzimuth}
onLaneSelectionDragEnd={(from, to) => {
if (!element || element.kind !== 'lane-maneuver' || element.placementDistanceMeters === undefined) return;
const road = state.compiled.model.roads.find((item) => item.id === element.roadId);
const previous = road?.centerline.at(-2);
const end = road?.centerline.at(-1);
if (!previous || !end) return;
const deltaTowardJunction = signedMetersAlongAxis(from, to, azimuthBetween(previous, end));
const existing = [...state.overrides.overrides, ...staged]
.reverse()
.find((item) => item.kind === 'lane-maneuver' && item.laneId === element.laneId);
stage({
id: existing?.id || `车道转向:${element.laneId}`,
kind: 'lane-maneuver',
laneId: element.laneId,
maneuver: typeof existing?.maneuver === 'string' ? existing.maneuver : element.maneuver,
placementDistanceMeters: Math.max(0, element.placementDistanceMeters - deltaTowardJunction),
});
setStatus('箭头位置已暂存;保存并重新生成后应用。');
}}
preview={preview}
ghostPending={session?.degraded ?? false}
onHandleDrag={(handle, value) => {
@@ -967,7 +1005,15 @@ function LaneManeuverEditor({
<select
value={maneuver}
onChange={(event) =>
stage({ id, kind: 'lane-maneuver', laneId: element.laneId, maneuver: event.target.value })
stage({
id,
kind: 'lane-maneuver',
laneId: element.laneId,
maneuver: event.target.value,
...(typeof override?.placementDistanceMeters === 'number'
? { placementDistanceMeters: override.placementDistanceMeters }
: {}),
})
}
>
{MANEUVER_OPTIONS.map(([value, label]) => (