Skip to content
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

Fix unused variables and a typo #231

Merged
merged 1 commit into from
Aug 6, 2019
Merged

Fix unused variables and a typo #231

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
21 changes: 7 additions & 14 deletions src/main/java/com/esri/core/geometry/RelationalOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4142,20 +4142,13 @@ private static boolean linearPathIntersectsMultiPoint_(
SegmentIteratorImpl segIterA = ((MultiPathImpl) multipathA._getImpl())
.querySegmentIterator();

boolean bContained = true;
boolean bInteriorHitFound = false;

Envelope2D env_a = new Envelope2D();
Envelope2D env_b = new Envelope2D();
Envelope2D envInter = new Envelope2D();
multipathA.queryEnvelope2D(env_a);
multipoint_b.queryEnvelope2D(env_b);
env_a.inflate(tolerance, tolerance);

if (!env_a.contains(env_b)) {
bContained = false;
}

env_b.inflate(tolerance, tolerance);
envInter.setCoords(env_a);
envInter.intersect(env_b);
Expand All @@ -4169,6 +4162,7 @@ private static boolean linearPathIntersectsMultiPoint_(

if (accel != null) {
quadTreeA = accel.getQuadTree();
quadTreePathsA = accel.getQuadTreeForPaths();
if (quadTreeA == null) {
qtA = InternalUtils.buildQuadTree(
(MultiPathImpl) multipathA._getImpl(), envInter);
Expand All @@ -4187,7 +4181,6 @@ private static boolean linearPathIntersectsMultiPoint_(
qtIterPathsA = quadTreePathsA.getIterator();

Point2D ptB = new Point2D(), closest = new Point2D();
boolean b_intersects = false;
double toleranceSq = tolerance * tolerance;

for (int i = 0; i < multipoint_b.getPointCount(); i++) {
Expand Down Expand Up @@ -5153,9 +5146,9 @@ private static final class OverlapEvent {
double m_scalar_a_0;
double m_scalar_a_1;
int m_ivertex_b;
int m_ipath_b;
double m_scalar_b_0;
double m_scalar_b_1;
// int m_ipath_b;
// double m_scalar_b_0;
// double m_scalar_b_1;

static OverlapEvent construct(int ivertex_a, int ipath_a,
double scalar_a_0, double scalar_a_1, int ivertex_b,
Expand All @@ -5166,9 +5159,9 @@ static OverlapEvent construct(int ivertex_a, int ipath_a,
overlapEvent.m_scalar_a_0 = scalar_a_0;
overlapEvent.m_scalar_a_1 = scalar_a_1;
overlapEvent.m_ivertex_b = ivertex_b;
overlapEvent.m_ipath_b = ipath_b;
overlapEvent.m_scalar_b_0 = scalar_b_0;
overlapEvent.m_scalar_b_1 = scalar_b_1;
// overlapEvent.m_ipath_b = ipath_b;
// overlapEvent.m_scalar_b_0 = scalar_b_0;
// overlapEvent.m_scalar_b_1 = scalar_b_1;
return overlapEvent;
}
}
Expand Down