Open
Conversation
…atorSimplifyOGC.execute
Add serialization for QuadTree and related classes
This commit fixes an NPE in the estimateMemorySize method when the following geometries are empty: - LINESTRING - MULTILINESTRING - GEOMETRY - MULTIGEOMETRY It also adds test "empty" versions the current unit test suite.
Fix NPE on estimateMemorySize against empty multipart geometries
Fix convex hull crash for collection of polygons
This file is unused.
Delete MgrsConversionMode.java
…accelerators Add accelerator size to OGCGeometry#estimateMemorySize
* Fix rasterization with degenerate segments * Change javadoc source version to 1.6
* Fix formatting in OperatorCentroid * formatting in the unit test
…merge # Conflicts: # .gitignore # README.md # src/main/java/com/esri/core/geometry/AttributeStreamBase.java # src/main/java/com/esri/core/geometry/AttributeStreamOfDbl.java # src/main/java/com/esri/core/geometry/AttributeStreamOfFloat.java # src/main/java/com/esri/core/geometry/AttributeStreamOfInt16.java # src/main/java/com/esri/core/geometry/AttributeStreamOfInt32.java # src/main/java/com/esri/core/geometry/AttributeStreamOfInt64.java # src/main/java/com/esri/core/geometry/AttributeStreamOfInt8.java # src/main/java/com/esri/core/geometry/Boundary.java # src/main/java/com/esri/core/geometry/BucketSort.java # src/main/java/com/esri/core/geometry/Bufferer.java # src/main/java/com/esri/core/geometry/ByteBufferCursor.java # src/main/java/com/esri/core/geometry/ClassicSort.java # src/main/java/com/esri/core/geometry/Clipper.java # src/main/java/com/esri/core/geometry/Clusterer.java # src/main/java/com/esri/core/geometry/CombineOperator.java # src/main/java/com/esri/core/geometry/ConstructOffset.java # src/main/java/com/esri/core/geometry/ConvexHull.java # src/main/java/com/esri/core/geometry/CrackAndCluster.java # src/main/java/com/esri/core/geometry/Cracker.java # src/main/java/com/esri/core/geometry/Cutter.java # src/main/java/com/esri/core/geometry/ECoordinate.java # src/main/java/com/esri/core/geometry/EditShape.java # src/main/java/com/esri/core/geometry/EnvSrlzr.java # src/main/java/com/esri/core/geometry/Envelope.java # src/main/java/com/esri/core/geometry/Envelope1D.java # src/main/java/com/esri/core/geometry/Envelope2D.java # src/main/java/com/esri/core/geometry/Envelope2DIntersectorImpl.java # src/main/java/com/esri/core/geometry/Envelope3D.java # src/main/java/com/esri/core/geometry/GenericGeometrySerializer.java # src/main/java/com/esri/core/geometry/GeoDist.java # src/main/java/com/esri/core/geometry/GeoJsonCrsTables.java # src/main/java/com/esri/core/geometry/GeoJsonExportFlags.java # src/main/java/com/esri/core/geometry/GeoJsonImportFlags.java # src/main/java/com/esri/core/geometry/GeodeticCurveType.java # src/main/java/com/esri/core/geometry/Geometry.java # src/main/java/com/esri/core/geometry/GeometryAccelerators.java # src/main/java/com/esri/core/geometry/GeometryCursor.java # src/main/java/com/esri/core/geometry/GeometryCursorAppend.java # src/main/java/com/esri/core/geometry/GeometryEngine.java # src/main/java/com/esri/core/geometry/GeometryException.java # src/main/java/com/esri/core/geometry/GeometrySerializer.java # src/main/java/com/esri/core/geometry/IndexHashTable.java # src/main/java/com/esri/core/geometry/IndexMultiDCList.java # src/main/java/com/esri/core/geometry/IndexMultiList.java # src/main/java/com/esri/core/geometry/InternalUtils.java # src/main/java/com/esri/core/geometry/IntervalTreeImpl.java # src/main/java/com/esri/core/geometry/JsonCursor.java # src/main/java/com/esri/core/geometry/JsonGeometryException.java # src/main/java/com/esri/core/geometry/JsonParserReader.java # src/main/java/com/esri/core/geometry/JsonReader.java # src/main/java/com/esri/core/geometry/JsonReaderCursor.java # src/main/java/com/esri/core/geometry/JsonStringWriter.java # src/main/java/com/esri/core/geometry/Line.java # src/main/java/com/esri/core/geometry/ListeningGeometryCursor.java # src/main/java/com/esri/core/geometry/LnSrlzr.java # src/main/java/com/esri/core/geometry/MapGeometry.java # src/main/java/com/esri/core/geometry/MapGeometryCursor.java # src/main/java/com/esri/core/geometry/MathUtils.java # src/main/java/com/esri/core/geometry/MultiPath.java # src/main/java/com/esri/core/geometry/MultiPathImpl.java # src/main/java/com/esri/core/geometry/MultiPoint.java # src/main/java/com/esri/core/geometry/MultiPointImpl.java # src/main/java/com/esri/core/geometry/MultiVertexGeometry.java # src/main/java/com/esri/core/geometry/MultiVertexGeometryImpl.java # src/main/java/com/esri/core/geometry/NonSimpleResult.java # src/main/java/com/esri/core/geometry/NumberUtils.java # src/main/java/com/esri/core/geometry/Operator.java # src/main/java/com/esri/core/geometry/OperatorBoundary.java # src/main/java/com/esri/core/geometry/OperatorBoundaryLocal.java # src/main/java/com/esri/core/geometry/OperatorBoundaryLocalCursor.java # src/main/java/com/esri/core/geometry/OperatorBuffer.java # src/main/java/com/esri/core/geometry/OperatorBufferCursor.java # src/main/java/com/esri/core/geometry/OperatorBufferLocal.java # src/main/java/com/esri/core/geometry/OperatorClip.java # src/main/java/com/esri/core/geometry/OperatorClipCursor.java # src/main/java/com/esri/core/geometry/OperatorClipLocal.java # src/main/java/com/esri/core/geometry/OperatorContainsLocal.java # src/main/java/com/esri/core/geometry/OperatorConvexHull.java # src/main/java/com/esri/core/geometry/OperatorConvexHullCursor.java # src/main/java/com/esri/core/geometry/OperatorConvexHullLocal.java # src/main/java/com/esri/core/geometry/OperatorCrossesLocal.java # src/main/java/com/esri/core/geometry/OperatorCut.java # src/main/java/com/esri/core/geometry/OperatorCutCursor.java # src/main/java/com/esri/core/geometry/OperatorCutLocal.java # src/main/java/com/esri/core/geometry/OperatorDensifyByLength.java # src/main/java/com/esri/core/geometry/OperatorDensifyByLengthCursor.java # src/main/java/com/esri/core/geometry/OperatorDensifyByLengthLocal.java # src/main/java/com/esri/core/geometry/OperatorDifference.java # src/main/java/com/esri/core/geometry/OperatorDifferenceCursor.java # src/main/java/com/esri/core/geometry/OperatorDifferenceLocal.java # src/main/java/com/esri/core/geometry/OperatorDisjointLocal.java # src/main/java/com/esri/core/geometry/OperatorDistance.java # src/main/java/com/esri/core/geometry/OperatorDistanceLocal.java # src/main/java/com/esri/core/geometry/OperatorEqualsLocal.java # src/main/java/com/esri/core/geometry/OperatorExportToESRIShape.java # src/main/java/com/esri/core/geometry/OperatorExportToESRIShapeCursor.java # src/main/java/com/esri/core/geometry/OperatorExportToESRIShapeLocal.java # src/main/java/com/esri/core/geometry/OperatorExportToGeoJson.java # src/main/java/com/esri/core/geometry/OperatorExportToGeoJsonCursor.java # src/main/java/com/esri/core/geometry/OperatorExportToGeoJsonLocal.java # src/main/java/com/esri/core/geometry/OperatorExportToJson.java # src/main/java/com/esri/core/geometry/OperatorExportToJsonCursor.java # src/main/java/com/esri/core/geometry/OperatorExportToJsonLocal.java # src/main/java/com/esri/core/geometry/OperatorExportToWkb.java # src/main/java/com/esri/core/geometry/OperatorExportToWkbLocal.java # src/main/java/com/esri/core/geometry/OperatorExportToWkt.java # src/main/java/com/esri/core/geometry/OperatorExportToWktLocal.java # src/main/java/com/esri/core/geometry/OperatorFactory.java # src/main/java/com/esri/core/geometry/OperatorFactoryLocal.java # src/main/java/com/esri/core/geometry/OperatorGeneralize.java # src/main/java/com/esri/core/geometry/OperatorGeneralizeCursor.java # src/main/java/com/esri/core/geometry/OperatorGeneralizeLocal.java # src/main/java/com/esri/core/geometry/OperatorGeodesicBuffer.java # src/main/java/com/esri/core/geometry/OperatorGeodesicBufferLocal.java # src/main/java/com/esri/core/geometry/OperatorGeodeticArea.java # src/main/java/com/esri/core/geometry/OperatorGeodeticAreaLocal.java # src/main/java/com/esri/core/geometry/OperatorGeodeticDensifyByLength.java # src/main/java/com/esri/core/geometry/OperatorGeodeticDensifyLocal.java # src/main/java/com/esri/core/geometry/OperatorGeodeticLength.java # src/main/java/com/esri/core/geometry/OperatorGeodeticLengthLocal.java # src/main/java/com/esri/core/geometry/OperatorImportFromESRIShape.java # src/main/java/com/esri/core/geometry/OperatorImportFromESRIShapeCursor.java # src/main/java/com/esri/core/geometry/OperatorImportFromESRIShapeLocal.java # src/main/java/com/esri/core/geometry/OperatorImportFromGeoJson.java # src/main/java/com/esri/core/geometry/OperatorImportFromGeoJsonLocal.java # src/main/java/com/esri/core/geometry/OperatorImportFromJson.java # src/main/java/com/esri/core/geometry/OperatorImportFromJsonCursor.java # src/main/java/com/esri/core/geometry/OperatorImportFromJsonLocal.java # src/main/java/com/esri/core/geometry/OperatorImportFromWkb.java # src/main/java/com/esri/core/geometry/OperatorImportFromWkbLocal.java # src/main/java/com/esri/core/geometry/OperatorImportFromWkt.java # src/main/java/com/esri/core/geometry/OperatorImportFromWktLocal.java # src/main/java/com/esri/core/geometry/OperatorInternalRelationUtils.java # src/main/java/com/esri/core/geometry/OperatorIntersection.java # src/main/java/com/esri/core/geometry/OperatorIntersectionCursor.java # src/main/java/com/esri/core/geometry/OperatorIntersectionLocal.java # src/main/java/com/esri/core/geometry/OperatorIntersectsLocal.java # src/main/java/com/esri/core/geometry/OperatorOffset.java # src/main/java/com/esri/core/geometry/OperatorOffsetCursor.java # src/main/java/com/esri/core/geometry/OperatorOffsetLocal.java # src/main/java/com/esri/core/geometry/OperatorOverlapsLocal.java # src/main/java/com/esri/core/geometry/OperatorProject.java # src/main/java/com/esri/core/geometry/OperatorProjectLocal.java # src/main/java/com/esri/core/geometry/OperatorProximity2D.java # src/main/java/com/esri/core/geometry/OperatorProximity2DLocal.java # src/main/java/com/esri/core/geometry/OperatorRelate.java # src/main/java/com/esri/core/geometry/OperatorRelateLocal.java # src/main/java/com/esri/core/geometry/OperatorShapePreservingDensify.java # src/main/java/com/esri/core/geometry/OperatorShapePreservingDensifyLocal.java # src/main/java/com/esri/core/geometry/OperatorSimpleRelation.java # src/main/java/com/esri/core/geometry/OperatorSimplify.java # src/main/java/com/esri/core/geometry/OperatorSimplifyCursor.java # src/main/java/com/esri/core/geometry/OperatorSimplifyCursorOGC.java # src/main/java/com/esri/core/geometry/OperatorSimplifyLocal.java # src/main/java/com/esri/core/geometry/OperatorSimplifyLocalHelper.java # src/main/java/com/esri/core/geometry/OperatorSimplifyLocalOGC.java # src/main/java/com/esri/core/geometry/OperatorSimplifyOGC.java # src/main/java/com/esri/core/geometry/OperatorSymmetricDifference.java # src/main/java/com/esri/core/geometry/OperatorSymmetricDifferenceCursor.java # src/main/java/com/esri/core/geometry/OperatorSymmetricDifferenceLocal.java # src/main/java/com/esri/core/geometry/OperatorTouches.java # src/main/java/com/esri/core/geometry/OperatorTouchesLocal.java # src/main/java/com/esri/core/geometry/OperatorUnion.java # src/main/java/com/esri/core/geometry/OperatorUnionCursor.java # src/main/java/com/esri/core/geometry/OperatorUnionLocal.java # src/main/java/com/esri/core/geometry/OperatorWithin.java # src/main/java/com/esri/core/geometry/OperatorWithinLocal.java # src/main/java/com/esri/core/geometry/PairwiseIntersectorImpl.java # src/main/java/com/esri/core/geometry/PathFlags.java # src/main/java/com/esri/core/geometry/PlaneSweepCrackerHelper.java # src/main/java/com/esri/core/geometry/Point.java # src/main/java/com/esri/core/geometry/Point2D.java # src/main/java/com/esri/core/geometry/Point3D.java # src/main/java/com/esri/core/geometry/PointInPolygonHelper.java # src/main/java/com/esri/core/geometry/Polygon.java # src/main/java/com/esri/core/geometry/PolygonUtils.java # src/main/java/com/esri/core/geometry/Polyline.java # src/main/java/com/esri/core/geometry/ProgressTracker.java # src/main/java/com/esri/core/geometry/ProjectionTransformation.java # src/main/java/com/esri/core/geometry/Proximity2DResult.java # src/main/java/com/esri/core/geometry/QuadTree.java # src/main/java/com/esri/core/geometry/QuadTreeImpl.java # src/main/java/com/esri/core/geometry/RasterizedGeometry2D.java # src/main/java/com/esri/core/geometry/RasterizedGeometry2DImpl.java # src/main/java/com/esri/core/geometry/RelationalOperations.java # src/main/java/com/esri/core/geometry/RelationalOperationsMatrix.java # src/main/java/com/esri/core/geometry/RingOrientationFixer.java # src/main/java/com/esri/core/geometry/Segment.java # src/main/java/com/esri/core/geometry/SegmentBuffer.java # src/main/java/com/esri/core/geometry/SegmentFlags.java # src/main/java/com/esri/core/geometry/SegmentIntersector.java # src/main/java/com/esri/core/geometry/SegmentIterator.java # src/main/java/com/esri/core/geometry/SegmentIteratorImpl.java # src/main/java/com/esri/core/geometry/ShapeExportFlags.java # src/main/java/com/esri/core/geometry/ShapeImportFlags.java # src/main/java/com/esri/core/geometry/SimpleByteBufferCursor.java # src/main/java/com/esri/core/geometry/SimpleGeometryCursor.java # src/main/java/com/esri/core/geometry/SimpleJsonReaderCursor.java # src/main/java/com/esri/core/geometry/SimpleMapGeometryCursor.java # src/main/java/com/esri/core/geometry/SimpleRasterizer.java # src/main/java/com/esri/core/geometry/Simplificator.java # src/main/java/com/esri/core/geometry/SizeOf.java # src/main/java/com/esri/core/geometry/SpatialReference.java # src/main/java/com/esri/core/geometry/SpatialReferenceImpl.java # src/main/java/com/esri/core/geometry/StridedIndexTypeCollection.java # src/main/java/com/esri/core/geometry/StringUtils.java # src/main/java/com/esri/core/geometry/SweepComparator.java # src/main/java/com/esri/core/geometry/TopoGraph.java # src/main/java/com/esri/core/geometry/TopologicalOperations.java # src/main/java/com/esri/core/geometry/Transformation2D.java # src/main/java/com/esri/core/geometry/Transformation3D.java # src/main/java/com/esri/core/geometry/Treap.java # src/main/java/com/esri/core/geometry/VertexDescription.java # src/main/java/com/esri/core/geometry/WkbExportFlags.java # src/main/java/com/esri/core/geometry/WkbImportFlags.java # src/main/java/com/esri/core/geometry/Wkid.java # src/main/java/com/esri/core/geometry/Wkt.java # src/main/java/com/esri/core/geometry/WktExportFlags.java # src/main/java/com/esri/core/geometry/WktImportFlags.java # src/main/java/com/esri/core/geometry/WktParser.java # src/main/java/com/esri/core/geometry/ogc/OGCConcreteGeometryCollection.java # src/main/java/com/esri/core/geometry/ogc/OGCCurve.java # src/main/java/com/esri/core/geometry/ogc/OGCGeometry.java # src/main/java/com/esri/core/geometry/ogc/OGCGeometryCollection.java # src/main/java/com/esri/core/geometry/ogc/OGCLineString.java # src/main/java/com/esri/core/geometry/ogc/OGCLinearRing.java # src/main/java/com/esri/core/geometry/ogc/OGCMultiLineString.java # src/main/java/com/esri/core/geometry/ogc/OGCMultiPoint.java # src/main/java/com/esri/core/geometry/ogc/OGCMultiPolygon.java # src/main/java/com/esri/core/geometry/ogc/OGCMultiSurface.java # src/main/java/com/esri/core/geometry/ogc/OGCPoint.java # src/main/java/com/esri/core/geometry/ogc/OGCPolygon.java # src/main/java/com/esri/core/geometry/ogc/OGCSurface.java # src/main/resources/com/esri/core/geometry/gcs_id_to_tolerance.txt # src/main/resources/com/esri/core/geometry/gcs_tolerances.txt # src/test/java/com/esri/core/geometry/TestAttributes.java # src/test/java/com/esri/core/geometry/TestBuffer.java # src/test/java/com/esri/core/geometry/TestCommonMethods.java # src/test/java/com/esri/core/geometry/TestContains.java # src/test/java/com/esri/core/geometry/TestConvexHull.java # src/test/java/com/esri/core/geometry/TestCut.java # src/test/java/com/esri/core/geometry/TestDifference.java # src/test/java/com/esri/core/geometry/TestDistance.java # src/test/java/com/esri/core/geometry/TestEnvelope2DIntersector.java # src/test/java/com/esri/core/geometry/TestEstimateMemorySize.java # src/test/java/com/esri/core/geometry/TestGeneralize.java # src/test/java/com/esri/core/geometry/TestGeodetic.java # src/test/java/com/esri/core/geometry/TestGeomToGeoJson.java # src/test/java/com/esri/core/geometry/TestGeomToJSonExportSRFromWkiOrWkt_CR181369.java # src/test/java/com/esri/core/geometry/TestImportExport.java # src/test/java/com/esri/core/geometry/TestIntersect2.java # src/test/java/com/esri/core/geometry/TestIntersection.java # src/test/java/com/esri/core/geometry/TestIntervalTree.java # src/test/java/com/esri/core/geometry/TestJSonGeometry.java # src/test/java/com/esri/core/geometry/TestJSonToGeomFromWkiOrWkt_CR177613.java # src/test/java/com/esri/core/geometry/TestJsonParser.java # src/test/java/com/esri/core/geometry/TestMultiPoint.java # src/test/java/com/esri/core/geometry/TestOGC.java # src/test/java/com/esri/core/geometry/TestPoint.java # src/test/java/com/esri/core/geometry/TestPolygon.java # src/test/java/com/esri/core/geometry/TestPolygonUtils.java # src/test/java/com/esri/core/geometry/TestQuadTree.java # src/test/java/com/esri/core/geometry/TestRasterizedGeometry2D.java # src/test/java/com/esri/core/geometry/TestRelation.java # src/test/java/com/esri/core/geometry/TestSerialization.java # src/test/java/com/esri/core/geometry/TestSimplify.java # src/test/java/com/esri/core/geometry/TestSpatialReference.java # src/test/java/com/esri/core/geometry/TestTouch.java # src/test/java/com/esri/core/geometry/TestUnion.java # src/test/java/com/esri/core/geometry/TestWKBSupport.java # src/test/java/com/esri/core/geometry/TestWkbImportOnPostgresST.java # src/test/java/com/esri/core/geometry/TestWkid.java # src/test/java/com/esri/core/geometry/TestWktParser.java # src/test/java/com/esri/core/geometry/Utils.java
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
19 participants
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.
No description provided.