Skip to content

Handle undefined coordinates in ForceMultiGraphLayout #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ibgreen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle undefined coordinates in ForceMultiGraphLayout #327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions modules/graph-layers/src/layouts/experimental/force-multi-graph-layout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,32 +180,38 @@ export class ForceMultiGraphLayout extends GraphLayout<ForceMultiGraphLayoutOpti
this._d3Graph.edges = newD3Edges;
}

getNodePosition = (node: Node): [number, number] => {
const d3Node = this._nodeMap[node.id];
if (d3Node) {
return [d3Node.x, d3Node.y];
private _getNodeCoordinates(d3Node: {x?: number; y?: number} | undefined): [number, number] {
if (!d3Node) {
return [0, 0];
}
// default value
return [0, 0];
const x = Number.isFinite(d3Node.x) ? d3Node.x : 0;
const y = Number.isFinite(d3Node.y) ? d3Node.y : 0;
return [x, y];
}

getNodePosition = (node: Node): [number, number] => {
return this._getNodeCoordinates(this._nodeMap[node.id]);
};

getEdgePosition = (edge) => {
const d3Edge = this._edgeMap[edge.id];
if (d3Edge) {
const sourcePosition = this._getNodeCoordinates(d3Edge.source);
const targetPosition = this._getNodeCoordinates(d3Edge.target);
if (!d3Edge.isVirtual) {
return {
type: 'line',
sourcePosition: [d3Edge.source.x, d3Edge.source.y],
targetPosition: [d3Edge.target.x, d3Edge.target.y],
sourcePosition,
targetPosition,
controlPoints: []
};
}
// else, check the referenced virtual edge
const virtualEdge = this._edgeMap[d3Edge.virtualEdgeId];
const edgeCount = virtualEdge.edgeCount;
// get the position of source and target nodes
const sourcePosition = [virtualEdge.source.x, virtualEdge.source.y];
const targetPosition = [virtualEdge.target.x, virtualEdge.target.y];
const sourcePosition = this._getNodeCoordinates(virtualEdge.source);
const targetPosition = this._getNodeCoordinates(virtualEdge.target);
// calculate a symmetric curve
const distance = Math.hypot(
sourcePosition[0] - targetPosition[0],
Expand Down Expand Up @@ -260,7 +266,8 @@ function computeControlPoint(source, target, direction, offset) {
const dy = target[1] - source[1];
const normal = [dy, -dx];
const length = Math.sqrt(Math.pow(normal[0], 2.0) + Math.pow(normal[1], 2.0));
const normalized = [normal[0] / length, normal[1] / length];
const normalized =
length > 0 ? [normal[0] / length, normal[1] / length] : [0, 0];
return [
midPoint[0] + normalized[0] * offset * direction,
midPoint[1] + normalized[1] * offset * direction
Expand Down
Loading