LUCENE-8620: Update Tessellator logic to label if triangle edges belongs to the original polygon #771
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nknize
requested changes
Sep 6, 2019
| @@ -590,14 +601,123 @@ private static final boolean splitEarcut(Object polygon, final Node start, final | |||
| return false; | |||
| } | |||
|
|
|||
| /** Computes if edge defined by a and b overlaps with a polygon edge **/ | |||
| private static boolean edgeFromPolygon(final Node a, final Node b, final boolean isMorton) { | |||
There was a problem hiding this comment.
Suggested change
| private static boolean edgeFromPolygon(final Node a, final Node b, final boolean isMorton) { | |
| private static boolean isEdgeFromPolygon(final Node a, final Node b, final boolean isMortonOptimized) { |
| } | ||
|
|
||
| /** Uses morton code for speed to determine whether or not and edge defined by a and b overlaps with a polygon edge */ | ||
| private static final boolean mortonEdgeFromPolygon(final Node a, final Node b) { |
There was a problem hiding this comment.
Suggested change
| private static final boolean mortonEdgeFromPolygon(final Node a, final Node b) { | |
| private static final boolean isMortonEdgeFromPolygon(final Node a, final Node b) { |
| return false; | ||
| } | ||
|
|
||
| private static boolean pointInLine(final Node a, final Node b, final Node point) { |
There was a problem hiding this comment.
Suggested change
| private static boolean pointInLine(final Node a, final Node b, final Node point) { | |
| private static boolean isPointInLine(final Node a, final Node b, final Node point) { |
| return pointInLine(a, b, point.getX(), point.getY()); | ||
| } | ||
|
|
||
| private static boolean pointInLine(final Node a, final Node b, final double lon, final double lat) { |
There was a problem hiding this comment.
Suggested change
| private static boolean pointInLine(final Node a, final Node b, final double lon, final double lat) { | |
| private static boolean isPointInLine(final Node a, final Node b, final double lon, final double lat) { |
| } | ||
|
|
||
|
|
||
| /** Links two polygon vertices using a bridge. **/ /** Links two polygon vert |
| double minY = StrictMath.min(ay, StrictMath.min(by, cy)); | ||
| double maxX = StrictMath.max(ax, StrictMath.max(bx, cx)); | ||
| double maxY = StrictMath.max(ay, StrictMath.max(by, cy)); | ||
| //check the bounding box because if the triangle is degenerated, e.g points and lines, we need to filter out |
| @@ -920,6 +1055,8 @@ public static final boolean pointInPolygon(final List<Triangle> tessellation, do | |||
| private Node previousZ; | |||
| // next z node | |||
| private Node nextZ; | |||
| // if the edge from this node to the next node is part of the polygon edges | |||
| private boolean nextEdgeFromPolygon; | |||
There was a problem hiding this comment.
Suggested change
| private boolean nextEdgeFromPolygon; | |
| private boolean isNextEdgeFromPolygon; |
|
|
||
| protected Triangle(Node a, Node b, Node c) { | ||
| protected Triangle(Node a, boolean abFromPolygon, Node b, boolean bcFromPolygon, Node c, boolean caFromPolygon) { |
There was a problem hiding this comment.
Suggested change
| protected Triangle(Node a, boolean abFromPolygon, Node b, boolean bcFromPolygon, Node c, boolean caFromPolygon) { | |
| protected Triangle(Node a, boolean isABfromPolygon, Node b, boolean isBCfromPolygon, Node c, boolean isCAfromPolygon) { |
| @@ -1004,6 +1145,11 @@ public double getX(int vertex) { | |||
| return this.vertex[vertex].getX(); | |||
| } | |||
|
|
|||
| /** get if edge is shared with the polygon for the given edge */ | |||
| public boolean fromPolygon(int vertex) { | |||
There was a problem hiding this comment.
Suggested change
| public boolean fromPolygon(int vertex) { | |
| public boolean isEdgeFromPolygon(int startVertex) { |
| assertEquals(t.fromPolygon(2), edgeFromPolygon(p, t.getX(2), t.getY(2), t.getX(0), t.getY(0))); | ||
| } | ||
|
|
||
| private boolean edgeFromPolygon(Polygon p, double aLon, double aLat, double bLon, double bLat) { |
There was a problem hiding this comment.
Suggested change
| private boolean edgeFromPolygon(Polygon p, double aLon, double aLat, double bLon, double bLat) { | |
| private boolean isEdgeFromPolygon(Polygon p, double aLon, double aLat, double bLon, double bLat) { |
|
Awesome. LGTM! Thanks! |
asfgit
pushed a commit
that referenced
this pull request
Sep 9, 2019
…ngs to the original polygon (#771)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This information is then encoded and triangles are decoded using LatLonShape.decodeTriangle.
Relates to #608