|
@@ -678,17 +678,15 @@ export default class ListenLayer {
|
|
|
}
|
|
|
|
|
|
//检查edge
|
|
|
- // (mathUtil.isContainForSegment(join, startPoint, endPoint) &&
|
|
|
- // leftSideJoin &&
|
|
|
- // mathUtil.isContainForSegment(position, join, leftSideJoin))
|
|
|
+ // ||
|
|
|
+ // (mathUtil.isContainForSegment(join, startPoint, endPoint) &&
|
|
|
+ // leftSideJoin &&
|
|
|
+ // mathUtil.isContainForSegment(position, leftSideJoin, leftJoin)
|
|
|
+ // )
|
|
|
distance = this.getDistance(position, leftJoin);
|
|
|
if (
|
|
|
(mathUtil.isContainForSegment(leftJoin, leftEdge.start, leftEdge.end) &&
|
|
|
- distance < Constant.minAdsorbPix / 2) ||
|
|
|
- (mathUtil.isContainForSegment(join, startPoint, endPoint) &&
|
|
|
- leftSideJoin &&
|
|
|
- mathUtil.isContainForSegment(position, leftSideJoin, leftJoin)
|
|
|
- )
|
|
|
+ distance < Constant.minAdsorbPix / 2)
|
|
|
) {
|
|
|
if (!edgeInfo.edgeId || distance < edgeInfo.distance) {
|
|
|
|
|
@@ -703,16 +701,17 @@ export default class ListenLayer {
|
|
|
}
|
|
|
|
|
|
distance = this.getDistance(position, rightJoin);
|
|
|
+ // ||
|
|
|
+ // (mathUtil.isContainForSegment(join, startPoint, endPoint) &&
|
|
|
+ // rightSideJoin &&
|
|
|
+ // mathUtil.isContainForSegment(position,rightSideJoin,rightJoin))
|
|
|
if (
|
|
|
(mathUtil.isContainForSegment(
|
|
|
rightJoin,
|
|
|
rightEdge.start,
|
|
|
rightEdge.end
|
|
|
) &&
|
|
|
- distance < Constant.minAdsorbPix / 2) ||
|
|
|
- (mathUtil.isContainForSegment(join, startPoint, endPoint) &&
|
|
|
- rightSideJoin &&
|
|
|
- mathUtil.isContainForSegment(position,rightSideJoin,rightJoin))
|
|
|
+ distance < Constant.minAdsorbPix / 2)
|
|
|
) {
|
|
|
if (!edgeInfo.edgeId || distance < edgeInfo.distance) {
|
|
|
edgeInfo = {
|