Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-8065: Some exact circles near 90 degrees are still concave because of planet model, so throw an exception when we construct one of those.

This commit is contained in:
Karl Wright 2017-11-24 10:37:21 -05:00
parent cc8802e60e
commit a514a12d0c
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoExactCircle.java
View File

@ -221,7 +221,11 @@ class GeoExactCircle extends GeoBaseCircle {
this.backBounds = backPlanes;
}
this.edgePoints = new GeoPoint[]{edgePoint};
this.edgePoints = new GeoPoint[]{edgePoint};
if (!isWithin(northPoint) || !isWithin(southPoint) || !isWithin(eastPoint) || !isWithin(westPoint)) {
throw new IllegalArgumentException("Exact circle cannot be constructed this large given the planet model provided");
}
//System.out.println("Is edgepoint within? "+isWithin(edgePoint));
}

15
lucene/spatial3d/src/test/org/apache/lucene/spatial3d/geom/GeoCircleTest.java
View File

@ -551,4 +551,19 @@ public class GeoCircleTest extends LuceneTestCase {
assertEquals(westPoint.getLongitude(), bounds.getLeftLongitude(), 1e-2);
assertEquals(eastPoint.getLongitude(), bounds.getRightLongitude(), 1e-2);
}
@Test
public void testLUCENE8065(){
boolean isIllegal = false;
try {
GeoCircle circle1 = GeoCircleFactory.makeExactGeoCircle(PlanetModel.WGS84, 0.03186456479560385, -2.2254294002683617, 1.5702573535090856, 8.184299676008562E-6);
} catch (IllegalArgumentException e) {
isIllegal = true;
}
assertTrue(isIllegal);
/*
GeoCircle circle2 = GeoCircleFactory.makeExactGeoCircle(PlanetModel.WGS84, 0.03186456479560385, -2.2254294002683617 , 1.5698163157923914, 1.0E-5);
assertTrue(circle1.getRelationship(circle2) != GeoArea.DISJOINT);
*/
}
}