Skip to content

Buffer fillet no overload #218

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

Merged
dr-jts merged 1 commit into from
Nov 13, 2017
Merged

Buffer fillet no overload #218

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
14 changes: 7 additions & 7 deletions modules/core/src/main/java/org/locationtech/jts/operation/buffer/OffsetSegmentGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ private void addCollinear(boolean addStartPoint)
segList.addPt(offset1.p0);
}
else {
addFillet(s1, offset0.p1, offset1.p0, Orientation.CLOCKWISE, distance);
addCornerFillet(s1, offset0.p1, offset1.p0, Orientation.CLOCKWISE, distance);
}
}
}
Expand Down Expand Up @@ -286,7 +286,7 @@ else if (bufParams.getJoinStyle() == BufferParameters.JOIN_BEVEL){
// add a circular fillet connecting the endpoints of the offset segments
if (addStartPoint) segList.addPt(offset0.p1);
// TESTING - comment out to produce beveled joins
addFillet(s1, offset0.p1, offset1.p0, orientation, distance);
addCornerFillet(s1, offset0.p1, offset1.p0, orientation, distance);
segList.addPt(offset1.p0);
}
}
Expand Down Expand Up @@ -415,7 +415,7 @@ public void addLineEndCap(Coordinate p0, Coordinate p1)
case BufferParameters.CAP_ROUND:
// add offset seg points with a fillet between them
segList.addPt(offsetL.p1);
addFillet(p1, angle + Math.PI / 2, angle - Math.PI / 2, Orientation.CLOCKWISE, distance);
addDirectedFillet(p1, angle + Math.PI / 2, angle - Math.PI / 2, Orientation.CLOCKWISE, distance);
segList.addPt(offsetR.p1);
break;
case BufferParameters.CAP_FLAT:
Expand Down Expand Up @@ -574,7 +574,7 @@ private void addBevelJoin(
* @param direction the orientation of the fillet
* @param radius the radius of the fillet
*/
private void addFillet(Coordinate p, Coordinate p0, Coordinate p1, int direction, double radius)
private void addCornerFillet(Coordinate p, Coordinate p0, Coordinate p1, int direction, double radius)
{
double dx0 = p0.x - p.x;
double dy0 = p0.y - p.y;
Expand All @@ -590,7 +590,7 @@ private void addFillet(Coordinate p, Coordinate p0, Coordinate p1, int direction
if (startAngle >= endAngle) startAngle -= 2.0 * Math.PI;
}
segList.addPt(p0);
addFillet(p, startAngle, endAngle, direction, radius);
addDirectedFillet(p, startAngle, endAngle, direction, radius);
segList.addPt(p1);
}

Expand All @@ -603,7 +603,7 @@ private void addFillet(Coordinate p, Coordinate p0, Coordinate p1, int direction
* @param direction is -1 for a CW angle, 1 for a CCW angle
* @param radius the radius of the fillet
*/
private void addFillet(Coordinate p, double startAngle, double endAngle, int direction, double radius)
private void addDirectedFillet(Coordinate p, double startAngle, double endAngle, int direction, double radius)
{
int directionFactor = direction == Orientation.CLOCKWISE ? -1 : 1;

Expand Down Expand Up @@ -638,7 +638,7 @@ public void createCircle(Coordinate p)
// add start point
Coordinate pt = new Coordinate(p.x + distance, p.y);
segList.addPt(pt);
addFillet(p, 0.0, 2.0 * Math.PI, -1, distance);
addDirectedFillet(p, 0.0, 2.0 * Math.PI, -1, distance);
segList.closeRing();
}

Expand Down