You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/04/05 19:16:21 UTC
[2/2] lucene-solr:master: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ee98f6ab
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ee98f6ab
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ee98f6ab
Branch: refs/heads/master
Commit: ee98f6ab8d367071b78c1a4026771346e47e6cb5
Parents: 18fb946 e6fd37c
Author: Noble Paul <no...@apache.org>
Authored: Tue Apr 5 22:46:05 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Apr 5 22:46:05 2016 +0530
----------------------------------------------------------------------
lucene/CHANGES.txt | 7 +
.../org/apache/lucene/codecs/package-info.java | 1 +
.../src/java/org/apache/lucene/geo/Polygon.java | 200 ++--
.../test/org/apache/lucene/geo/TestPolygon.java | 38 +-
lucene/ivy-versions.properties | 2 +-
.../randomizedtesting-runner-2.3.2.jar.sha1 | 1 -
.../randomizedtesting-runner-2.3.4.jar.sha1 | 1 +
.../org/apache/lucene/document/LatLonGrid.java | 155 +++
.../org/apache/lucene/document/LatLonPoint.java | 5 +-
.../document/LatLonPointInPolygonQuery.java | 24 +-
.../apache/lucene/document/TestLatLonGrid.java | 50 +
.../lucene/spatial/spatial4j/Geo3dRptTest.java | 30 +-
.../Geo3dShapeRectRelationTestCase.java | 22 +-
.../Geo3dShapeSphereModelRectRelationTest.java | 4 +-
.../Geo3dShapeWGS84ModelRectRelationTest.java | 19 +-
.../geopoint/search/GeoPointInPolygonQuery.java | 10 +-
.../search/GeoPointInPolygonQueryImpl.java | 8 +-
.../org/apache/lucene/spatial3d/Geo3DPoint.java | 130 +--
.../lucene/spatial3d/geom/BaseXYZSolid.java | 2 +-
.../lucene/spatial3d/geom/GeoBaseBBox.java | 2 +-
.../lucene/spatial3d/geom/GeoBaseCircle.java | 4 +-
.../lucene/spatial3d/geom/GeoBasePath.java | 34 +
.../lucene/spatial3d/geom/GeoBasePolygon.java | 4 +-
.../spatial3d/geom/GeoConcavePolygon.java | 394 ++++++++
.../lucene/spatial3d/geom/GeoConvexPolygon.java | 180 +++-
.../geom/GeoDegenerateHorizontalLine.java | 2 +-
.../geom/GeoDegenerateLatitudeZone.java | 2 +-
.../geom/GeoDegenerateLongitudeSlice.java | 2 +-
.../spatial3d/geom/GeoDegeneratePoint.java | 2 +-
.../lucene/spatial3d/geom/GeoLatitudeZone.java | 2 +-
.../spatial3d/geom/GeoLongitudeSlice.java | 2 +-
.../spatial3d/geom/GeoNorthLatitudeZone.java | 2 +-
.../spatial3d/geom/GeoNorthRectangle.java | 2 +-
.../apache/lucene/spatial3d/geom/GeoPath.java | 776 +--------------
.../lucene/spatial3d/geom/GeoPathFactory.java | 39 +
.../spatial3d/geom/GeoPolygonFactory.java | 983 +++++++++++++++++--
.../lucene/spatial3d/geom/GeoRectangle.java | 2 +-
.../spatial3d/geom/GeoSouthLatitudeZone.java | 2 +-
.../spatial3d/geom/GeoSouthRectangle.java | 2 +-
.../spatial3d/geom/GeoStandardCircle.java | 2 +-
.../lucene/spatial3d/geom/GeoStandardPath.java | 797 +++++++++++++++
.../geom/GeoWideDegenerateHorizontalLine.java | 2 +-
.../spatial3d/geom/GeoWideLongitudeSlice.java | 2 +-
.../spatial3d/geom/GeoWideNorthRectangle.java | 2 +-
.../lucene/spatial3d/geom/GeoWideRectangle.java | 2 +-
.../spatial3d/geom/GeoWideSouthRectangle.java | 2 +-
.../apache/lucene/spatial3d/geom/GeoWorld.java | 2 +-
.../lucene/spatial3d/geom/SidedPlane.java | 20 +-
.../lucene/spatial3d/geom/StandardXYZSolid.java | 2 +-
.../apache/lucene/spatial3d/geom/XYdZSolid.java | 2 +-
.../apache/lucene/spatial3d/geom/XdYZSolid.java | 2 +-
.../lucene/spatial3d/geom/XdYdZSolid.java | 2 +-
.../apache/lucene/spatial3d/geom/dXYZSolid.java | 2 +-
.../lucene/spatial3d/geom/dXYdZSolid.java | 2 +-
.../lucene/spatial3d/geom/dXdYZSolid.java | 2 +-
.../lucene/spatial3d/geom/dXdYdZSolid.java | 2 +-
.../apache/lucene/spatial3d/TestGeo3DPoint.java | 13 +-
.../lucene/spatial3d/geom/GeoPathTest.java | 36 +-
.../lucene/spatial3d/geom/GeoPolygonTest.java | 176 +++-
solr/licenses/junit4-ant-2.3.2.jar.sha1 | 1 -
solr/licenses/junit4-ant-2.3.4.jar.sha1 | 1 +
.../randomizedtesting-runner-2.3.2.jar.sha1 | 1 -
.../randomizedtesting-runner-2.3.4.jar.sha1 | 1 +
63 files changed, 3005 insertions(+), 1218 deletions(-)
----------------------------------------------------------------------