honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-26 23:07:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updating connect method to prevent duplicate edges

Browse Source
This commit is contained in:
Nicholas Knize 2014-12-02 09:33:47 -06:00
parent f8f92f816a
commit 9466e16e24
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/elasticsearch/common/geo/builders/BasePolygonBuilder.java
View File

@ -404,7 +404,8 @@ public abstract class BasePolygonBuilder<E extends BasePolygonBuilder<E>> extend
// The connect method creates a new edge for these paired edges in the linked list. // The connect method creates a new edge for these paired edges in the linked list.
// For boundary conditions (e.g., intersect but not crossing) there is no sibling edge // For boundary conditions (e.g., intersect but not crossing) there is no sibling edge
// to connect. Thus the following enforces the pairwise rule // to connect. Thus the following enforces the pairwise rule
if (e1.intersect != Edge.MAX_COORDINATE && e2.intersect != Edge.MAX_COORDINATE) { if (e1.intersect != Edge.MAX_COORDINATE && e2.intersect != Edge.MAX_COORDINATE
&& (e1.next.next.coordinate != e2.coordinate) ) {
connect(e1, e2); connect(e1, e2);
} }
} }
@ -431,7 +432,7 @@ public abstract class BasePolygonBuilder<E extends BasePolygonBuilder<E>> extend
in.next = new Edge(in.intersect, out.next, in.intersect); in.next = new Edge(in.intersect, out.next, in.intersect);
} }
out.next = new Edge(out.intersect, e1, out.intersect); out.next = new Edge(out.intersect, e1, out.intersect);
} else if (in.next != out){ } else if (in.next != out && in.coordinate != out.intersect) {
// first edge intersects with dateline // first edge intersects with dateline
Edge e2 = new Edge(out.intersect, in.next, out.intersect); Edge e2 = new Edge(out.intersect, in.next, out.intersect);