diff --git a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx index 71f2ce17..962830c0 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx @@ -180,7 +180,6 @@ export default function PassivityCircuitAllocation(props) { .filter((obj) => obj.name === POLYGON_TYPE.MODULE && obj.pcs && obj.pcs.id === selectedPcs.id) // 1. 북면모듈, 북면외모듈 혼합 여부 체크 const targetModuleInfos = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE && targetModules.includes(obj.id)) - debugger const newTargetModuleGroup = [...new Set(targetModuleInfos.concat(originHaveThisPcsModules).map((obj) => obj.moduleInfo.northModuleYn))] if (newTargetModuleGroup.length > 1) { diff --git a/src/hooks/module/useTrestle.js b/src/hooks/module/useTrestle.js index 81a96a2f..71ee6123 100644 --- a/src/hooks/module/useTrestle.js +++ b/src/hooks/module/useTrestle.js @@ -2499,8 +2499,11 @@ export const useTrestle = () => { }) } - function isPointInRect(rect, point) { - return point.x >= rect.x && point.x <= rect.x + rect.width && point.y >= rect.y && point.y <= rect.y + rect.height + // [DBL-CABLE-EPS 2026-07-10] 좌표가 소수점 2자리 반올림이라 千鳥 이웃 위치에 ±0.02 오차 누적 → + // 경계에 아슬아슬 걸친 이웃이 밖으로 판정되어 회로가 분리되고 유령 케이블(dblCblTotCnt) 1 발생. + // ε=0.5 로 반올림 오차 흡수(매칭 tolerance 0.5 기준). 남/북 fallback 에도 이 헬퍼 공유 사용. + function isPointInRect(rect, point, eps = 0.5) { + return point.x >= rect.x - eps && point.x <= rect.x + rect.width + eps && point.y >= rect.y - eps && point.y <= rect.y + rect.height + eps } // 25-04-02 추가 @@ -3388,8 +3391,8 @@ export const useTrestle = () => { const modules = surface.modules // 1. 현재 surface의 모듈들을 그룹화 const groupInSurface = groupPoints(modules, surface) - - cnt += countMatchingCircuitNumbers(groupInSurface) + const surfaceCnt = countMatchingCircuitNumbers(groupInSurface) + cnt += surfaceCnt }) const groupByCircuitAndSurfaceCnt = groupByCircuitAndSurface(modules)