diff --git a/src/native-traffic-signals.js b/src/native-traffic-signals.js index 8cc5872..a0b461d 100644 --- a/src/native-traffic-signals.js +++ b/src/native-traffic-signals.js @@ -14,6 +14,7 @@ const SCHEMA = 'native-traffic-signals/v1'; function loadOrGenerate(file, osmText, stopLines, intersections) { if (fs.existsSync(file)) { const document = JSON.parse(fs.readFileSync(file, 'utf8')); + if (document?.provenance === 'empty') return generate(osmText, stopLines, intersections); try { return validateDocument(document, osmText); } catch (error) { diff --git a/workbench/client/src/App.tsx b/workbench/client/src/App.tsx index c4d67e2..cf184af 100644 --- a/workbench/client/src/App.tsx +++ b/workbench/client/src/App.tsx @@ -640,6 +640,38 @@ function App() { if (typeof uid === 'string') setStatus(`已选中原生红绿灯 ${uid}`); else if (properties.effective_style) setStatus('已选中标线,可在右侧暂存样式'); }; + const moveSignal = (uid: string, coordinate: Coordinate) => { + setState((current) => { + if (!current) return current; + return { + ...current, + trafficSignals: { + ...current.trafficSignals, + assemblies: { + ...current.trafficSignals.assemblies, + features: current.trafficSignals.assemblies.features.map((feature) => + feature.properties?.signal_uid === uid + ? { ...feature, geometry: { type: 'Point', coordinates: coordinate } } + : feature, + ), + }, + }, + }; + }); + }; + const finishSignalMove = (uid: string, coordinate: Coordinate) => { + const current = state; + if (!current) return; + const features = current.trafficSignals.assemblies.features.map((feature) => + feature.properties?.signal_uid === uid + ? { ...feature, geometry: { type: 'Point', coordinates: coordinate } } + : feature, + ); + void api + .signals({ ...current.trafficSignals, assemblies: { ...current.trafficSignals.assemblies, features } }) + .then((result) => setState((value) => (value ? { ...value, ...result } : value))) + .catch((error: Error) => setStatus(`红绿灯位置保存失败:${error.message}`)); + }; return ( <>
@@ -771,6 +803,8 @@ function App() { onSelectRoad={setSelected} onFeature={handleFeature} onBackground={() => setElement(null)} + onSignalDrag={moveSignal} + onSignalDragEnd={finishSignalMove} handles={editHandles} ranges={editRanges} element={elementOutline} @@ -1308,6 +1342,10 @@ function SignalEditor({ const [selected, setSelected] = useState(''); useEffect(() => setSelected(String(signal?.properties?.signal_uid || '')), [signal]); const feature = state.trafficSignals.assemblies.features.find((item) => item.properties?.signal_uid === selected); + const coordinates = + feature?.geometry?.type === 'Point' && Array.isArray(feature.geometry.coordinates) + ? (feature.geometry.coordinates as [number, number]) + : null; const saveField = (key: string, value: unknown) => { if (!feature) return; void update( @@ -1316,22 +1354,21 @@ function SignalEditor({ ), ); }; + const saveCoordinate = (index: 0 | 1, value: number) => { + if (!feature || !coordinates || !Number.isFinite(value)) return; + const nextCoordinates: [number, number] = [...coordinates]; + nextCoordinates[index] = value; + void update( + state.trafficSignals.assemblies.features.map((item) => + item === feature + ? { ...item, geometry: { ...item.geometry, type: 'Point', coordinates: nextCoordinates } } + : item, + ), + ); + }; return (

原生红绿灯

- + + + +

+ 控制进口:{String(feature.properties?.approach_id || '未绑定')} +
+ 来源道路:{String(feature.properties?.source_way_id || '未绑定')} +